www/philosophy words-to-avoid.html

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       07/03/31 23:13:50

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

Log message:
        new item PC from rms; restore list of terms at beginning.

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

Patches:
Index: words-to-avoid.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- words-to-avoid.html 30 Mar 2007 17:02:53 -0000      1.69
+++ words-to-avoid.html 31 Mar 2007 23:13:36 -0000      1.70
@@ -1,6 +1,7 @@
 <!--#include virtual="/server/header.html" -->
 
-<title>Confusing Words and Phrases that are Worth Avoiding - GNU Project - 
Free Software Foundation (FSF)</title>
+<title>Confusing Words and Phrases that are Worth Avoiding - GNU Project
+- Free Software Foundation (FSF)</title>
 
 <!--#include virtual="/server/banner.html" -->
 
@@ -16,6 +17,62 @@
 Also note <a href="/philosophy/categories.html">Categories
 of Free Software</a>.</div>
 
+<p>
+  <a href="/philosophy/philosophy.html">Other Texts to Read</a>
+| "<a href="words-to-avoid.html#BSD-style"
+       name="TOCBSD-style">BSD-style</a>"
+| "<a href="words-to-avoid.html#Closed"
+       name="TOCClosed">Closed</a>"
+| "<a href="words-to-avoid.html#Commercial"
+       name="TOCCommercial">Commercial</a>"
+| "<a href="words-to-avoid.html#Consumer"
+       name="TOCConsumer">Consumer</a>"
+| "<a href="words-to-avoid.html#Content"
+       name="TOCContent">Content</a>"
+| "<a href="words-to-avoid.html#Creator"
+       name="TOCCreator">Creator</a>"
+| "<a href="words-to-avoid.html#DigitalRightsManagement"
+       name="TOCDigitalRightsManagement">Digital Rights Management</a>"
+| "<a href="words-to-avoid.html#Ecosystem"
+       name="TOCEcosystem">Ecosystem</a>"
+| "<a href="words-to-avoid.html#ForFree"
+       name="TOCForFree">For free</a>"
+| "<a href="words-to-avoid.html#FreelyAvailable"
+       name="TOCFreelyAvailable">Freely available</a>"
+| "<a href="words-to-avoid.html#Freeware"
+       name="TOCFreeware">Freeware</a>"
+| "<a href="words-to-avoid.html#GiveAwaySoftware"
+       name="TOCGiveAwaySoftware">Give away software</a>"
+| "<a href="words-to-avoid.html#IntellectualProperty"
+       name="TOCIntellectualProperty">Intellectual property</a>"
+| "<a href="words-to-avoid.html#LAMP"
+       name="TOCLAMP">LAMP system</a>"
+| "<a href="words-to-avoid.html#Market"
+       name="TOCMarket">Market</a>"
+| "<a href="words-to-avoid.html#MP3Player"
+       name="TOCMarket">MP3 player</a>"
+| "<a href="words-to-avoid.html#Open"
+       name="TOCOpen">Open</a>"
+| "<a href="words-to-avoid.html#PC"
+       name="TOCPC">PC</a>"
+| "<a href="words-to-avoid.html#Piracy"
+       name="TOCPiracy">Piracy</a>"
+| "<a href="words-to-avoid.html#Protection"
+       name="TOCProtection">Protection</a>"
+| "<a href="words-to-avoid.html#RAND"
+       name="TOCRAND">RAND</a>"
+| "<a href="words-to-avoid.html#SellSoftware"
+       name="TOCSellSoftware">Sell software</a>"
+| "<a href="words-to-avoid.html#SoftwareIndustry"
+       name="TOCSoftwareIndustry">Software Industry</a>"
+| "<a href="words-to-avoid.html#Theft"
+       name="TOCTheft">Theft</a>"
+| "<a href="words-to-avoid.html#TrustedComputing"
+       name="TOCTrustedComputing">Trusted Computing</a>"
+| "<a href="words-to-avoid.html#Vendor"
+       name="TOCVendor">Vendor</a>"
+</p>
+
 <h4 id="BSD-style">"BSD-style"</h4>
 <p>
 The expression "BSD-style license" leads to confusion because it
@@ -277,6 +334,7 @@
 patent holders continue to attack our community.  We suggest the terms
 "digital audio player", or simply "audio player" if context permits.</p>
 
+
 <h4 id="Open">"Open"</h4>
 <p>
 Please avoid using the word "open" as a substitute for "free
@@ -288,6 +346,14 @@
 we are their supporters.</p>
 
 
+<h4 id="PC">"PC"</h4>
+<p>
+It's ok to use the abbreviation "PC" to refer to a certain kind
+of computer hardware, but please don't use it with the implication
+that the computer is running Microsoft Windows.  If you install
+GNU/Linux on the same computer, it is still a PC.</p>
+
+
 <h4 id="Piracy">"Piracy"</h4>
 <p>
 Publishers often refer to prohibited copying as "piracy."  In this
@@ -447,8 +513,9 @@
   </p>
 
   <p>
-Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007 Free 
Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110,  USA
+Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007 Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110,  USA
     <br />
     Verbatim copying and distribution of this entire article is
     permitted in any medium without royalty provided this notice is 
@@ -458,7 +525,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2007/03/30 17:02:53 $
+    $Date: 2007/03/31 23:13:36 $
     <!-- timestamp end -->
   </p>
 </div>