www/philosophy categories.html

[Jeanne Rasata]

CVSROOT:        /web/www
Module name:    www
Changes by:     Jeanne Rasata <jrasata> 10/07/01 06:34:44

Modified files:
        philosophy     : categories.html 

Log message:
        merged "semi-" prefix

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.html?cvsroot=www&r1=1.64&r2=1.65

Patches:
Index: categories.html
===================================================================
RCS file: /web/www/www/philosophy/categories.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- categories.html     1 Jul 2010 06:11:17 -0000       1.64
+++ categories.html     1 Jul 2010 06:34:41 -0000       1.65
@@ -280,7 +280,7 @@
 
        <p>Proprietary software is another name for nonfree software.
        In the past we subdivided nonfree software into
-       &ldquo;semi-free software&rdquo;, which could be modified and
+       &ldquo;semifree software&rdquo;, which could be modified and
        redistributed noncommercially, and &ldquo; proprietary
        software&rdquo;, which could not be.  But we have dropped that
        distinction and now use &ldquo;proprietary software&rdquo; as
@@ -319,7 +319,7 @@
        redistribute copies, but says that anyone who continues to use a
        copy is <em>required</em> to pay a license fee.</p>
 
-       <p>Shareware is not free software, or even semi-free. There are two
+       <p>Shareware is not free software, or even semifree. There are two
        reasons it is not:</p>
 
        <ul>
@@ -417,7 +417,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/07/01 06:11:17 $
+$Date: 2010/07/01 06:34:41 $
 <!-- timestamp end -->
 </p>
 </div>