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

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 19/12/16 16:43:45

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

Log message:
        New layout for header, navbar and section menu; rearrange paragraphs to 
push more important text to top.

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

Patches:
Index: free-sw.html
===================================================================
RCS file: /webcvs/www/www/server/staging/readability/free-sw.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- free-sw.html        10 Dec 2019 15:58:04 -0000      1.20
+++ free-sw.html        16 Dec 2019 21:43:44 -0000      1.21
@@ -7,8 +7,8 @@
 <style type="text/css" media="print,screen"><!--
 .note { width: 20em; max-width: 92%; }
 @media (min-width: 48em) {
-    .left { width: 75% }
-    .note { width: 21%; box-shadow: none; }
+    .left { width: 57% }
+    .note { width: 38%; box-shadow: none; }
 }
 --></style>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" />
@@ -16,13 +16,22 @@
 
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/philosophy-menu.html" -->
 <div id="main-text" class="article">
-<p class="edu-breadcrumb">
+
+<input type="checkbox" id="sect-menu-button" />
+<label for="sect-menu-button">
+ <img id="sect-menu-icon"
+      src="/server/staging/layout/sect-menu.png"
+      alt="[3-bar section menu icon]&nbsp;" 
+      title="Philosophy menu" />
+</label>
+
+<p id="breadcrumb">
 <a href="/philosophy/philosophy.html">Philosophy</a> &rarr;
 <a href="/philosophy/essays-and-articles.html#content">Essays &amp; 
articles</a>
 &rarr; <a href="/philosophy/essays-and-articles.html#aboutfs">About free
 software</a> &rarr; What is free software?</p>
+<!--#include virtual="/server/staging/nav-bar/test9/philosophy-menu.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -32,36 +41,8 @@
 <!--#endif -->
 <h2>What is free software?</h2>
 
-<h3 class="subheader">The Free Software Definition</h3>
-
 <div class="comment italic">
 <p>
-The free software definition presents the criteria for whether a
-particular software program qualifies as free software.  From time to
-time we revise this definition, to clarify it or to resolve questions
-about subtle issues.  See the <a href="#History">History section</a>
-below for a list of changes that affect the definition of free
-software.
-</p>
-
-<p>
-&ldquo;Open source&rdquo; is something different: it has a very
-different philosophy based on different values.  Its practical
-definition is different too, but nearly all open source programs are
-in fact free.  We explain the
-difference in <a href="/philosophy/open-source-misses-the-point.html">
-Why &ldquo;Open Source&rdquo; misses the point of Free Software</a>.
-</p>
-</div>
-
-<blockquote class="note" id="fsf-licensing"><p style="font-size: 80%">
-Have a question about free software licensing not answered here?
-See our other <a href="http://www.fsf.org/licensing";>licensing resources</a>,
-and if necessary contact the FSF Compliance Lab
-at <a href="mailto:address@hidden";>address@hidden</a>.</p>
-</blockquote>
-
-<p class="left">
 &ldquo;Free software&rdquo; means software that respects users'
 freedom and community.  Roughly, it means that <b>the users have the
 freedom to run, copy, distribute, study, change and improve the
@@ -73,6 +54,7 @@
 &ldquo;free&rdquo; as in freedom, to show we do not mean the software
 is gratis.
 </p>
+</div>
 
 <p>
 We campaign for these freedoms because everyone deserves them.  With
@@ -85,9 +67,28 @@
 an instrument of unjust power</a>.
 </p>
 
-<h4> The four essential freedoms</h4>
+<p>
+&ldquo;Open source&rdquo; is something different: it has a very
+different philosophy based on different values.  Its practical
+definition is different too, but nearly all open source programs are
+in fact free.  We explain the
+difference in <a href="/philosophy/open-source-misses-the-point.html">
+Why &ldquo;Open Source&rdquo; misses the point of Free Software</a>.
+</p>
+
+<h3 class="subheader">The Free Software Definition</h3>
 
 <p>
+The free software definition presents the criteria for whether a
+particular software program qualifies as free software.  From time to
+time we revise this definition, to clarify it or to resolve questions
+about subtle issues.  See the <a href="#History">History section</a>
+below for a list of changes that affect the definition of free
+software.
+</p>
+
+<h4> The four essential freedoms</h4>
+<p>
 A program is free software if the program's users have the
 four essential freedoms: <a href="#f1">[1]</a>
 </p>
@@ -109,7 +110,14 @@
   </li>
 </ul>
 
-<p>
+<blockquote class="note" id="fsf-licensing"><p style="font-size: 80%">
+Have a question about free software licensing not answered here?
+See our other <a href="http://www.fsf.org/licensing";>licensing resources</a>,
+and if necessary contact the FSF Compliance Lab
+at <a href="mailto:address@hidden";>address@hidden</a>.</p>
+</blockquote>
+
+<p class="left">
 A program is free software if it gives users adequately all of these
 freedoms.  Otherwise, it is nonfree.  While we can distinguish various
 nonfree distribution schemes in terms of how far they fall short of
@@ -380,19 +388,6 @@
 it is nonfree.
 </p>
 
-<h4>Use the right words when talking about free software</h4>
-
-<p>
-When talking about free software, it is best to avoid using terms
-like &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms 
imply that
-the issue is about price, not freedom.  Some common terms such
-as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See 
-<a href="/philosophy/words-to-avoid.html">Confusing Words and Phrases that
-are Worth Avoiding</a> for a discussion of these terms.  We also have
-a list of proper <a href="/philosophy/fs-translations.html">translations of
-&ldquo;free software&rdquo;</a> into various languages.
-</p>
-
 <h4>How we interpret these criteria</h4>
 
 <p>
@@ -409,7 +404,7 @@
 it easier to see why certain licenses do or don't qualify.
 </p>
 
-<h4>Get help with free licenses</h4>
+<h3 class="subheader">Get help with free licenses</h3>
 
 <p>
 If you are interested in whether a specific license qualifies as a free
@@ -433,6 +428,28 @@
 and avoid various practical problems.
 </p>
 
+<h3 id="terminology" class="subheader">Use the right terms</h3>
+
+<p>
+When talking about free software, it is best to avoid using terms
+like &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms 
imply that
+the issue is about price, not freedom.  Some common terms such
+as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See 
+<a href="/philosophy/words-to-avoid.html">Confusing Words and Phrases that
+are Worth Avoiding</a> for a discussion of these terms.  We also have
+a list of proper <a href="/philosophy/fs-translations.html">translations of
+&ldquo;free software&rdquo;</a> into various languages.
+</p>
+
+<p id="open-source">
+Another group uses the term &ldquo;open source&rdquo; to mean
+something close (but not identical) to &ldquo;free software&rdquo;.  We
+prefer the term &ldquo;free software&rdquo; because, once you have heard that
+it refers to freedom rather than price, it calls to mind freedom.  The
+word &ldquo;open&rdquo; <a 
href="/philosophy/open-source-misses-the-point.html">
+never refers to freedom</a>.
+</p>
+
 <h3 id="beyond-software" class="subheader">Beyond Software</h3>
 
 <p>
@@ -454,17 +471,6 @@
 has been extended to a definition of <a href="http://freedomdefined.org/";>
 free cultural works</a> applicable to any kind of works.
 </p>
-
-<h3 id="open-source" class="subheader">Open Source?</h3>
-
-<p>
-Another group uses the term &ldquo;open source&rdquo; to mean
-something close (but not identical) to &ldquo;free software&rdquo;.  We
-prefer the term &ldquo;free software&rdquo; because, once you have heard that
-it refers to freedom rather than price, it calls to mind freedom.  The
-word &ldquo;open&rdquo; <a 
href="/philosophy/open-source-misses-the-point.html">
-never refers to freedom</a>.
-</p>
 <div class="column-limit"></div>
 
 <div class="small">
@@ -615,7 +621,7 @@
 </div><!-- /.article -->
 
 </div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+<!--#include virtual="/server/staging/layout/footer-text.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -672,7 +678,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/12/10 15:58:04 $
+$Date: 2019/12/16 21:43:44 $
 <!-- timestamp end -->
 </p>
 </div>