www/philosophy x.html x.html.gw-diff

[Yavor Doganov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   08/03/12 08:19:19

Modified files:
        philosophy     : x.html 
Removed files:
        philosophy     : x.html.gw-diff 

Log message:
        Fix a typo and translations list, thanks Michael Biggs (Closes: RT
        #357986).

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.html.gw-diff?cvsroot=www&r1=1.1&r2=0

Patches:
Index: x.html
===================================================================
RCS file: /web/www/www/philosophy/x.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- x.html      31 May 2007 12:56:10 -0000      1.18
+++ x.html      12 Mar 2008 08:17:36 -0000      1.19
@@ -10,8 +10,6 @@
 
 <h2>The X Window System Trap</h2>
 
-<div id="rms-image"></div>
-
 <p>
   by <strong>Richard M. Stallman</strong>
 </p>
@@ -19,16 +17,16 @@
 <p>
 To copyleft or not to copyleft?  That is one of the major
 controversies in the free software community.  The idea of copyleft is
-that we should fight fire with fire--that we should use copyright to
-make sure our code stays free.  The GNU GPL is one example of
-a copyleft license.</p>
+that we should fight fire with fire&mdash;that we should use copyright
+to make sure our code stays free.  The GNU GPL is one example of a
+copyleft license.</p>
 
 <p>
 Some free software developers prefer non-copyleft distribution.
 Non-copyleft licenses such as the XFree86 and
 <a href="/philosophy/bsd.html">BSD</a> licenses are based on the idea
-of never saying no to anyone--not even to someone who seeks to use
-your work as the basis for restricting other people.  Non-copyleft
+of never saying no to anyone&mdash;not even to someone who seeks to
+use your work as the basis for restricting other people.  Non-copyleft
 licensing does nothing wrong, but it misses the opportunity to
 actively protect our freedom to change and redistribute software.  For
 that, we need copyleft.</p>
@@ -43,7 +41,7 @@
 <p>
 Why did the X Consortium adopt this policy?  It had to do with their
 definition of success.  The X Consortium defined success as
-popularity--specifically, getting computer companies to use the X
+popularity&mdash;specifically, getting computer companies to use the X
 Window System.  This definition put the computer companies in the
 driver's seat.  Whatever they wanted, the X Consortium had to help
 them get it.</p>
@@ -92,7 +90,7 @@
 
 <p>
 [In September 1998, several months after X11R6.4 was released with
-non-free distribtion terms, the Open Group reversed its decision and
+non-free distribution terms, the Open Group reversed its decision and
 rereleased it under the same non-copyleft free software license that
 was used for X11R6.3.  Thank you, Open Group.]
 </p>
@@ -138,15 +136,15 @@
 
 <p>
 At the same time, it is better if we do not feel too much need for
-popularity.  When a businessman tempts you with &ldquo;more popularity,&rdquo; 
he
-may try to convince you that his use of your program is crucial to its
-success.  Don't believe it!  If your program is good, it will find
-many users anyway; you don't need to feel desperate for any particular
-users, and you will be stronger if you do not.  You can get an
-indescribable sense of joy and freedom by responding, &ldquo;Take it or
-leave it--that's no skin off my back.&rdquo;  Often the businessman will
-turn around and accept the program with copyleft, once you call the
-bluff.</p>
+popularity.  When a businessman tempts you with &ldquo;more
+popularity,&rdquo; he may try to convince you that his use of your
+program is crucial to its success.  Don't believe it!  If your program
+is good, it will find many users anyway; you don't need to feel
+desperate for any particular users, and you will be stronger if you do
+not.  You can get an indescribable sense of joy and freedom by
+responding, &ldquo;Take it or leave it&mdash;that's no skin off my
+back.&rdquo; Often the businessman will turn around and accept the
+program with copyleft, once you call the bluff.</p>
 
 <p>
 Friends, free software developers, don't repeat a mistake.  If we do
@@ -154,44 +152,45 @@
 equipped with more resources than scruples.  With copyleft, we can
 defend freedom, not just for ourselves, but for our whole community.</p>
 
+</div>
 <!--#include virtual="/server/footer.html" -->
 
 <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>
-    Copyright &copy; 1999 Richard M. Stallman
-    <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/05/31 12:56:10 $
-    <!-- timestamp end -->
-  </p>
+<p>
+Please send FSF &amp; GNU inquiries to 
+<a href="mailto:address@hidden";><em>address@hidden</em></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";><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>
+Copyright &copy; 1999 Richard M. Stallman
+<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: 2008/03/12 08:17:36 $
+<!-- timestamp end -->
+</p>
 </div>
 
 <div id="translations">
-  <h4>Translations of this page</h4>
+<h4>Translations of this page</h4>
 
   <!-- Please keep this list alphabetical, and in the original -->
   <!-- language if possible, otherwise default to English -->
@@ -206,21 +205,26 @@
   <!-- 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/x.en.html">English</a></li>
-    <li><a href="/philosophy/x.es.html">Espa&#x00f1;ol</a></li>
-    <li><a href="/philosophy/x.fr.html">Fran&#x00e7;ais</a></li>
-    <li><a href="/philosophy/x.id.html">Bahasa Indonesia</a></li>
-    <li><a href="/philosophy/x.ja.html">&#x65e5;&#x672c;&#x8a9e;</a></li>
-    <li><a href="/philosophy/x.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a></li>
-    <li><a href="/philosophy/x.nl.html">Nederlands</a></li>
-    <li><a href="/philosophy/x.pl.html">Polski</a></li>
-    <li><a href=
-    
"/philosophy/x.ru.html">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a></li>
-  </ul>
-
-</div>
+<ul class="translations-list">
+<!-- English -->
+<li><a href="/philosophy/x.html">English</a>&nbsp;[en]</li>
+<!-- Spanish -->
+<li><a href="/philosophy/x.es.html">Espa&#x00f1;ol</a>&nbsp;[es]</li>
+<!-- French -->
+<li><a href="/philosophy/x.fr.html">Fran&#x00e7;ais</a>&nbsp;[fr]</li>
+<!-- Indonesian -->
+<li><a href="/philosophy/x.id.html">Bahasa Indonesia</a>&nbsp;[id]</li>
+<!-- Japanese -->
+<li><a href="/philosophy/x.ja.html">&#x65e5;&#x672c;&#x8a9e;</a>&nbsp;[ja]</li>
+<!-- Korean -->
+<li><a href="/philosophy/x.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
+<!-- Dutch -->
+<li><a href="/philosophy/x.nl.html">Nederlands</a>&nbsp;[nl]</li>
+<!-- Polish -->
+<li><a href="/philosophy/x.pl.html">Polski</a>&nbsp;[pl]</li>
+<!-- Russian -->
+<li><a 
href="/philosophy/x.ru.html">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
+</ul>
 </div>
 </div>
 </body>

Index: x.html.gw-diff
===================================================================
RCS file: x.html.gw-diff
diff -N x.html.gw-diff
--- x.html.gw-diff      13 Feb 2001 01:26:07 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-*** /usr/www/html/philosophy/x.html    Tue Jul 14 12:55:20 1998
---- /usr/www/html/philosophy/x.html.out        Thu Aug 13 10:20:20 1998
-***************
-*** 167,173 ****
-  
-  Please send FSF &amp; GNU inquiries &amp; questions 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.
-  <P>
---- 167,173 ----
-  
-  Please send FSF &amp; GNU inquiries &amp; questions 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.
-  <P>
-***************
-*** 176,182 ****
-  
-  <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>,
-  send other questions to
-! <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-  <P>
-  Copyright (C) 1998 Richard Stallman
-  <P>
---- 176,182 ----
-  
-  <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>,
-  send other questions to
-! <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-  <P>
-  Copyright (C) 1998 Richard Stallman
-  <P>
-***************
-*** 185,191 ****
-  <P>
-  Updated:
-  <!-- hhmts start -->
-! 14 July 1998 rms
-  <!-- hhmts end -->
-  <HR>
-  </BODY>
---- 185,191 ----
-  <P>
-  Updated:
-  <!-- hhmts start -->
-! 13 Aug 1998 grat-w
-  <!-- hhmts end -->
-  <HR>
-  </BODY>