trans-coord/gnun licenses/license-list.html phi...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   11/08/15 18:16:44

Modified files:
        gnun/licenses  : license-list.html 
        gnun/philosophy: schools.html 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/license-list.html?cvsroot=trans-coord&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/schools.html?cvsroot=trans-coord&r1=1.14&r2=1.15

Patches:
Index: licenses/license-list.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/license-list.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- licenses/license-list.html  12 Aug 2011 18:10:15 -0000      1.63
+++ licenses/license-list.html  15 Aug 2011 18:14:59 -0000      1.64
@@ -826,17 +826,17 @@
 of the alternative licenses that users may convert to.  It also,
 indirectly, allows relicensing to GPL version 3, because there is a
 way to relicense to the CeCILL v2, and the CeCILL v2 gives a way to
-relicense to any version of the GNU GPL.
+relicense to any version of the GNU GPL.</p>
 
-To do this two-step relicensing, you need to first write a piece of
+<p>To do this two-step relicensing, you need to first write a piece of
 code which you can license under the CeCILL v2, or find a
 suitable module already available that way, and add it to the
 program.  Adding that code to the EUPL-covered program provides
 grounds relicense it to the CeCILL v2.  Then your need to write a
-piece of code which you can license under the GPL v3+, or find a
+piece of code which you can license under the GPLv3+, or find a
 suitable module already available that way, and add it to the program.
 Adding that code to the CeCILL-covered program provides grounds to
-relicense it to GPL v3+.</p></dd>
+relicense it to GPLv3+.</p></dd>
 
 <dt><a id="IBMPL" href="http://www.opensource.org/licenses/ibmpl.php";>
     IBM Public License, Version 1.0</a></dt>
@@ -1815,7 +1815,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2011/08/12 18:10:15 $
+    $Date: 2011/08/15 18:14:59 $
     <!-- timestamp end -->
   </p>
 </div>

Index: philosophy/schools.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/schools.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/schools.html     16 Jul 2011 18:10:12 -0000      1.14
+++ philosophy/schools.html     15 Aug 2011 18:16:36 -0000      1.15
@@ -8,13 +8,16 @@
 <p>There are general reasons why all computer users should insist on
 free software: it gives users the freedom to control their own
 computers&mdash;with proprietary software, the computer does what the
-software owner wants it to do, not what the user wants it to
-do.  Free software also gives users the freedom to cooperate with each
-other, to lead an upright life.  These reasons apply to schools as
-they do to everyone.</p>
-
-<p>The purpose of this article is to state additional reasons that
-apply specifically to education.</p>
+software owner wants it to do, not what the user wants it to do.  Free
+software also gives users the freedom to cooperate with each other, to
+lead an upright life.  These reasons apply to schools as they do to
+everyone.  The purpose of this article is to state additional reasons
+that apply specifically to education.</p>
+
+<p>Educational activities (including schools) have
+a <a href="/education/education.html">duty to teach only free
+software.</a>  Here are the reasons.
+</p>
 
 <p>First, free software can save schools money. Free software gives
 schools, like other users, the freedom to copy and redistribute the
@@ -119,7 +122,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/07/16 18:10:12 $
+$Date: 2011/08/15 18:16:36 $
 <!-- timestamp end -->
 </p>
 </div>