www/philosophy floss-and-foss.html

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       13/11/21 03:57:29

Modified files:
        philosophy     : floss-and-foss.html 

Log message:
        Fix typos; update to boilerplate v1.75.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/floss-and-foss.html?cvsroot=www&r1=1.3&r2=1.4

Patches:
Index: floss-and-foss.html
===================================================================
RCS file: /web/www/www/philosophy/floss-and-foss.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- floss-and-foss.html 20 Nov 2013 19:02:23 -0000      1.3
+++ floss-and-foss.html 21 Nov 2013 03:57:29 -0000      1.4
@@ -1,7 +1,7 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.75 -->
 <title>FLOSS and FOSS - GNU Project - Free Software Foundation</title>
-<!--#include virtual="/philosophy/po/floss-and-foss.translist" -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>FLOSS and FOSS</h2>
 
@@ -11,7 +11,7 @@
 software movement and open source.  The free software movement is a
 campaign
 for <a href="/philosophy/free-software-even-more-important.html">
-computer users' freedom</a>; we say that a non-free program is an
+computer users' freedom</a>; we say that a nonfree program is an
 injustice to its users.  The open source camp declines to see the
 issue as a matter of justice to the users, and bases its arguments on
 <a href="/philosophy/open-source-misses-the-point.html"> practical
@@ -30,11 +30,11 @@
 same thing as &ldquo;FLOSS,&rdquo; but it is less clear, since it
 fails to explain that &ldquo;free&rdquo; refers to <em>freedom</em>.
 It also makes &ldquo;free software&rdquo; less visible than
-&ldquo;open source&rdquo;, since it presents &ldquo;open source&rdquo;
+&ldquo;open source,&rdquo; since it presents &ldquo;open source&rdquo;
 prominently but splits &ldquo;free software&rdquo; apart.</p>
 
 <p>Thus, if you want to be neutral between free software and open
-source, the way to achieve that is to say &ldquo;FLOSS,&rdquo;, not
+source, the way to achieve that is to say &ldquo;FLOSS,&rdquo; not
 &ldquo;FOSS.&rdquo;</p>
 
 <p>We in the free software movement don't do use either of these
@@ -48,11 +48,11 @@
 
 <div id="footer">
 
-<p>Please send general FSF &amp; GNU inquiries to <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a
-href="/contact/">other ways to contact</a> the FSF.  Broken links and other
-corrections or suggestions can be sent to <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p><!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -83,7 +83,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/11/20 19:02:23 $
+$Date: 2013/11/21 03:57:29 $
 <!-- timestamp end -->
 </p>
 </div>