trans-coord/gnun gnu/initial-announcement.html ...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   10/06/28 18:10:10

Modified files:
        gnun/gnu       : initial-announcement.html 
        gnun/philosophy: java-trap.html right-to-read.html 
                         words-to-avoid.html 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/gnu/initial-announcement.html?cvsroot=trans-coord&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/java-trap.html?cvsroot=trans-coord&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/right-to-read.html?cvsroot=trans-coord&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/words-to-avoid.html?cvsroot=trans-coord&r1=1.27&r2=1.28

Patches:
Index: gnu/initial-announcement.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/gnu/initial-announcement.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gnu/initial-announcement.html       27 Jun 2010 18:10:15 -0000      1.11
+++ gnu/initial-announcement.html       28 Jun 2010 18:10:10 -0000      1.12
@@ -12,9 +12,9 @@
 
 <p> The actual history of the GNU Project differs in many ways from
 this initial plan. For example, the beginning was delayed until
-January, 1984.  Several of the philosophical concepts
-of <a href="/philosophy/free-sw.html">free software</a> had not yet
-been clarified.</p>
+January 1984. Several of the philosophical concepts
+of <a href="/philosophy/free-sw.html">free software</a> were not
+clarified until a few years later.</p>
 
 <h3>Free Unix!</h3>
 
@@ -259,7 +259,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/27 18:10:15 $
+$Date: 2010/06/28 18:10:10 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/java-trap.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/java-trap.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/java-trap.html   24 Jun 2010 18:10:09 -0000      1.11
+++ philosophy/java-trap.html   28 Jun 2010 18:10:10 -0000      1.12
@@ -153,7 +153,7 @@
   program (free or not) depended on a nonfree C compiler. Before we had the 
   GNU C library, every program depended on a nonfree C library. Before we had 
   Linux, the first free kernel, every program depended on a nonfree kernel. 
-  Before we had Bash, every shell script had to be interpreted by a nonfree 
+  Before we had BASH, every shell script had to be interpreted by a nonfree 
   shell. It was inevitable that our first programs would initially be hampered 
   by these dependencies, but we accepted this because our plan included 
rescuing 
   them subsequently. Our overall goal, a self-hosting GNU operating system, 
@@ -229,7 +229,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/24 18:10:09 $
+$Date: 2010/06/28 18:10:10 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/right-to-read.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/right-to-read.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/right-to-read.html       27 Jun 2010 18:10:15 -0000      1.18
+++ philosophy/right-to-read.html       28 Jun 2010 18:10:10 -0000      1.19
@@ -183,8 +183,8 @@
 <p>
 In 2001 the US began attempting to use the proposed Free Trade Area of
 the Americas (FTAA) treaty to impose the same rules on all the countries in
-the Western Hemisphere.  The FTAA is one of the so-called &ldquo;free
-trade&rdquo; treaties, which are actually designed to give business
+the Western Hemisphere.  The FTAA is one of the so-called free
+trade treaties, which are actually designed to give business
 increased power over democratic governments; imposing laws like the
 DMCA is typical of this spirit.  The FTAA was effectively killed by
 Lula, President of Brazil, who rejected the DMCA requirement and
@@ -242,7 +242,7 @@
 power they sought.</p>
 
 <p>
-The SPA, which actually stands for Software Publisher's Association,
+The SPA, which actually stands for Software Publishers Association,
 has been replaced in its police-like role by the Business
 Software Alliance.  The BSA is not, today, an official police force;
 unofficially, it acts like one.  Using methods reminiscent of the
@@ -278,7 +278,7 @@
   <li>The administration's &ldquo;White Paper&rdquo;: Information
        Infrastructure Task Force, Intellectual Property [sic] and the
        National Information Infrastructure: The Report of the Working
-       Group on Intellectual Property Rights (1995).</li>
+       Group on Intellectual Property [sic] Rights (1995).</li>
 
   <li><a href="http://www.wired.com/wired/archive/4.01/white.paper_pr.html";>An
        explanation of the White Paper:
@@ -361,7 +361,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/27 18:10:15 $
+$Date: 2010/06/28 18:10:10 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/words-to-avoid.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/words-to-avoid.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- philosophy/words-to-avoid.html      24 Jun 2010 18:10:09 -0000      1.27
+++ philosophy/words-to-avoid.html      28 Jun 2010 18:10:10 -0000      1.28
@@ -473,7 +473,7 @@
 
 <h4 id="PC">&ldquo;PC&rdquo;</h4>
 <p>
-It's ok to use the abbreviation &ldquo;PC&rdquo; to refer to a certain
+It's OK to use the abbreviation &ldquo;PC&rdquo; 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>
@@ -545,7 +545,7 @@
 obstruction.&rdquo;</p>
 
 
-<h4 id="RAND">&ldquo;RAND (reasonable and nondiscriminatory)&rdquo;</h4>
+<h4 id="RAND">&ldquo;RAND (reasonable and non-discriminatory)&rdquo;</h4>
 <p>
 Standards bodies that promulgate patent-restricted standards that
 prohibit free software typically have a policy of obtaining patent
@@ -562,7 +562,7 @@
 <p>
 Standards bodies should recognize that these licenses are
 discriminatory, and drop the use of the term &ldquo;reasonable and
-nondiscriminatory&rdquo; or &ldquo;RAND&rdquo; to describe them.
+non-discriminatory&rdquo; or &ldquo;RAND&rdquo; to describe them.
 Until they do so, writers who do not wish to join in the
 whitewashing would do well to reject that term.  To accept and use it
 merely because patent-wielding companies have made it widespread is to
@@ -690,7 +690,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/24 18:10:09 $
+$Date: 2010/06/28 18:10:10 $
 <!-- timestamp end -->
 </p>
 </div>