www/philosophy words-to-avoid.html

[Richard M. Stallman]

CVSROOT:        /web/www
Module name:    www
Changes by:     Richard M. Stallman <rms>       14/06/16 12:07:20

Modified files:
        philosophy     : words-to-avoid.html 

Log message:
        Give expansions of "FOSS" and "FLOSS".
        Minor clarification for "source model".

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.html?cvsroot=www&r1=1.186&r2=1.187

Patches:
Index: words-to-avoid.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.html,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- words-to-avoid.html 23 May 2014 06:48:54 -0000      1.186
+++ words-to-avoid.html 16 Jun 2014 12:07:19 -0000      1.187
@@ -446,8 +446,9 @@
 
 <h4 id="FLOSS">&ldquo;FLOSS&rdquo;</h4>
 <p>
-The term &ldquo;FLOSS&rdquo; was coined as a way
-to <a href="/philosophy/floss-and-foss.html"> be neutral between free
+The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open
+Source Software,&rdquo; was coined as a way
+to <a href="/philosophy/floss-and-foss.html">be neutral between free
 software and open source</a>.  If neutrality is your goal,
 &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you want to
 show you stand for freedom, don't use a neutral term.</p>
@@ -470,8 +471,9 @@
 
 <h4 id="FOSS">&ldquo;FOSS&rdquo;</h4>
 <p>
-The term &ldquo;FOSS&rdquo; was coined as a way
-to <a href="/philosophy/floss-and-foss.html"> be neutral between free
+The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source
+Software,&rdquo; was coined as a way
+to <a href="/philosophy/floss-and-foss.html">be neutral between free
 software and open source</a>, but it doesn't really do that.  If
 neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  But if you
 want to show you stand for freedom, don't use a neutral term.</p>
@@ -823,11 +825,11 @@
 distributed, but the text confuses this with the development
 methodology.  It distinguishes &ldquo;open source&rdquo; and
 &rdquo;shared source&rdquo; as answers, but they overlap &mdash;
-Microsoft uses that marketing term to cover a range of practices, some
-of which are &ldquo;open source&rdquo;.  Thus, this term seems to
-convey no coherent information, but it provides an opportunity to say
-&ldquo;open source&rdquo; in pages describing free software
-programs.</p>
+Microsoft uses the latter as a marketing term to cover a range of
+practices, some of which are &ldquo;open source&rdquo;.  Thus, this
+term really conveys no coherent information, but it provides an
+opportunity to say &ldquo;open source&rdquo; in pages describing free
+software programs.</p>
 
 <h4 id="Theft">&ldquo;Theft&rdquo;</h4>
 <p>
@@ -952,7 +954,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/05/23 06:48:54 $
+$Date: 2014/06/16 12:07:19 $
 <!-- timestamp end -->
 </p>
 </div>