www manual/manual.html software/software.html

[karl]

CVSROOT:        /web/www
Module name:    www
Changes by:     karl <karl>     13/04/15 15:48:29

Modified files:
        manual         : manual.html 
        software       : software.html 

Log message:
        mention guix, etc.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/manual/manual.html?cvsroot=www&r1=1.142&r2=1.143
http://web.cvs.savannah.gnu.org/viewcvs/www/software/software.html?cvsroot=www&r1=1.198&r2=1.199

Patches:
Index: manual/manual.html
===================================================================
RCS file: /web/www/www/manual/manual.html,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- manual/manual.html  10 Mar 2013 06:17:30 -0000      1.142
+++ manual/manual.html  15 Apr 2013 15:48:28 -0000      1.143
@@ -6,7 +6,8 @@
  <!--#include virtual="/manual/po/manual.translist" -->
 <h2>GNU Manuals Online</h2>
 
-<p id="topinfo">This table lists official GNU packages with links to
+<p id="topinfo">This table lists <a
+href="/software/software.html">official GNU packages</a> with links to
 their primary documentation, where available.  When a package has
 several associated manuals, they are all listed.  If a package has no
 specific manual online, the link just goes to the package's home page
@@ -67,7 +68,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/03/10 06:17:30 $
+$Date: 2013/04/15 15:48:28 $
 <!-- timestamp end -->
 </p>
 </div>

Index: software/software.html
===================================================================
RCS file: /web/www/www/software/software.html,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- software/software.html      13 Apr 2013 15:56:02 -0000      1.198
+++ software/software.html      15 Apr 2013 15:48:28 -0000      1.199
@@ -21,9 +21,9 @@
 software, that we in the GNU Project have developed since 1984.  The GNU
 system contains all of the <a
 href="/philosophy/categories.html#GNUsoftware">official GNU software
-packages</a> (which are listed below), and also includes much non-GNU
-free software, such as the X Window System.  Also, the GNU system is not
-a single static set of programs; users and distributors may select
+packages</a> (which are listed below), and also includes non-GNU free
+software, such as TeX and the X Window System.  Also, the GNU system is
+not a single static set of programs; users and distributors may select
 different packages according to their needs and desires.  The result is
 still a variant of the GNU system.</p>
 
@@ -58,7 +58,7 @@
 href="/licenses/licenses.html">Licenses</a> page.</p>
 
 <p>Finally, we have a <a href="/software/for-windows.html">short list of
-free software for Microsoft Windows</a>, for the Windows user who would
+free software for Microsoft Windows</a>, for Windows users who would
 like to try free software.</p>
 
 
@@ -70,22 +70,24 @@
 <li>Download a <a href="/distros/free-distros.html">wholly free
 GNU/Linux distribution</a>.</li>
 
+<li>Get a copy from a friend.</li>
+
 <li>Buy a computer with a wholly free GNU/Linux system preinstalled
 from <a href="/links/companies.html">one of the companies</a> that
 offers this.</li>
 
 <li><a href="/order/ftp.html">Download individual packages from the web
 or via FTP</a>: we provide source code for all GNU software as <a
-href="/philosophy/free-sw.html">free software</a>, and free of
-charge.  (Please also make a <a href="/help/donate.html">donation</a> to
-the FSF, if you can, to help us write more free software.)</li>
-
-<li>Get a copy from a friend.  (Likewise please make a donation if you
-can.)</li>
-
-<li>Use the <a href="/software/gsrc/gsrc.html">GNU SRC</a> package to
-easily install many of the latest GNU package releases on their own,
-without conflicting with any system versions.</li>
+href="/philosophy/free-sw.html">free software</a>, and free of charge.
+(Please also make a <a href="/help/donate.html">donation</a> to the FSF
+if you can, to help support the creation of more free software.)</li>
+
+<li>Use the <a href="/software/guix/guix.html">GNU Guix</a> functional
+package manager to install and manage GNU package releases.</li>
+
+<li>Use the <a href="/software/gsrc/gsrc.html">GNU GSRC</a> collection to
+easily install the latest GNU package releases on their own, without
+conflicting with any system versions.</li>
 
 <li>Use the 
 <a
@@ -95,11 +97,10 @@
 PPA</a> (Personal Package Archive) on Trisquel, gNewSense, or related
 distros to get the latest releases suitably packaged.</li>
 
-<li>Get the development sources for a package and build them, to help
-with development.  Many GNU packages keep their development sources at
-the GNU hosting site <a
-href="http://savannah.gnu.org/";>savannah.gnu.org</a>. Some packages use
-other source repositories, or have none at all.  Each package's web
+<li>Get the development sources for a package and build them.
+Many GNU packages keep their development sources at the GNU hosting site
+<a href="http://savannah.gnu.org/";>savannah.gnu.org</a>.  Some packages
+use other source repositories, or have none at all.  Each package's web
 pages should give the specifics.</li>
 
 </ul>
@@ -241,7 +242,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/04/13 15:56:02 $
+$Date: 2013/04/15 15:48:28 $
 <!-- timestamp end -->
 </p>
 </div>