www/philosophy about-free-software.html about-t...

[Matt Lee]

CVSROOT:        /web/www
Module name:    www
Changes by:     Matt Lee <mattl>        08/06/09 17:48:48

Modified files:
        philosophy     : about-free-software.html 
                         about-the-gnu-operating-system.html 
                         philosophy.html 
Added files:
        philosophy     : about-free-software.include 
                         about-the-gnu-operating-system.include 

Log message:
        philosophical compromise

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/about-free-software.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/about-the-gnu-operating-system.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy.html?cvsroot=www&r1=1.275&r2=1.276
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/about-free-software.include?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/about-the-gnu-operating-system.include?cvsroot=www&rev=1.1

Patches:
Index: about-free-software.html
===================================================================
RCS file: /web/www/www/philosophy/about-free-software.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- about-free-software.html    2 Jun 2008 17:25:00 -0000       1.1
+++ about-free-software.html    9 Jun 2008 17:48:30 -0000       1.2
@@ -17,33 +17,7 @@
 <!-- (e.g. foo.fr.html) from here.  It would be better to link them -->
 <!-- from philosophy.fr.html and the original documents. -mhatta -->
 
-<ul>
-  <li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
-  <li><a href="/philosophy/why-free.html">Why
-       Software Should Not Have Owners</a></li>
-  <li><a href="/philosophy/shouldbefree.html">Why
-       Software Should Be Free</a>  (This is an older and longer
-       essay about the same topic as the previous one)</li>
-  <li><a href="/philosophy/free-doc.html">Why Free Software Needs
-      Free Documentation</a></li>
-  <li><a href="/philosophy/selling.html">Selling Free Software</a> is OK!</li>
-  <li><a href="/philosophy/categories.html">Categories of Free and
-       Non-Free Software</a></li>
-  <li><a href="/software/reliability.html">Free Software is More 
Reliable!</a></li>
-  <li><a href="/philosophy/open-source-misses-the-point.html">Why
-       &ldquo;Open Source&rdquo; misses the point of Free Software</a></li>
-  <li><a href="/philosophy/linux-gnu-freedom.html">Linux, GNU, and
-       Freedom</a></li>
-  <li><a href="/philosophy/gnutella.html"
-         id="Gnutella">Regarding Gnutella</a></li>
-  <li><a href="/philosophy/schools.html">Why Schools Should Use
-      Exclusively Free Software</a></li>
-  <li><a href="/philosophy/my_doom.html">MyDoom and You</a></li>
-  <li><a href="/philosophy/15-years-of-free-software.html">15 Years of Free 
Software</a></li>
-  <li><a href="/philosophy/free-software-intro.html">Free Software 
movement</a></li>
-  <li><a href="/philosophy/your-freedom-needs-free-software.html">Your Freedom 
Needs Free Software</a></li>
-  <li><a 
href="/philosophy/free-system-distribution-guidelines.html">Guidelines for Free 
System Distributions</a></li>
-</ul>
+<!--#include virtual="/philosophy/about-free-software.include" -->
 
 </div>
 
@@ -78,7 +52,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2008/06/02 17:25:00 $
+$Date: 2008/06/09 17:48:30 $
 <!-- timestamp end -->
 </p>
 </div>

Index: about-the-gnu-operating-system.html
===================================================================
RCS file: /web/www/www/philosophy/about-the-gnu-operating-system.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- about-the-gnu-operating-system.html 2 Jun 2008 17:25:01 -0000       1.1
+++ about-the-gnu-operating-system.html 9 Jun 2008 17:48:31 -0000       1.2
@@ -6,17 +6,7 @@
 
 <h2 id="aboutgnu">About the GNU Project</h2>
 
-<ul>
-  <li><a href="/gnu/initial-announcement.html">Initial announcement of
-       the GNU Project</a></li>
-  <li><a href="/gnu/manifesto.html">The GNU Manifesto</a></li>
-  <li><a href="/gnu/gnu-history.html">Brief history of the GNU Project</a></li>
-  <li><a href="/gnu/thegnuproject.html">The GNU Project</a>,
-      a longer and more complete description of the project and its
-      history.</li>
-  <li><a href="/fsf/fsf.html">What is the Free Software Foundation?</a></li>
-  <li><a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a></li>
-</ul>
+<!--#include virtual="/philosophy/about-the-gnu-operating-system.include" -->
 
 <hr />
 
@@ -56,7 +46,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2008/06/02 17:25:01 $
+$Date: 2008/06/09 17:48:31 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy.html,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -b -r1.275 -r1.276
--- philosophy.html     2 Jun 2008 17:25:01 -0000       1.275
+++ philosophy.html     9 Jun 2008 17:48:31 -0000       1.276
@@ -7,10 +7,11 @@
 <h2>Philosophy of the GNU Project</h2>
 
 <p>
-This directory describes the philosophy of the Free Software Movement,
-which is the motivation for our development of the free software
-operating system GNU.</p>
+A series of articles describing the philosophy of the Free Software
+Movement, which is the motivation for our development of the free
+software operating system GNU.</p>
 
+<p><span class="highlight">If you prefer, you can view <a 
href="all-philosophy-articles.html">a complete list of philosophy articles</a> 
instead.</span></p>
 
 <p>
 <!-- please leave both these ID attributes here. ... -->
@@ -78,7 +79,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2008/06/02 17:25:01 $
+$Date: 2008/06/09 17:48:31 $
 <!-- timestamp end -->
 </p>
 </div>

Index: about-free-software.include
===================================================================
RCS file: about-free-software.include
diff -N about-free-software.include
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ about-free-software.include 9 Jun 2008 17:48:31 -0000       1.1
@@ -0,0 +1,27 @@
+<ul>
+  <li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
+  <li><a href="/philosophy/why-free.html">Why
+       Software Should Not Have Owners</a></li>
+  <li><a href="/philosophy/shouldbefree.html">Why
+       Software Should Be Free</a>  (This is an older and longer
+       essay about the same topic as the previous one)</li>
+  <li><a href="/philosophy/free-doc.html">Why Free Software Needs
+      Free Documentation</a></li>
+  <li><a href="/philosophy/selling.html">Selling Free Software</a> is OK!</li>
+  <li><a href="/philosophy/categories.html">Categories of Free and
+       Non-Free Software</a></li>
+  <li><a href="/software/reliability.html">Free Software is More 
Reliable!</a></li>
+  <li><a href="/philosophy/open-source-misses-the-point.html">Why
+       &ldquo;Open Source&rdquo; misses the point of Free Software</a></li>
+  <li><a href="/philosophy/linux-gnu-freedom.html">Linux, GNU, and
+       Freedom</a></li>
+  <li><a href="/philosophy/gnutella.html"
+         id="Gnutella">Regarding Gnutella</a></li>
+  <li><a href="/philosophy/schools.html">Why Schools Should Use
+      Exclusively Free Software</a></li>
+  <li><a href="/philosophy/my_doom.html">MyDoom and You</a></li>
+  <li><a href="/philosophy/15-years-of-free-software.html">15 Years of Free 
Software</a></li>
+  <li><a href="/philosophy/free-software-intro.html">Free Software 
movement</a></li>
+  <li><a href="/philosophy/your-freedom-needs-free-software.html">Your Freedom 
Needs Free Software</a></li>
+  <li><a 
href="/philosophy/free-system-distribution-guidelines.html">Guidelines for Free 
System Distributions</a></li>
+</ul>
\ No newline at end of file

Index: about-the-gnu-operating-system.include
===================================================================
RCS file: about-the-gnu-operating-system.include
diff -N about-the-gnu-operating-system.include
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ about-the-gnu-operating-system.include      9 Jun 2008 17:48:31 -0000       
1.1
@@ -0,0 +1,11 @@
+<ul>
+  <li><a href="/gnu/initial-announcement.html">Initial announcement of
+       the GNU Project</a></li>
+  <li><a href="/gnu/manifesto.html">The GNU Manifesto</a></li>
+  <li><a href="/gnu/gnu-history.html">Brief history of the GNU Project</a></li>
+  <li><a href="/gnu/thegnuproject.html">The GNU Project</a>,
+      a longer and more complete description of the project and its
+      history.</li>
+  <li><a href="/fsf/fsf.html">What is the Free Software Foundation?</a></li>
+  <li><a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a></li>
+</ul>
\ No newline at end of file