trans-coord/gnun/philosophy categories.html jav...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   10/04/05 18:10:09

Modified files:
        gnun/philosophy: categories.html java-trap.html 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/categories.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.7&r2=1.8

Patches:
Index: categories.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/categories.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- categories.html     4 Mar 2010 19:10:07 -0000       1.11
+++ categories.html     5 Apr 2010 18:10:08 -0000       1.12
@@ -1,7 +1,7 @@
 <!--#include virtual="/server/header.html" -->
 <title>Categories of Free and Non-Free Software - GNU Project - Free Software 
Foundation (FSF)</title>
 <!--#include virtual="/server/banner.html" -->
-<h2>Categories of Free and Non-Free Software</h2>
+<h2>Categories of free and non-free software</h2>
 
 <!-- This document uses XHTML 1.0 Strict, but may be served as -->
 <!-- text/html.  Please ensure that markup style considers -->
@@ -11,16 +11,16 @@
 <!-- Change include statements to be consistent with the relevant -->
 <!-- language, where necessary. -->
 
-<p>Also note <a href="/philosophy/words-to-avoid.html">Confusing
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
        Words which You Might Want to Avoid</a>.</p>
 
 <p id="diagram" class="c">
 <img src="category.png" alt="" />
 </p>
 
-      <p>This diagram by Chao-Kuei explains the different categories
-      of software. It's also available as
-      an <a href="/philosophy/category.svg">Scalable Vector
+      <p>This diagram, originally by Chao-Kuei and updated in 2010 by
+      Ineiev, explains the different categories of software. It's also
+      available as an <a href="/philosophy/category.svg">Scalable Vector
       Graphic</a> and as an <a href="/philosophy/category.fig">XFig
       document</a>, under the terms of any of the GNU GPL v2 or later,
       the GNU FDL v1.2 or later, or the Creative Commons
@@ -29,11 +29,11 @@
 <h3 id="FreeSoftware">Free software</h3>
 
        <p>Free software is software that comes with permission for
-       anyone to use, copy, and distribute, either verbatim or with
+       anyone to use, copy, and/or distribute, either verbatim or with
        modifications, either gratis or for a fee. In particular, this
        means that source code must be available. &ldquo;If it's not
        source, it's not software.&rdquo; This is a simplified
-       definition; see also
+       description; see also
        the <a href="/philosophy/free-sw.html">full
        definition</a>.</p>
 
@@ -50,11 +50,11 @@
        list</a> page.</p>
 
        <p>Free software is a matter of freedom, not price. But
-       proprietary software companies sometimes use the term
+       proprietary software companies typically use the term
        &ldquo;free software&rdquo; to refer to price. Sometimes they
        mean that you can obtain a binary copy at no charge; sometimes
        they mean that a copy is bundled with a computer that you are
-       buying, and the price includes both.  Either way, this has
+       buying, and the price includes both.  Either way, it has
        nothing to do with what we mean by free software in the GNU
        project.</p>
 
@@ -79,7 +79,7 @@
        <p>Free software is often <a href="/software/reliability.html">more
        reliable</a> than non-free software.</p>
 
-<h3 id="OpenSource">Open Source software</h3>
+<h3 id="OpenSource">Open source software</h3>
 
        <p>
        The term &ldquo;open source&rdquo; software is used by some
@@ -141,16 +141,17 @@
        modified versions, from some of the common ways of making a
        program proprietary.</p>
 
-        <p>Some copyleft licenses, such as GPL
-       version 3, block other means of turning software proprietary.</p>
+        <p>Some copyleft licenses, such as GPL version&nbsp;3, block
+       other means of turning software proprietary, such as <a
+    href="http://www.gnu.org/licenses/rms-why-gplv3.html";>tivoization</a>.</p> 
 
        <p>In the GNU Project, we copyleft almost all the software we
        write, because our goal is to give <em>every</em> user the freedoms
-       implied by the term &ldquo;free software.&rdquo; See <a href=
-       "/copyleft/copyleft.html">Copylefted</a> for more explanation of
+       implied by the term &ldquo;free software.&rdquo; See our <a href=
+       "/copyleft/copyleft.html">copyleft article</a> for more explanation of
        how copyleft works and why we use it.</p>
 
-       <p>Copyleft is a general concept; to actually copyleft a program,
+       <p>Copyleft is a general concept; to copyleft an actual program,
        you need to use a specific set of distribution terms. There are
        many possible ways to write copyleft distribution terms, so in
        principle there can be many copyleft free software licenses.
@@ -162,8 +163,7 @@
        license; therefore, it is good for the community if people use
        a single copyleft license.</p>
 
-<h3 id="Non-CopyleftedFreeSoftware">Non-copylefted free
-       software</h3>
+<h3 id="Non-CopyleftedFreeSoftware">Non-copylefted free software</h3>
 
        <p>Non-copylefted free software comes from the author with
        permission to redistribute and modify, and also to add additional
@@ -190,8 +190,7 @@
        because others had contributed their code under the same
        non-copyleft license.</p>
 
-<h3 id="GPL-CoveredSoftware">GPL-covered
-       software</h3>
+<h3 id="GPL-CoveredSoftware">GPL-covered software</h3>
 
        <p>The <a href="/copyleft/gpl.html">GNU GPL (General Public
        License)</a> is one specific set of distribution terms for
@@ -344,7 +343,7 @@
        custom software; therefore most programming jobs are, or could be,
        done in a way compatible with the free software movement.</p>
 
-<h3 id="commercialSoftware">Commercial Software</h3>
+<h3 id="commercialSoftware">Commercial software</h3>
 
        <p>Commercial software is software being developed by a
        business which aims to make money from the use of the
@@ -411,7 +410,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/03/04 19:10:07 $
+$Date: 2010/04/05 18:10:08 $
 <!-- timestamp end -->
 </p>
 </div>

Index: java-trap.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/java-trap.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- java-trap.html      4 Apr 2010 18:10:07 -0000       1.7
+++ java-trap.html      5 Apr 2010 18:10:08 -0000       1.8
@@ -29,18 +29,19 @@
 the Java platforms should be compatible, but they are not compatible
 100%.</p>
 
-<p>In addition, there are nonfree programs with ``Java'' in their
-name, such as JavaFX, and there are nonfree Java packages you might
-find tempting but need to reject.  So check the licenses of whatever
-packages you plan to use.  If you use Swing, make sure to use the free
-version, which comes with IcedTea.,</p>
-
-<p>Aside from those Java specifics, general issue described here remains
-important, because any nonfree library or programming platform can
-cause a similar problem.  We must learn a lesson from the history of
+<p>In addition, there are nonfree programs with &ldquo;Java&rdquo; in
+their name, such as JavaFX, and there are nonfree Java packages you
+might find tempting but need to reject.  So check the licenses of
+whatever packages you plan to use.  If you use Swing, make sure to use
+the free version, which comes with IcedTea.</p>
+
+<p>Aside from those Java specifics, the general issue described here
+remains important, because any nonfree library or programming platform
+can cause a similar problem.  We must learn a lesson from the history of
 Java, so we can avoid other traps in the future.</p>
 
-<p>Please also see: <a href="javascript-trap.html">The Javascript Trap</a></p>
+<p>Please also see: <a href="javascript-trap.html">The Javascript
+Trap</a>.</p>
 
 </div>
 
@@ -218,7 +219,7 @@
 translations of this article.
 </p>
 
-<p>Copyright &copy; 2004 Richard Stallman</p>
+<p>Copyright &copy; 2004, 2010 Richard Stallman</p>
 
 <p>Verbatim copying and distribution of this entire article is
 permitted in any medium without royalty provided this notice is 
@@ -228,7 +229,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/04/04 18:10:07 $
+$Date: 2010/04/05 18:10:08 $
 <!-- timestamp end -->
 </p>
 </div>