www/gnu thegnuproject.html

[Richard M. Stallman]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Richard M. Stallman <rms>       10/06/28 23:16:44

Modified files:
        gnu            : thegnuproject.html 

Log message:
        Fix the error ("cathedral" where "bazaar" was meant) instead of 
footnoting it.
        Clean up the text about how FSF now gets income.
        Restore a few of the small changes in version 1.42.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.html?cvsroot=www&r1=1.49&r2=1.50

Patches:
Index: thegnuproject.html
===================================================================
RCS file: /webcvs/www/www/gnu/thegnuproject.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- thegnuproject.html  28 Jun 2010 11:42:53 -0000      1.49
+++ thegnuproject.html  28 Jun 2010 23:16:41 -0000      1.50
@@ -19,7 +19,7 @@
 <p>
 by <a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a></p>
 <p>
-originally published in the book &ldquo;Open Sources&rdquo;</p>
+the original version was published in the book &ldquo;Open Sources&rdquo;</p>
 
 
 <h3>The first software-sharing community</h3>
@@ -288,7 +288,7 @@
 to be a system-programming language.  I added a C front end, and began
 porting it to the Motorola 68000 computer.  But I had to give that
 up when I discovered that the compiler needed many megabytes of stack
-space, while the available 68000 Unix system would only allow 64k.</p>
+space, and the available 68000 Unix system would only allow 64k.</p>
 <p>
 I then realized that the Pastel compiler functioned by parsing the
 entire input file into a syntax tree, converting the whole syntax tree
@@ -349,7 +349,7 @@
 problem&mdash;they expected and intended this to happen.  Their goal was
 not freedom, just &ldquo;success&rdquo;, defined as &ldquo;having many
 users.&rdquo; They did not care whether these users had freedom, only
-about having many of them.</p>
+that they should be numerous.</p>
 <p>
 This led to a paradoxical situation where two different ways of
 counting the amount of freedom gave different answers to the question,
@@ -368,7 +368,7 @@
 called &ldquo;copyleft&rdquo;.(1)</p>
 <p>
 Copyleft uses copyright law, but flips it over to serve the opposite
-of its usual purpose: rather than a means for restricting a program, it
+of its usual purpose: instead of a means for restricting a program, it
 becomes a means for keeping the program free.</p>
 <p>
 The central idea of copyleft is that we give everyone permission to
@@ -433,16 +433,14 @@
 free manuals as well.</p>
 
 <p>Most of the FSF's income used to come from sales of copies of free
-software and of other related services (<a href="http://shop.fsf.org/";>CD-ROMs 
of source code,
+software and of other related services (CD-ROMs of source code,
 CD-ROMs with binaries, nicely printed manuals</a> (all with the freedom to
-redistribute and modify), and <a href="http://patron.fsf.org/";>Deluxe 
Distributions</a> (distributions for
-which we build the whole collection of software for the customer's
-choice of platform). Today the FSF receives the bulk of its funding
-from members' dues.</p>
-
-<p>[2010 note: Nowadays <a href="http://shop.fsf.org/";>sales</a> provide a 
small part of the FSF's income,
-and its biggest source of income is members' dues.  You can
-join the FSF at <a href="http://fsf.org/join";>fsf.org</a>.]</p>
+redistribute and modify), and Deluxe Distributions (distributions for
+which we built the whole collection of software for the customer's
+choice of platform).  Today the FSF
+still <a href="http://shop.fsf.org/";> sells manuals and other
+gear</a>, but it gets the bulk of its funding from members' dues.  You
+can join the FSF at <a href="http://fsf.org/join";>fsf.org</a>.</p>
 
 <p>Free Software Foundation employees have written and maintained a
 number of GNU software packages.  Two notable ones are the C library
@@ -846,15 +844,10 @@
 patented features.  But those who value free software because they
 expect it to be technically superior are likely to call it a failure
 when a patent holds it back.  Thus, while it is useful to talk about
-the practical effectiveness of the &ldquo;cathedral&rdquo; model of
-development (1), and the reliability and power of some free software,
+the practical effectiveness of the &ldquo;bazaar&rdquo; model of
+development, and the reliability and power of some free software,
 we must not stop there.  We must talk about freedom and principle.</p>
 
-<p>
-(1) It would have been clearer to write &lsquo;of the
-&ldquo;bazaar&rdquo; model&rsquo;, since that was the alternative that
-was new and initially controversial. </p>
-
 <h3>Free documentation</h3>
 <p>
 The biggest deficiency in our free operating systems is not in the
@@ -1027,7 +1020,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/28 11:42:53 $
+$Date: 2010/06/28 23:16:41 $
 <!-- timestamp end -->
 </p>
 </div>