www software/software.html philosophy/categorie...

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       11/12/31 00:09:21

Modified files:
        software       : software.html 
        philosophy     : categories.html 

Log message:
        intro paragraph about the GNU system in software.html, approved by rms; 
analogous changes to #TheGNUsystem in categories.html

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/software/software.html?cvsroot=www&r1=1.181&r2=1.182
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.html?cvsroot=www&r1=1.73&r2=1.74

Patches:
Index: software/software.html
===================================================================
RCS file: /web/www/www/software/software.html,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- software/software.html      30 Oct 2011 21:26:35 -0000      1.181
+++ software/software.html      31 Dec 2011 00:09:10 -0000      1.182
@@ -16,6 +16,17 @@
 GNU/Linux distributions which are entirely free software</a>.</span></p>
 </div>
 
+<p><a href="/philosophy/categories.html#TheGNUsystem">The GNU operating
+system</a> is the Unix-like operating system, which is entirely free
+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
+different packages according to their needs and desires.  The result is
+still a variant of the GNU system.</p>
+
 <p>If you're looking for a whole system to install, see our <a
 href="/distros/free-distros.html">list of GNU/Linux distributions which
 are entirely free software</a>.</p>
@@ -212,7 +223,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/10/30 21:26:35 $
+$Date: 2011/12/31 00:09:10 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/categories.html
===================================================================
RCS file: /web/www/www/philosophy/categories.html,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- philosophy/categories.html  14 Nov 2011 16:05:16 -0000      1.73
+++ philosophy/categories.html  31 Dec 2011 00:09:16 -0000      1.74
@@ -207,29 +207,29 @@
        Unix-like operating system, which is entirely free software, that
        we in the GNU Project have developed since 1984.</p>
 
-       <p>A Unix-like operating system consists of many programs. The GNU
-       system includes all the GNU software, as well as many other
-       packages such as the X Window System and TeX which are not GNU
-       software.</p>
+       <p>A Unix-like operating system consists of many programs. The
+       GNU system includes all of the <a href="#GNUsoftware">offical
+       GNU packages</a>.  It also includes many other packages, such as
+       the X Window System and TeX, which are not GNU software.</p>
 
        <p>The first test release of the complete GNU system was in
        1996.  This includes the GNU Hurd, our kernel, developed since
        1990. In 2001 the GNU system (including the GNU Hurd) began
        working fairly reliably, but the Hurd still lacks some
        important features, so it is not widely used. Meanwhile,
-       the <a href= "/gnu/linux-and-gnu.html">GNU/Linux system</a>,
+       the <a href="/gnu/linux-and-gnu.html">GNU/Linux system</a>,
        an offshoot of the GNU operating system which uses Linux as
        the kernel instead of the GNU Hurd, has been a great success
-       since the 90s.</p>
+       since the 90s.  As this shows, 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>
 
        <p>Since the purpose of GNU is to be free, every single
-       component in the GNU operating system has to be free
+       component in the GNU operating system is free
        software. They don't all have to be copylefted, however; any
        kind of free software is legally suitable to include if it
-       helps meet technical goals. And it isn't necessary for all the
-       components to be GNU software, individually.  GNU can and does
-       include noncopylefted free software such as the X Window
-       System that were developed by other projects.</p>
+       helps meet technical goals.</p>
 
 <h3 id="GNUprograms">GNU programs</h3>
 
@@ -421,7 +421,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/11/14 16:05:16 $
+$Date: 2011/12/31 00:09:16 $
 <!-- timestamp end -->
 </p>
 </div>