www/server/staging/readability free-sw.html

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 16/11/09 15:55:49

Modified files:
        server/staging/readability: free-sw.html 

Log message:
        Combine the 2 sections about distribution rules.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/readability/free-sw.html?cvsroot=www&r1=1.9&r2=1.10

Patches:
Index: free-sw.html
===================================================================
RCS file: /webcvs/www/www/server/staging/readability/free-sw.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- free-sw.html        8 Nov 2016 22:31:23 -0000       1.9
+++ free-sw.html        9 Nov 2016 15:55:48 -0000       1.10
@@ -233,7 +233,7 @@
 </p>
 </div>
 
-<h4>The freedom to distribute if you wish: requirements</h4>
+<h4>The freedom to distribute if you wish: basic requirements</h4>
 
 <div class="columns">
 <p>Freedom to distribute (freedoms 2 and 3) means you are free to
@@ -263,7 +263,7 @@
 </p>
 </div>
 
-<h4>The freedom to distribute: acceptable rules</h4>
+<h4>The freedom to distribute: acceptable and unacceptable rules</h4>
 
 <div class="columns">
 <p>
@@ -290,6 +290,18 @@
 </p>
 
 <p>
+Freedom 3 includes the freedom to release your modified versions
+as free software.  A free license may also permit other ways of
+releasing them; in other words, it does not have to be
+a <a href="/copyleft/copyleft.html">copyleft</a> license.  However, a
+license that requires modified versions to be nonfree does not qualify
+as a free license.
+</p>
+</div>
+<div class="column-limit"></div>
+
+<div class="columns">
+<p>
 Rules about how to package a modified version are acceptable,
 if they don't substantively limit your freedom to release modified
 versions, or your freedom to make and use modified versions privately.
@@ -322,20 +334,10 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.</p>
 </div>
-
-<h4>The freedom to distribute: unacceptable or problematic rules</h4>
+<div class="column-limit"></div>
 
 <div class="columns">
 <p>
-Freedom 3 includes the freedom to release your modified versions
-as free software.  A free license may also permit other ways of
-releasing them; in other words, it does not have to be
-a <a href="/copyleft/copyleft.html">copyleft</a> license.  However, a
-license that requires modified versions to be nonfree does not qualify
-as a free license.
-</p>
-
-<p>
 Sometimes government <a id="exportcontrol">export control regulations</a>
 and trade sanctions can constrain your freedom to distribute copies of
 programs internationally.  Software developers do not have the power to
@@ -654,7 +656,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/11/08 22:31:23 $
+$Date: 2016/11/09 15:55:48 $
 <!-- timestamp end -->
 </p>
 </div>