www/links links.html

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       07/05/04 20:53:48

Modified files:
        links          : links.html 

Log message:
        links suggested to rms by address@hidden

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/links/links.html?cvsroot=www&r1=1.116&r2=1.117

Patches:
Index: links.html
===================================================================
RCS file: /web/www/www/links/links.html,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- links.html  28 Apr 2007 22:06:18 -0000      1.116
+++ links.html  4 May 2007 20:53:19 -0000       1.117
@@ -182,6 +182,9 @@
   dedicated to the propagation and usage of GNU/Linux and Free
   Software among the general computer users community.</li>
   <li><a href="http://www.freeme.in/";>Freeme.in</a>, which promotes free 
software.</li>
+  <li><a href="http://techmeet.org";>techmeet.org</a>, a site for
+      discussing free content management systems and arranging
+      conferences on the topic.</li>
   <li><a href="http://www.vialibre.org.ar";>Fundacion via libre</a>, an 
organization which promotes sharing and development of the knowledge
       based on free software movement principles.</li>
 </ul>
@@ -190,9 +193,7 @@
 <h3>Sites about the use and development of free software</h3>
 
 <ul>
-  <li>
-    <a href="http://www.binaryfreedom.info";>binaryFreedom.INFO</a>
-  </li>
+  <li><a href="http://www.binaryfreedom.info";>binaryFreedom.INFO</a></li>
   <li><a href="http://www.gnuino.org/";>gnuino.org</a> - a Spanish
     introduction to free software.</li>
 </ul>
@@ -326,11 +327,16 @@
     provided by FSF France, with support from the French company Free.</li>
 </ul>
 
-<p>In contrast, this site offers general hosting for domains, including
-email and web support, with an emphasis on the libre philosophy.  (It is
-not directly focused on software development.)</p>
+<p>In contrast, these sites offers general hosting for domains,
+including email and web support, with an emphasis on the libre
+philosophy.  (They are not directly focused on software
+development.)</p>
 
 <ul>
+<li><a href="http://sfccp.net";>sfccp.net</a>: the San Francisco Community
+    Colocation Project provides a location for non-profit organizations
+    to host their own servers.
+
 <li><a href="http://mjzhosting.net";>mjzhosting.net</a>: with a special
     interest in aiding any person, project or collective interested in
     <a href="http://www.mjzhosting.net/free.php#2b";>radical social
@@ -345,16 +351,14 @@
 
 <h3>News about free software</h3>
 
-<p>
-These sites offer updated news about free software and (in some cases)
-GNU software.
-</p>
+<p>These sites offer updated news about free software and (in some cases)
+GNU software.</p>
 
 <ul>
-  <li>
-    <a href="http://gnuticias.es.gnu.org";>GNUticias</a>, news about
-    free software and the GNU Project (spanish).
-  </li>
+<li><a href="http://news.northxsouth.com";>news.northxsouth.com</a>, news
+    about free software in Latin America.</li>
+<li><a href="http://gnuticias.es.gnu.org";>GNUticias</a>, news about
+    free software and the GNU Project (in Spanish).</li>
 </ul>
 
 </div>
@@ -391,7 +395,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/04/28 22:06:18 $
+$Date: 2007/05/04 20:53:19 $
 <!-- timestamp end -->
 </p>
 </div>