www/philosophy words-to-avoid.html

[Joakim Olsson]

CVSROOT:        /web/www
Module name:    www
Changes by:     Joakim Olsson <jocke>   07/03/29 19:07:42

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

Log message:
        Fixed invalid HTML.

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

Patches:
Index: words-to-avoid.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- words-to-avoid.html 29 Mar 2007 18:58:51 -0000      1.64
+++ words-to-avoid.html 29 Mar 2007 19:07:36 -0000      1.65
@@ -178,12 +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
@@ -191,13 +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
@@ -261,9 +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>
@@ -275,12 +275,11 @@
 patents.  To call such players "MP3 players" is not only confusing, it
 also puts MP3 in an undeserved position of privilege which helps the
 patent holders continue to attack our community.  We suggest the terms
-"digital audio player", or simply "audio player" if context permits.
+"digital audio player", or simply "audio player" if context permits.</p>
+
 
+<h4>"<a name="Market">Market</a>"</h4>
 
-<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
@@ -418,13 +417,12 @@
 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>
+
+<h4>"<a name="TrustedComputing">Trusted Computing</a>"</h4>
 <p>
-<A href="can-you-trust.html">"Trusted computing"</a> is the proponents
+<a href="can-you-trust.html">"Trusted computing"</a> is the proponents
 name for a scheme to redesign computers so that application developers
 can trust your computer to obey them instead of you.  For their point
 of view, it is "trusted".  From your point of view, it is
@@ -433,7 +431,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
@@ -488,7 +486,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2007/03/29 18:58:51 $
+    $Date: 2007/03/29 19:07:36 $
     <!-- timestamp end -->
   </p>
 </div>
@@ -524,8 +522,6 @@
     &#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>