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: Joakim Olsson
Subject: www/philosophy words-to-avoid.html
Date: Thu, 29 Mar 2007 18:58:55 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Joakim Olsson <jocke>   07/03/29 18:58:55

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

Log message:
        Updated template as requested by mattl.

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

Patches:
Index: words-to-avoid.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- words-to-avoid.html 29 Mar 2007 17:05:41 -0000      1.63
+++ words-to-avoid.html 29 Mar 2007 18:58:51 -0000      1.64
@@ -1,26 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en">
+<!--#include virtual="/server/header.html" -->
 
-<head>
 <title>Confusing Words and Phrases that are Worth Avoiding - GNU Project - 
Free Software Foundation (FSF)</title>
-<meta http-equiv="content-type" content='text/html; charset=utf-8' />
-<link rel="stylesheet" type="text/css" href="/gnu.css" />
-<link rev="made" href="mailto:address@hidden"; />
-</head>
-
-<!-- This document is in XML, and xhtml 1.0 -->
-<!-- Please make sure to properly nest your tags -->
-<!-- and ensure that your final document validates -->
-<!-- consistent with W3C xhtml 1.0 and CSS standards -->
-<!-- See validator.w3.org -->
 
-<body>
+<!--#include virtual="/server/banner.html" -->
 
-<p><a href="#translations">Translations</a> of this page</p>
-
-<h3>Some Confusing or Loaded Words and Phrases that are Worth Avoiding</h3>
+<h2>Some Confusing or Loaded Words and Phrases that are Worth Avoiding</h2>
 
 <p>
 <a href="/graphics/philosophicalgnu.html"><img 
src="/graphics/philosophical-gnu-sm.jpg"
@@ -36,66 +20,10 @@
 not entirely agree with.</p>
 
 <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#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>"
-| <a href="/philosophy/philosophy.html">Other Texts to Read</a>
-</p>
-
-<p>
 Also note <a href="/philosophy/categories.html">Categories
 of Free Software</a>.</p>
 
-<h4>"<a href="words-to-avoid.html#TOCBSD-style"
-     name="BSD-style">BSD-style</a>"</h4>
+<h4>"<a name="BSD-style">BSD-style</a>"</h4>
 <p>
 The expression "BSD-style license" leads to confusion because it
 <a href="/philosophy/bsd.html">lumps together licenses that have
@@ -107,8 +35,7 @@
 the specific license in question</a> and avoid the vague term "BSD-style."</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCClosed"
-     name="Closed">Closed</a>"</h4>
+<h4>"<a name="Closed">Closed</a>"</h4>
 <p>
 Describing non-free software as "closed" clearly refers to the term
 "open source".  In the Free Software Movement,
@@ -121,8 +48,7 @@
 "proprietary"</a>.</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCCommercial"
-     name="Commercial">Commercial</a>"</h4>
+<h4>"<a name="Commercial">Commercial</a>"</h4>
 <p>
 Please don't use "commercial" as a synonym for "non-free."
 That confuses two entirely different issues.</p>
@@ -147,8 +73,7 @@
 be careful not to use the word "commercial" in that way.</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCConsumer"
-     name="Consumer">Consumer</a>"</h4>
+<h4>"<a name="Consumer">Consumer</a>"</h4>
 <p>
 The term "consumer", when used to refer to computer users,
 carries unfortunate assumptions.</p>
@@ -171,8 +96,7 @@
 computers, we suggest terms such as "individuals" and "citizens".</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCContent"
-     name="Content">Content</a>"</h4>
+<h4>"<a name="Content">Content</a>"</h4>
 <p>
 If you want to describe a feeling of comfort and satisfaction, by all
 means say you are "content", but using it as a noun to describe
@@ -199,8 +123,7 @@
 providers".</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCCreator"
-     name="Creator">Creator</a>"</h4>
+<h4>"<a name="Creator">Creator</a>"</h4>
 <p>
 The term "creator" as applied to authors implicitly compares them to
 a deity ("the creator").  The term is used by publishers to elevate
@@ -210,8 +133,7 @@
 many cases "copyright holder" is what you really mean.</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCDigitalRightsManagement"
-     name="DigitalRightsManagement">Digital Rights Management</a>"</h4>
+<h4>"<a name="DigitalRightsManagement">Digital Rights Management</a>"</h4>
 <p>
 "Digital Rights Management" software is actually designed to impose
 restrictions on computer users.  The use of the word "rights" in
@@ -223,8 +145,7 @@
 Restrictions Malware", and "handcuffware".</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCEcosystem"
-     name="Ecosystem">Ecosystem</a>"</h4>
+<h4>"<a name="Ecosystem">Ecosystem</a>"</h4>
 <p>
 It is a mistake to describe our community (or any community) as an
 "ecosystem", because that word implies the absence of (1) intension
@@ -241,8 +162,7 @@
 computer users' freedom.
 </p>
 
-<h4>"<a href="words-to-avoid.html#TOCForFree"
-     name="ForFree">For free</a>"</h4>
+<h4>"<a name="ForFree">For free</a>"</h4>
 <p>
 If you want to say that a program is free software, please don't say
 that it is available "for free."  That term specifically means "for
@@ -258,8 +178,12 @@
 free software."</p>
 
 
+<<<<<<< words-to-avoid.html
+<h4>"<a name="FreelyAvailable">Freely Available</a>"</h4>
+=======
 <h4>"<a href="words-to-avoid.html#TOCFreelyAvailable"
      name="FreelyAvailable">Freely available</a>"</h4>
+>>>>>>> 1.63
 <p>
 Don't use "freely available" as a synonym for "free software."  They
 are not equivalent.  "Freely available" means that anyone can easily
@@ -267,9 +191,13 @@
 users that have a copy.  These are answers to different questions.
 </p>
 
+<<<<<<< words-to-avoid.html
+<h4>"<a name="Freeware">Freeware</a>"</h4>
+=======
 
 <h4>"<a href="words-to-avoid.html#TOCFreeware"
      name="Freeware">Freeware</a>"</h4>
+>>>>>>> 1.63
 <p>
 Please don't use the term "freeware" as a synonym for "free software."
 The term "freeware" was used often in the 1980s for programs
@@ -290,8 +218,7 @@
 it says, they will really understand what the issue is.
 </p>
        
-<h4>"<a href="words-to-avoid.html#TOCGiveAwaySoftware"
-     name="GiveAwaySoftware">Give away software</a>"</h4>
+<h4>"<a name="GiveAwaySoftware">Give away software</a>"</h4>
 <p>
 It's misleading to use the term "give away" to mean "distribute a
 program as free software."  It has the same problem as "for free":
@@ -299,8 +226,7 @@
 the confusion is to say "release as free software."</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCIntellectualProperty"
-     name="IntellectualProperty">Intellectual property</a>"</h4>
+<h4>"<a name="IntellectualProperty">Intellectual property</a>"</h4>
 <p>
 Publishers and lawyers like to describe copyright as "intellectual
 property"&mdash;a term that also includes patents, trademarks, and other
@@ -326,8 +252,7 @@
 <a href="/philosophy/wipo-PublicAwarenessOfCopyright-2002.html">
 starting to make WIPO embarassed</a>.</p>
 
-<h4>"<a href="words-to-avoid.html#TOCLAMP"
-     name="LAMP">LAMP system</a>"</h4>
+<h4>"<a name="LAMP">LAMP system</a>"</h4>
 
 <p>
 "LAMP" stands for "Linux, Apache, MySQL and PHP"&mdash;a common
@@ -336,6 +261,9 @@
 be "GLAMP": "GNU, Linux, Apache, MySQL and PHP"
 </p>
 
+<<<<<<< words-to-avoid.html
+<h4>"<a name="Market">Market</a>"</h4>
+=======
 
 <h4>"<a href="words-to-avoid.html#TOCMP3Player"
      name="MP3Player">MP3 player</a>"</h4>
@@ -352,6 +280,7 @@
 
 <h4>"<a href="words-to-avoid.html#TOCMarket"
      name="Market">Market</a>"</h4>
+>>>>>>> 1.63
 
 <p>
 It is misleading to describe the users of free software, or the
@@ -368,8 +297,7 @@
 away from a rival.  To equate this campaign for freedom to a business'
 campaign for mere success is to diminish the significance of freedom.</p>
 
-<h4>"<a href="words-to-avoid.html#TOCOpen"
-     name="Open">Open</a>"</h4>
+<h4>"<a name="Open">Open</a>"</h4>
 <p>
 Please avoid using the word "open" as a substitute for "free
 software".  A <a href="/philosophy/free-software-for-freedom.html">
@@ -380,8 +308,7 @@
 we are their supporters.</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCPiracy"
-     name="Piracy">Piracy</a>"</h4>
+<h4>"<a name="Piracy">Piracy</a>"</h4>
 <p>
 Publishers often refer to prohibited copying as "piracy."  In this
 way, they imply that illegal copying is ethically equivalent to
@@ -396,8 +323,7 @@
 neighbor."</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCProtection"
-     name="Protection">Protection</a>"</h4>
+<h4>"<a name="Protection">Protection</a>"</h4>
 <p>
 Publishers' lawyers love to use the term "protection" to describe
 copyright.  This word carries the implication of preventing
@@ -414,8 +340,7 @@
 restrictions last a very long time."</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCRAND"
-     name="RAND">RAND (reasonable and non-discriminatory)</a>"</h4>
+<h4>"<a name="RAND">RAND (reasonable and non-discriminatory)</a>"</h4>
 <p>
 Standards bodies that promulgate patent-restricted standards that
 prohibit free software typically have a policy of obtaining patent
@@ -443,8 +368,7 @@
 licenses is a uniform royalty fee.</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCSellSoftware"
-     name="SellSoftware">Sell software</a>"</h4>
+<h4>"<a name="SellSoftware">Sell software</a>"</h4>
 <p>
 The term "sell software" is ambiguous.  Strictly speaking,
 exchanging a copy of a free program for a sum of money is "selling";
@@ -458,8 +382,7 @@
 more discussion of this issue.</p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCSoftwareIndustry"
-     name="SoftwareIndustry">Software Industry</a>"</h4>
+<h4>"<a name="SoftwareIndustry">Software Industry</a>"</h4>
 <p>
 The term "software industry" encourages people to imagine
 that software is always developed by a sort of factory
@@ -477,8 +400,7 @@
 of material goods".</a></p>
 
 
-<h4>"<a href="words-to-avoid.html#TOCTheft"
-     name="Theft">Theft</a>"</h4>
+<h4>"<a name="Theft">Theft</a>"</h4>
 <p>
 Copyright apologists often use words like "stolen" and "theft" to
 describe copyright infringement.  At the same time, they ask us to
@@ -496,6 +418,9 @@
 upside down.</p>
 
 
+<<<<<<< words-to-avoid.html
+<h4>"<a name="Vendor">Vendor</a>"</h4>
+=======
 <h4>"<a href="words-to-avoid.html#TOCTrustedComputing"
      name="TrustedComputing">Trusted Computing</a>"</h4>
 <p>
@@ -508,6 +433,7 @@
 
 <h4>"<a href="words-to-avoid.html#TOCVendor"
      name="Vendor">Vendor</a>"</h4>
+>>>>>>> 1.63
 <p>
 Please don't use the term "vendor" to refer generally to anyone that
 develops or packages a software package.  Many programs are developed
@@ -529,84 +455,81 @@
 Free Society: The Selected Essays of Richard M. Stallman</cite></a>.</h4>
 
 <h4><a href="/philosophy/philosophy.html">Other Texts to Read</a></h4>
-<hr />
 
-<!-- All pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
-
-<div class="translations">
-<p><a id="translations"></a>
-<b>Translations of this page</b>:<br />
-
-<!-- Please keep this list alphabetical, and in the original -->
-<!-- language if possible, otherwise default to English -->
-<!-- If you do not have it English, please comment what the -->
-<!-- English is.  If you add a new language here, please -->
-<!-- advise address@hidden and add it to -->
-<!--    - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
-<!--    - in /home/www/html/server/standards/README.translations.html -->
-<!--      one of the lists under the section "Translations Underway" -->
-<!--    - if there is a translation team, you also have to add an alias -->
-<!--      to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please also check you have the 2 letter language code right versus -->
-<!--     http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
-
-[
-  <a href="/philosophy/words-to-avoid.ca.html">Catal&#x00e0;</a> <!-- Catalan 
-->
-| <a href="/philosophy/words-to-avoid.cs.html">&#x010c;esky</a>        <!-- 
Czech -->
-| <a href="/philosophy/words-to-avoid.html">English</a>
-| <a href="/philosophy/words-to-avoid.es.html">Espa&#x00f1;ol</a>      <!-- 
Spanish -->
-| <a href="/philosophy/words-to-avoid.fr.html">Fran&#x00e7;ais</a>     <!-- 
French -->
-| <a href="/philosophy/words-to-avoid.it.html">Italiano</a>             <!-- 
Italian -->
-| <a href="/philosophy/words-to-avoid.ja.html">&#x65e5;&#x672c;&#x8a9e;</a>    
<!-- Japanese -->
-| <a href="/philosophy/words-to-avoid.pl.html">Polski</a>      <!-- Polish -->
-| <a href="/philosophy/words-to-avoid.pt.html">Portugu&#x0ea;s</a> <!-- 
Portugese -->
-| <a 
href="/philosophy/words-to-avoid.ru.html">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>
    <!-- Russian -->
-| <a 
href="/philosophy/words-to-avoid.sr.html">&#x0421;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a>
 <!-- Serbian -->
-]
-</p>
-</div>
-
-<div class="copyright">
-<p>
-Return to the <a href="/home.html">GNU Project home page</a>.
-</p>
-
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-There are also <a href="/home.html#ContactInfo">other ways to contact</a> 
-the FSF.
-<br />
-Please send broken links and other corrections (or suggestions) to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+<!--#include virtual="/server/footer.html" -->
 
-<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>
+<div id="footer">
+  <p>
+    Please send FSF &amp; GNU inquiries to 
+    <a href="mailto:address@hidden";><em>address@hidden</em></a>.
+    There are also <a href="http://www.fsf.org/about/contact.html";>other ways 
to contact</a> 
+    the FSF.
+    <br />
+    Please send broken links and other corrections (or suggestions) to
+    <a href="mailto:address@hidden";><em>address@hidden</em></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>
+  <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
-<br />
-Verbatim copying and distribution of this entire article is
-permitted in any medium, provided this notice is preserved.
-</p>
-
-<p>
-Updated:
-<!-- timestamp start -->
-$Date: 2007/03/29 17:05:41 $ $Author: rms $
-<!-- timestamp end -->
-</p>
+    <br />
+    Verbatim copying and distribution of this entire article is
+    permitted in any medium without royalty provided this notice is 
+    preserved.
+  </p>
+
+  <p>
+    Updated:
+    <!-- timestamp start -->
+    $Date: 2007/03/29 18:58:51 $
+    <!-- timestamp end -->
+  </p>
 </div>
 
+<div id="translations">
+  <h4>Translations of this page</h4>
+
+  <!-- Please keep this list alphabetical, and in the original -->
+  <!-- language if possible, otherwise default to English -->
+  <!-- If you do not have it English, please comment what the -->
+  <!-- English is.  If you add a new language here, please -->
+  <!-- advise address@hidden and add it to -->
+  <!--    - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
+  <!--    - in /home/www/html/server/standards/README.translations.html -->
+  <!--      one of the lists under the section "Translations Underway" -->
+  <!--    - if there is a translation team, you also have to add an alias -->
+  <!--      to mail.gnu.org:/com/mailer/aliases -->
+  <!-- Please also check you have the 2 letter language code right versus -->
+  <!--     http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
+
+  <ul class="translations-list">
+    <li><a href="/philosophy/words-to-avoid.ca.html">Catal&#x00e0;</a></li>
+    <li><a href="/philosophy/words-to-avoid.cs.html">&#x010c;esky</a></li>
+    <li><a href="/philosophy/words-to-avoid.html">English</a></li>
+    <li><a href="/philosophy/words-to-avoid.es.html">Espa&#x00f1;ol</a></li>
+    <li><a href="/philosophy/words-to-avoid.fr.html">Fran&#x00e7;ais</a></li>
+    <li><a href="/philosophy/words-to-avoid.it.html">Italiano</a></li>
+    <li><a href="/philosophy/words-to-avoid.ja.html">&#x65e5;&#x672c;&#x8a9e;
+    </a></li>
+    <li><a href="/philosophy/words-to-avoid.pl.html">Polski</a></li>
+    <li><a href="/philosophy/words-to-avoid.pt.html">Portugu&#x0ea;s</a></li>
+    <li><a href="/philosophy/words-to-avoid.ru.html">
+    &#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a></li>
+    <li><a href="/philosophy/words-to-avoid.sr.html">
+    &#x0421;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a></li>
+    </li>
+
+  </ul>
+
+</div>
+</div>
+</div>
 </body>
 </html>




reply via email to

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