www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/philosophy words-to-avoid.html


From: Pavel Kharitonov
Subject: www/philosophy words-to-avoid.html
Date: Tue, 20 Nov 2012 05:47:23 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       12/11/20 05:47:23

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

Log message:
        Update boilerplate and copyright years; use &ldquo;...&rdquo;.

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

Patches:
Index: words-to-avoid.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.html,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- words-to-avoid.html 23 Oct 2012 03:42:17 -0000      1.151
+++ words-to-avoid.html 20 Nov 2012 05:47:22 -0000      1.152
@@ -1,4 +1,5 @@
 <!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.70 -->
 
 <title>Words to Avoid (or Use with Care) Because They Are Loaded or Confusing 
- GNU Project
 - Free Software Foundation (FSF)</title>
@@ -98,7 +99,7 @@
 
 <h4 id="Alternative">&ldquo;Alternative&rdquo;</h4>
 <p>
-We don't present free software as an "alternative", because it
+We don't present free software as an &ldquo;alternative&rdquo;, because it
 presents a goal of having free software alongside proprietary
 software.  That presupposes that proprietary software is
 legitimate.</p>
@@ -163,7 +164,7 @@
 </p>
 
 <p>
-One of the many meanings of "cloud computing" is storing your
+One of the many meanings of &ldquo;cloud computing&rdquo; is storing your
 data in online services.  That exposes you to
 <a 
href="http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream";>surveillance</a>.
 </p>
@@ -225,10 +226,10 @@
 
 <h4 id="Consume">&ldquo;Consume&rdquo;</h4>
 <p>
-"Consume" refers to what we do with food: we ingest it, and use it in
+&ldquo;Consume&rdquo; refers to what we do with food: we ingest it, and use it 
in
 a way that uses it up.  By analogy, we employ the same word to describe
 using other things in a way that uses them up.  However, it is
-erroneous to speak of "consuming" digital information, music,
+erroneous to speak of &ldquo;consuming&rdquo; digital information, music,
 software, etc., since using them does not consume them.  See also the
 following entry.</p>
 
@@ -762,31 +763,38 @@
 Software, Free Society: The Selected Essays of Richard
 M. Stallman</cite></a>.</h4>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to 
+
+<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.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+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 see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
 
 <p>
 Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
-2008, 2009, 2010 Free Software Foundation, Inc.</p>
+2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.</p>
+
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
 Commons Attribution-NoDerivs 3.0 United States License</a>.
@@ -795,11 +803,10 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/10/23 03:42:17 $
+$Date: 2012/11/20 05:47:22 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]