trans-coord-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

trans-coord/gnun gnu/why-gnu-linux.html philoso...


From: Yavor Doganov
Subject: trans-coord/gnun gnu/why-gnu-linux.html philoso...
Date: Wed, 30 Jun 2010 18:10:19 +0000

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

Modified files:
        gnun/gnu       : why-gnu-linux.html 
        gnun/philosophy: schools.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/why-gnu-linux.html?cvsroot=trans-coord&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/schools.html?cvsroot=trans-coord&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/words-to-avoid.html?cvsroot=trans-coord&r1=1.28&r2=1.29

Patches:
Index: gnu/why-gnu-linux.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/gnu/why-gnu-linux.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gnu/why-gnu-linux.html      27 Jun 2010 18:10:15 -0000      1.11
+++ gnu/why-gnu-linux.html      30 Jun 2010 18:10:19 -0000      1.12
@@ -111,7 +111,7 @@
 software cannot be part of a completely free system.  Motif and Qt
 trapped large amounts of free software in this way in the past,
 creating problems whose solutions took years.  Motif remained somewhat
-of a problem until it became obsolete and was no longer user.  Later,
+of a problem until it became obsolete and was no longer used.  Later,
 Sun's nonfree Java implementation had a similar effect:
 the <a href="/philosophy/java-trap.html">Java Trap</a>, fortunately now
 mostly corrected.</p>
@@ -233,7 +233,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/27 18:10:15 $
+$Date: 2010/06/30 18:10:19 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/schools.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/schools.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/schools.html     16 Dec 2009 19:10:11 -0000      1.11
+++ philosophy/schools.html     30 Jun 2010 18:10:19 -0000      1.12
@@ -79,7 +79,7 @@
 tycoons.  All levels of school should use free software.</p>
 
 <ol>
-<li><cite><a name="1"></a>RJ Reynolds tobacco company was
+<li><cite><a name="1"></a>RJ Reynolds Tobacco Company was
 fined $15m in 2002 for handing out free samples of cigarettes at
 events attended by children.  See <a 
href="http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm";>http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm</a>.
 </cite></li>
@@ -118,7 +118,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2009/12/16 19:10:11 $
+$Date: 2010/06/30 18:10:19 $
 <!-- 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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- philosophy/words-to-avoid.html      28 Jun 2010 18:10:10 -0000      1.28
+++ philosophy/words-to-avoid.html      30 Jun 2010 18:10:19 -0000      1.29
@@ -358,7 +358,7 @@
 free software.&rdquo;</p>
 
 
-<h4 id="Hacker">Hacker</h4>
+<h4 id="Hacker">&ldquo;Hacker&rdquo;</h4>
 <p>
 A hacker is someone
 who <a href="http://stallman.org/articles/on-hacking.html";> enjoys
@@ -415,7 +415,7 @@
 </p>
 
 
-<h4 id="Linux">Linux system</h4>
+<h4 id="Linux">&ldquo;Linux system&rdquo;</h4>
 <p>
 Linux is the name of the kernel that Linus Torvalds developed starting
 in 1991.  The operating system in which Linux is used is basically GNU
@@ -513,11 +513,11 @@
 
 <h4 id="PowerPoint">&ldquo;PowerPoint&rdquo;</h4>
 <p>
-Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of
-slide presentation.  PowerPoint is just the name of one particular
-proprietary program to make presentations, and there are plenty of free
-alternatives, such as TeX's <tt>beamer</tt> class and OpenOffice.org's
-Impress.</p>
+Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind
+of slide presentation.  &ldquo;PowerPoint&rdquo; is just the name of
+one particular proprietary program to make presentations, and there
+are plenty of free alternatives, such as TeX's <tt>beamer</tt> class
+and OpenOffice.org's Impress.</p>
 
 
 <h4 id="Protection">&ldquo;Protection&rdquo;</h4>
@@ -539,11 +539,13 @@
 
 <p>
 The term &ldquo;protection&rdquo; is also used to describe malicious
-features.  For instance, &ldquo;copy protection&rdquo; is a feature that
-interferes with copying.  From the user's point of view, this is
-obstruction.  So we can call that malicious feature &ldquo;copy
-obstruction.&rdquo;</p>
-
+features.  For instance, &ldquo;copy protection&rdquo; is a feature
+that interferes with copying.  From the user's point of view, this is
+obstruction.  So we could call that malicious feature &ldquo;copy
+obstruction.&rdquo;  More often it is called Digital Restrictions
+Management (DRM)&mdash;see the
+<a href="http://DefectiveByDesign.org";> Defective by Design</a>
+campaign.</p>
 
 <h4 id="RAND">&ldquo;RAND (reasonable and non-discriminatory)&rdquo;</h4>
 <p>
@@ -592,10 +594,10 @@
 <p>
 The term &ldquo;software industry&rdquo; encourages people to imagine
 that software is always developed by a sort of factory and then
-delivered to consumers.  The free software community shows this is not
-the case.  Software businesses exist, and various businesses develop
-free and/or nonfree software, but those that develop free software
-are not run like factories.</p>
+delivered to &ldquo;consumers.&rdquo;  The free software community
+shows this is not the case.  Software businesses exist, and various
+businesses develop free and/or nonfree software, but those that
+develop free software are not run like factories.</p>
 <p>
 The term &ldquo;industry&rdquo; is being used as propaganda by
 advocates of software patents.  They call software development
@@ -690,7 +692,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/28 18:10:10 $
+$Date: 2010/06/30 18:10:19 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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