www-commits
[Top][All Lists]
Advanced

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

www/server/staging/nav-bar/test9 education.html...


From: Therese Godefroy
Subject: www/server/staging/nav-bar/test9 education.html...
Date: Wed, 1 Jan 2020 09:08:33 -0500 (EST)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 20/01/01 09:08:33

Modified files:
        server/staging/nav-bar/test9: education.html 
                                      essays-and-articles.html 
                                      license-list.html philosophy.html 
                                      software.html 

Log message:
        Update to the version currently inline (2020-01-01).

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/essays-and-articles.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/license-list.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/software.html?cvsroot=www&r1=1.21&r2=1.22

Patches:
Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- education.html      8 Oct 2015 16:18:26 -0000       1.32
+++ education.html      1 Jan 2020 14:08:33 -0000       1.33
@@ -1,38 +1,40 @@
 <!--#include virtual="/server/html5-header.html" -->
-<!-- Parent-Version: 1.77 -->
-
+<!-- Parent-Version: 1.79 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <title>Free Software and Education 
 - GNU Project - Free Software Foundation</title>
 
 <!--#include virtual="/education/po/education.translist" -->
+
 <style type="text/css" media="screen">
 <!--
-#content #video-container {
-   max-width: 40em;
-   margin: 2em auto;
+#video-container {
+   width: 40em; max-width: 100%;
+   margin: 1.5em auto;
 }
-#content #video-container p { text-align: justify; }
-#rms-movie { width: 100%; margin-bottom: .3em; }
--->
+#video-container p { text-align: justify; }
+#rms-movie { width: 100%; }
+@media (min-width: 48em) {
+   #content .edu-note {
+      float: right;
+      max-width: 40%;
+      margin: 3.2em 0 2.5em 1.5em;
+   }
+}-->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
+<!--
+@media (min-width: 48em) {
+   #content .edu-note {
+      float: left;
+      margin: 3.4em 1.5em 2.5em 0;
+   }
+}-->
+<!--#endif -->
 </style>
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
-
-<div id="education-content">           
+<!--#include virtual="/server/banner.html" -->
 
-<!-- begin edu navigation bar -->
-<ul id="edu-navigation">
-  <li><a href="/education/edu-contents.html">Education Contents</a></li>
-  <li><a href="/education/edu-cases.html">Case Studies</a></li>
-  <li><a href="/education/edu-resources.html">Educational Resources</a></li>
-  <li><a href="/education/edu-projects.html">Education Projects</a></li>
-  <li><a href="/education/edu-faq.html">FAQ</a></li>
-  <li><a href="/education/edu-team.html">The Education Team</a></li>
-</ul>
-<!-- end edu navigation bar -->
-
-</div> <!-- id="education-content" -->
+<!--#include virtual="/education/education-menu.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -41,18 +43,10 @@
 <!--#endif -->
 <!--#endif -->
 
-<div class="center">
-<h2>Free Software and Education</h2>
-</div>
+<h2 class="c">Free Software and Education</h2>
 
 <h3>How Does Free Software Relate to Education?</h3>
 
-<blockquote class="note"><p>
-We are looking for free educational games, or information about free games 
-that can be used for educational purposes. Contact 
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p></blockquote>
-
 <p>Software freedom plays a fundamental role in education. 
 Educational institutions of all levels should use and teach Free 
 Software because it is the only software that allows them to accomplish 
@@ -76,7 +70,6 @@
 <a href="/philosophy/shouldbefree.html">why software should be free</a>
 (as in freedom).</p>
 
-
 <h3>The Basics</h3>
 <p>The GNU Project was 
 <a href="/gnu/initial-announcement.html">launched</a> in 1983 by 
@@ -126,9 +119,15 @@
 <a href="/education/misc/edu-misc.html#subtitles-rms-education">other 
    languages</a>. 
 </p></div> <!-- /.emph-box -->
-</div> <!-- /#video-container -->
+</div>
+
+<div class="edu-note"><p>
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p></div>
 
-<h3>In Depth</h3>
+<h3 id="indepth">In Depth</h3>
 <ul>
 <li>Learn about the <a href="/education/edu-why.html">Reasons Why</a> 
 educational institutions should use and teach exclusively Free Software.</li>
@@ -142,7 +141,7 @@
 </ul>
 </div> <!-- for id="content", starts in the include above -->
 
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -171,7 +170,7 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -181,7 +180,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/10/08 16:18:26 $
+$Date: 2020/01/01 14:08:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: essays-and-articles.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/nav-bar/test9/essays-and-articles.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- essays-and-articles.html    7 Oct 2015 10:37:28 -0000       1.5
+++ essays-and-articles.html    1 Jan 2020 14:08:33 -0000       1.6
@@ -1,13 +1,18 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.86 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <title>Essays and Articles
 - GNU Project - Free Software Foundation</title>
 
 <!--#include virtual="/philosophy/po/essays-and-articles.translist" -->
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/philosophy-menu.html" -->
+<!--#include virtual="/server/banner.html" -->
+
+<div id="education-content">
+
+<!--#include virtual="/philosophy/philosophy-menu.html" -->
+
+</div> <!-- id="education-content" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -18,16 +23,17 @@
 <h2>Essays and Articles</h2>
 
 <div class="summary">
+<h3 class="no-display">Table of Contents</h3>
 <ul>
   <li><a href="#aboutfs">About Free Software</a></li>
   <li><a href="#aboutgnu">About the GNU Operating System</a></li>
   <li><a href="#LicensingFreeSoftware">Licensing Free Software</a></li>
   <li><a href="#Laws">Laws and Issues</a>
     <ul>
+      <li><a href="#patents">Patents</a></li>
       <li><a href="#copyright">Copyright</a></li>
       <li><a href="#drm">Digital Restrictions Management</a></li>
       <li><a href="#noip">The propaganda term &ldquo;Intellectual 
Property&rdquo;</a></li>
-      <li><a href="#patents">Patents</a></li>
       <li><a href="#ns">Network Services</a></li>
       <li><a href="#cultural">Cultural and Social Issues</a></li>
       <li><a href="#misc">Misc</a></li>
@@ -36,11 +42,16 @@
   <li><a href="#upholding">Upholding Software Freedom</a></li>
   <li><a href="#humor">Philosophical Humor</a></li>
 </ul>
+<hr class="no-display" />
 </div>
 
 <p>This page lists a series of articles describing the philosophy of the
 free software movement, which is the motivation for our development of
 the free software operating system GNU.</p>
+
+<p>A <a href="/philosophy/latest-articles.html">list of the latest 
+published articles</a> is also available.</p>
+
 <p>
 <!-- please leave both these ID attributes here. ... -->
 <a id="TOCFreedomOrganizations">We</a>
@@ -71,6 +82,8 @@
        essay about the same topic as the previous one)</li>
   <li><a href="/philosophy/free-doc.html">Why Free Software Needs
       Free Documentation</a></li>
+ <li><a href="/philosophy/when-free-depends-on-nonfree.html">
+  When Free Software Depends on Nonfree</a></li>
   <li><a href="/philosophy/selling.html">Selling Free Software</a> is OK!</li>
   <li><a href="/philosophy/categories.html">Categories of Free and
        Non-Free Software</a></li>
@@ -80,6 +93,8 @@
          When Free Software Isn't (Practically) Superior</a></li>
   <li><a href="/philosophy/open-source-misses-the-point.html">Why
        &ldquo;Open Source&rdquo; misses the point of Free Software</a></li>
+  <li><a href="/philosophy/free-open-overlap.html">How Free Software and 
+      Open Source Relate as Categories of Programs</a></li>
   <li><a href="/philosophy/linux-gnu-freedom.html">Linux, GNU, and
        Freedom</a></li>
   <li><a href="/philosophy/gnutella.html"
@@ -94,8 +109,17 @@
       Your Freedom Needs Free Software</a></li>
   <li><a href="/philosophy/fs-motives.html">
       Motives For Writing Free Software</a></li>
-  <li><a href="/philosophy/gov-promote.html">
-      How Should Governments Promote Free Software?</a></li>
+  <li><a href="/philosophy/government-free-software.html">Measures 
+      Governments Can Use to Promote Free Software</a></li>
+  <li><a href="/philosophy/uruguay.html">Lesson from Uruguay</a>. The FSF
+      learned something from a bill presented in Uruguay.</li>
+  <li><a href="/philosophy/programs-must-not-limit-freedom-to-run.html">
+      Why programs must not limit the freedom to run them</a> &mdash;
+      Freedom 0 must not be limited.</li>
+  <li><a href="/philosophy/imperfection-isnt-oppression.html">
+      Imperfection is not the same as oppression</a></li> 
+  <li><a href="/philosophy/applying-free-sw-criteria.html">
+      Applying the Free Software Criteria</a></li>
 </ul>
 
 <h3 id="aboutgnu">About the GNU Operating System</h3>
@@ -108,7 +132,7 @@
   <li><a href="/gnu/thegnuproject.html">The GNU Project</a>,
       a longer and more complete description of the project and its
       history.</li>
-  <li><a href="/fsf/fsf.html">What is the Free Software Foundation?</a></li>
+  <li><a href="/fsf/fsf.html">The official website of the Free Software 
Foundation</a></li>
   <li><a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a></li>
 </ul>
 
@@ -117,33 +141,32 @@
 <ul>
   <li><a href="/licenses/licenses.html">General information on licensing 
       and copyleft</a></li>
-  <li><a href="/licenses/license-list.html">A list of specific free 
-      software licenses</a></li>
+  <li><a href="/licenses/license-list.html">A list of free and nonfree
+      licenses, with comments</a>.</li>
   <li><a href="/licenses/gpl-faq.html">Frequently Asked Questions About 
       the GNU Licenses</a></li>
   <li><a href="/licenses/why-not-lgpl.html">Why You Shouldn't Use the 
       Lesser GPL for Your Next Library</a></li>
-  <li><a href="/copyleft/copyleft.html">Copyleft</a></li>
+  <li><a href="/licenses/copyleft.html">Copyleft</a></li>
   <li><a href="/philosophy/why-copyleft.html">Why Copyleft?</a></li>
   <li><a href="/philosophy/university.html">Releasing Free Software if 
       You Work at a University</a></li>
   <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatic 
Idealism</a></li>
-  <li><a href="/philosophy/javascript-trap.html">Javascript Trap</a> 
-         &mdash;You may be running non-free programs on your computer 
-         every day without realizing it &mdash; through your web browser.</li>
-  <li><a href="/philosophy/vaccination.html">Viral Code and Vaccination</a>, 
-         an article by Robert J. Chassell</li>
+  <li><a href="/philosophy/javascript-trap.html">Javascript Trap</a>. 
+         You may be running nonfree programs on your computer 
+         every day without realizing it&mdash;through your web browser.</li>
   <li><a href="http://www.fsf.org/blogs/licensing/20050211.html";>
       Censorship envy and licensing</a></li>
   <li><a href="/philosophy/x.html">The X Window System Trap</a></li>
   <li><a href="/philosophy/apsl.html">The Problems of the Apple 
License</a></li>
-  <li><a href="/philosophy/bsd.html">The BSD License Problem</a></li>
+  <li><a href="/licenses/bsd.html">The BSD License Problem</a></li>
   <li><a href="/philosophy/netscape-npl.html">The Netscape Public License 
-      Has Serious Problems</a></li>
+      Has Serious Problems</a>. An <a href="/philosophy/netscape-npl-old.html">
+      earlier version of this article</a> is also available.</li>
   <li><a href="/philosophy/udi.html">The Free Software Movement and 
UDI</a></li>
   <li><a href="/philosophy/gates.html">It's not the Gates, it's the 
       bars</a>, an article by Richard Stallman published in BBC News in
-      2008</li>
+      2008.</li>
   <li><a href="/philosophy/microsoft.html">Is Microsoft the Great Satan?</a>  
       (An <a href="/philosophy/microsoft-old.html">older version</a> of 
       this article is also available.)</li>
@@ -176,24 +199,113 @@
       <a href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html";>
       relicensed</a> most of its Java platform reference implementation
       under the GNU General Public License, the issue described in this
-      article still remains important)</li>
+      article still remains important.)</li>  
+  <li><a href="/philosophy/rtlinux-patent.html">GPL-compliant version
+      of RTLinux Open Patent License in Works</a></li>
+</ul>
+
+<h3 id="Laws">Laws and Issues</h3>
+
+<p><a href="/philosophy/stallmans-law.html">Stallman's Law</a></p>
+
+<h4 id="patents">Patents</h4>
+
+<ul>  
+  <li><a href="/philosophy/limit-patent-effect.html">Giving the Software
+  Field Protection from Patents</a></li>
+
+  <li><a href="/philosophy/w3c-patent.html">FSF's Position on W3
+  Consortium &ldquo;Royalty-Free&rdquo; Patent Policy</a>
+  rewritten</li>
+
+  <li>How to Protect the <a href="/philosophy/protecting.html">Right
+  to Write Software</a> (whether it's free or not).</li>
+
+  <li>In <a 
href="https://www.eff.org/press/releases/princeton-scientists-sue-over-squelched-research";>
+  Felten v. RIAA</a>, scientists are asking a court to rule that the
+  Digital Millennium Copyright Act (DMCA) does not prohibit them from
+  publishing their research.</li>
+
+  <li><a href="https://www.eff.org/search/site/dvd cases/">EFF
+  &ldquo;Intellectual Property&rdquo;: MPAA (Motion Picture Association of
+  America) DVD Cases Archive</a></li>
+
+  <li><a href="/philosophy/patent-reform-is-not-enough.html">Patent
+  Reform Is Not Enough</a></li>
+
+  <li><a href="/philosophy/savingeurope.html">Saving Europe from
+  Software Patents</a></li>
+
+  <li><a href="/philosophy/europes-unitary-patent.html">Europe's 
+  &ldquo;unitary patent&rdquo; could mean unlimited software patents</a></li>
+
+  <li><a href="/philosophy/amazon.html">Boycott Amazon!</a></li>
+  
+  <li><a href="/philosophy/amazon-nat.html">Amazon Boycott Success!</a>, a 
+  letter from Nat Friedman to Richard Stallman.</li>
+  
+  <li><a href="/philosophy/amazon-rms-tim.html">Letter from RMS to Tim 
+  O'Reilly</a> in regard to a statement by Jeff Bezos, CEO of Amazon, on 
+  the duration of software patents.</li>
+  
+  <li><a href="/philosophy/amazonpatent.html">Amazon's patent on a system 
+  for placing a purchase order over the internet</a>, with notes by Richard
+  Stallman.</li>
+
+  <li><a 
href="https://web.archive.org/web/20000815064858/http://www.researchoninnovation.org/patent.pdf";
+  id="SequentialIPandI">Sequential Innovation, Patents, and
+  Imitation</a> is a paper that presents a mathematical model showing
+  how patents can impede progress in fields like software.</li>
+
+  <li><a href="/philosophy/hague.html">Harm from the Hague</a>.</li>
+
+  <li><a href="/philosophy/guardian-article.html">Opposing The European
+  Software Patent Directive</a>, a slightly modified version of the 
+  article originally published in <a 
href="http://www.theguardian.com/international";>
+  The Guardian</a> of London, by Richard Stallman and Nick Hill.</li>
+
+  <li><a 
href="http://www.theguardian.com/technology/2005/aug/02/comment.business";>
+  Soft sell</a>. Richard Stallman's comments on the defeat of the EU 
+  software patenting directive. Published in <i>The Guardian</i> in 2005.</li>
+
+  <li><a 
href="http://www.theguardian.com/technology/2005/jun/23/onlinesupplement.insideit";>
+  Patent absurdity</a>, an article by Richard M. Stallman published in
+  <i>The Guardian</i> in 2005.</li>
+
+  <li><a href="/philosophy/bill-gates-and-other-communists.html">Bill Gates
+  and Other Communists</a>. An article by Richard Stallman published
+  in CNET News.com in 2005.</li>
+
+  <li><a href="/philosophy/trivial-patent.html">The Anatomy of a
+  Trivial Patent</a>, by Richard M. Stallman.</li>
+
   <li><a href="/philosophy/fighting-software-patents.html" 
id="FightingSoftwarePatents">
        Fighting Software Patents - Singly and Together</a></li>
+
+  <li><a href="/philosophy/software-patents.html">Software patents &mdash; 
+  Obstacles to software development</a></li>
+  
   <li><a href="/philosophy/software-literary-patents.html" 
id="SoftwareLiteraryPatents">
-      Software Patents and Literary Patents</a>, by Richard M. Stallman,
-      speaking of patenting artistic techniques, US patent (6,935,954)
+      Software Patents and Literary Patents</a>, by Richard M. Stallman.
+      Speaking of patenting artistic techniques, US patent (6,935,954)
       covers making game characters start to hallucinate when (according to
       the game) they are being driven insane. That is getting pretty close
-      to the hypothetical examples cited in this article.
-  </li>
-  <li><a href="/philosophy/rtlinux-patent.html">GPL-compliant version
-  of RTLinux Open Patent License in Works</a></li>
-</ul>
+      to the hypothetical examples cited in this article.</li>  
 
-<h3 id="Laws">Laws and Issues</h3>
+  <li><a href="/philosophy/gif.html">Why there are no GIF files on GNU web 
+  pages</a>. While this story is a historical illustration of the danger of 
+  software patents, these particular patents are now no longer a concern. 
+  For details of our website 
+  <a href="/server/fsf-html-style-sheet.html#UseofGraphics">
+  policies regarding GIFs</a>, see our <a href="/server/standards/">
+  web guidelines</a>.</li> 
+</ul>
 
 <h4 id="copyright">Copyright</h4>
+
 <ul>
+  <li><a href="/philosophy/assigning-copyright.html">When a Company Asks 
+  For Your Copyright</a></li>
 
   <li><a href="/philosophy/public-domain-manifesto.html">Why I Will Not Sign
       the Public Domain Manifesto</a></li>
@@ -202,8 +314,7 @@
   Platform Backfires on Free Software</a></li>
 
   <li><a href="/philosophy/misinterpreting-copyright.html">Misinterpreting
-  Copyright</a> is another essay
-  by <a href="http://www.stallman.org";>Richard Stallman</a> about the
+  Copyright</a> is another essay by Richard Stallman about the
   flaws in popular defenses of copyright law.</li>
 
   <li><a href="/philosophy/eldred-amicus.html">FSF's Brief Amicus
@@ -213,7 +324,7 @@
   &ldquo;push copyright aside&rdquo;</a>, another work of <a
   href="http://www.stallman.org";>Richard Stallman</a> that appeared in
   the <a
-  href="http://www.nature.com/nature/debates/e-access/Articles/stallman.html";>
+  
href="https://web.archive.org/web/20050729110347/http://www.nature.com/nature/debates/e-access/Articles/stallman.html";>
   Nature Webdebates</a> in 2001, explains how copyright is impeding
   progress in scientific research.  You may also be interested in <a
   href="https://www.plos.org/";>The Public Library of
@@ -228,32 +339,19 @@
   copyright by 20 extra years.</li>
 
   <li><a href="/philosophy/freedom-or-copyright.html">Freedom-Or
-  Copyright?</a>, by <a href="http://www.stallman.org/";>Richard
-  Stallman</a> (an <a
+  Copyright?</a>, by Richard Stallman (an <a
   href="/philosophy/freedom-or-copyright-old.html">older version</a> of
-  this essay remains online as well).</li>
+  this essay remains online as well.)</li>
 
-  <li><a href="/philosophy/copyright-versus-community.html"
-  id="StallmanTalkLSM"> Copyright versus community in the age of
-  computer networks</a>: is a transcript of a keynote by
-  <a href="http://www.stallman.org";> Richard Stallman</a> at
-  the LIANZA conference in Christchurch, New Zealand, on October 12,
-  2009.</li>
-
-  <li><a 
href="http://www.oii.ox.ac.uk/resources/feedback/OIIFB_GPL2_20040903.pdf";>
-  An English translation</a> of the famous decision of the District
-  Court of Munich (Germany) regarding the enforceability and validity
-  of the GPL. The translation was done by the Oxford Internet
+  <li>An <a 
href="https://www.oii.ox.ac.uk/archive/downloads/research/gpl/OIIFB_GPL2_20040903.pdf";>
+  English translation of the famous 
+  decision of the District Court of Munich</a> regarding the enforceability 
and 
+  validity of the GPL. The translation was done by the Oxford Internet
   Institute.</li>
   <!-- This link is broken
   <li><a href="http://www.humaninfo.org/copyrigh.htm";>Examples of
   Excellent Copyright Policies</a></li>
   -->
-
-  <li><a href="/philosophy/is-ever-good-use-nonfree-program.html">
-  Is It Ever a Good Thing to Use a Nonfree Program?</a> By
-  <a href="http://www.stallman.org";> Richard Stallman</a></li>
-
 </ul>
 
 <h4 id="drm">Digital Restrictions Management</h4>
@@ -267,29 +365,23 @@
   <li><a href="/philosophy/computing-progress.html">Computing
   &ldquo;progress&rdquo;: good and bad</a>, by Richard M. Stallman.</li>
 
-  <li><a href="/philosophy/why-audio-format-matters.html">Why Audio
-  Format matters</a> by Karl Fogel</li>
-
   <li><a href="/philosophy/opposing-drm.html">Opposing Digital Rights
   Mismanagement</a>, by Richard M. Stallman, answers a few common
   questions about DRM.</li>
 
   <li><a href="/philosophy/ebooks.html">Ebooks: Freedom Or
   Copyright</a> a slightly modified version of the article, originally
-  published in Technology Review in 2000, by 
-      <a href="http://www.stallman.org";> Richard Stallman</a></li>
+  published in Technology Review in 2000, by Richard Stallman</li>
 
   <li><a href="/philosophy/ebooks-must-increase-freedom.html">
   Ebooks must increase our freedom, not decrease it</a></li>
 
   <li><a href="/philosophy/can-you-trust.html">Can you trust your
-  computer?</a>, a work by <a href="http://www.stallman.org";>Richard
-  Stallman</a> about the so-called &ldquo;trusted computing&rdquo;
-  initiatives.</li>
+  computer?</a>, a work by Richard Stallman about the so-called 
+  &ldquo;trusted computing&rdquo; initiatives.</li>
 
   <li><a href="/philosophy/right-to-read.html">The Right to Read: A
-  Dystopian Short Story</a> by <a href="http://www.stallman.org/";>
-  Richard Stallman</a></li>
+  Dystopian Short Story</a> by Richard Stallman.</li>
 </ul>
 
 <h4 id="noip">The propaganda
@@ -302,7 +394,7 @@
   
   <li><a href="/philosophy/no-ip-ethos.html">Don't Let
   &ldquo;Intellectual Property&rdquo; Twist Your Ethos</a>, by
-  Richard&nbsp;M. Stallman.</li>
+  Richard Stallman.</li>
 
   <li>Comments from Richard Stallman
   on <a href="/philosophy/ipjustice.html">the ICLC's rejection of the
@@ -316,69 +408,7 @@
   <li><a href="/philosophy/not-ipr.html">Did You Say
   &ldquo;Intellectual Property&rdquo;?  It's a Seductive Mirage</a>.
   An essay on the true meaning of the phrase &ldquo;Intellectual
-  Property&rdquo;, by Richard M. Stallman</li>
-</ul>
-
-<h4 id="patents">Patents</h4>
-<ul>
-  <li><a href="/philosophy/limit-patent-effect.html">Giving the Software
-  Field Protection from Patents</a></li>
-
-  <li><a href="/philosophy/w3c-patent.html">FSF's Position on W3
-  Consortium &ldquo;Royalty-Free&rdquo; Patent Policy</a>
-  rewritten</li>
-
-  <li><a href="/philosophy/guardian-article.html">Opposing The European
-  Software Patent Directive</a>, a slightly modified version of the 
-  article, originally  published in <a href="http://www.guardian.co.uk";>
-  The Guardian</a> of London by <a href="http://www.stallman.org";>Richard 
-  Stallman</a> and Nick Hill.</li>
-
-  <li>How to Protect the <a href="/philosophy/protecting.html">Right
-  to Write Software</a> (independent of whether it's free or not)</li>
-
-  <li>In <a 
href="https://www.eff.org/press/releases/princeton-scientists-sue-over-squelched-research";>
-  Felten v. RIAA</a>, scientists are asking a court to rule that the
-  Digital Millennium Copyright Act (DMCA) does not prohibit them from
-  publishing their research.</li>
-
-  <li><a href="https://www.eff.org/search/site/dvd cases/">EFF
-  &ldquo;Intellectual Property&rdquo;: MPAA (Motion Picture Association of
-  America) DVD Cases Archive</a></li>
-
-  <li><a href="/philosophy/patent-reform-is-not-enough.html">Patent
-  Reform Is Not Enough</a></li>
-
-  <li><a href="/philosophy/savingeurope.html">Saving Europe from
-  Software Patents</a></li>
-
-  <li><a href="/philosophy/amazon.html">Boycott Amazon!</a></li>
-
-  <li><a href="http://www.researchoninnovation.org/patent.pdf";
-  id="SequentialIPandI">Sequential Innovation, Patents, and
-  Imitation</a> is a paper that presents a mathematical model showing
-  how patents can impede progress in fields like software.</li>
-
-  <li><a href="/philosophy/hague.html">Harm from the Hague</a>.</li>
-
-  <li><a 
href="http://technology.guardian.co.uk/online/comment/story/0,12449,1540984,00.html";>
-  Soft sell</a>. An article by Richard M. Stallman published in
-  <a href="http://www.guardian.co.uk";>The Guardian</a>.</li>
-
-  <li><a 
href="http://www.guardian.co.uk/technology/2005/jun/23/onlinesupplement.insideit";>
-  Patent absurdity</a>, an article by Richard M. Stallman published in
-  <a href="http://www.guardian.co.uk";>The Guardian</a>.</li>
-
-  <li><a href="/philosophy/trivial-patent.html">The Anatomy of a
-  Trivial Patent</a>, by Richard M. Stallman.</li>
-
-  <li><a href="/philosophy/gif.html">Why there are no GIF files on GNU web 
-  pages</a>, While this story is a historical illustration of the danger of 
-  software patents, these particular patents are now no longer a concern. 
-  For details of our website 
-  <a href="/server/fsf-html-style-sheet.html#UseofGraphics">
-  policies regarding GIFs</a>, see our web <a href="/server/standards/">
-  web guidelines</a>.</li>
+  Property&rdquo;, by Richard M. Stallman.</li>
 </ul>
 
 <h4 id="ns">Network Services</h4>
@@ -395,35 +425,49 @@
 <h4 id="cultural">Cultural and Social Issues</h4>
 
 <ul>
+  <li><a href="/philosophy/phone-anonymous-payment.html">Anonymous
+  Payment by Phone</a></li>
+
+  <li><a 
href="https://www.theguardian.com/commentisfree/2018/apr/03/facebook-abusing-data-law-privacy-big-tech-surveillance";>
+  A radical proposal to keep your personal data safe</a>, by Richard
+  Stallman</li>
+
+ <li><a href="/philosophy/surveillance-testimony.html">Surveillance
+  Testimony</a></li>
+
+ <li><a href="/philosophy/devils-advocate.html">
+  Why the Devil's Advocate Doesn't Help Reach the Truth</a></li>
+
+ <li><a href="/philosophy/hackathons.html">
+  Why Hackathons Should Insist on Free Software</a>
+  by Richard Stallman</li>
+
   <li><a href="/philosophy/technological-neutrality.html">
     Technological Neutrality and Free Software</a>
     by Richard Stallman</li>
+
   <li><a href="/philosophy/surveillance-vs-democracy.html">How Much
     Surveillance Can Democracy Withstand?</a> by Richard Stallman</li>
+
   <li><a href="/philosophy/nonfree-games.html">Nonfree DRM'd Games on
-  GNU/Linux: Good or Bad?</a> by Richard Stallman</li>
-  <li> <a 
href="http://www.guardian.co.uk/technology/blog/2010/apr/06/digital-economy-bill-richard-stallman";>
-  Digital economy bill: One clown giveth and the other clown taketh away</a> 
-  by <a href="http://www.stallman.org";>Richard Stallman</a></li>
+  GNU/Linux: Good or Bad?</a> by Richard Stallman.</li>
+
+  <li> <a 
href="http://www.theguardian.com/technology/blog/2010/apr/06/digital-economy-bill-richard-stallman";>
+  Digital economy bill: One clown giveth and the other clown taketh 
+  away</a>, by Richard Stallman.</li>
 
   <li><a href="/philosophy/digital-inclusion-in-freedom.html">
   Is Digital Inclusion A Good Thing? How Can We Make Sure It Is?</a> 
-  by <a href="http://www.stallman.org";>Richard Stallman</a></li>
+  By Richard Stallman.</li>
 
   <li><a href="/philosophy/wsis.html">World Summit on the Information
   Society</a></li>
 
-  <li><a href="/philosophy/lessig-fsfs-intro.html">The introduction by
-  Lawrence Lessig</a>
-  to <a href="http://shop.fsf.org/product/free-software-free-society/";><i>
-  Free Software, Free Society: The Selected Essays of Richard
-  M. Stallman</i></a> is available for reading.</li>
-
   <li><a href="/philosophy/wassenaar.html">Encryption software
   volunteers needed in countries without export control</a>.</li>
 
   <li>How to Protect the <a href="/philosophy/basic-freedoms.html">
-  Freedoms of Speech, Press, and Association</a> on the Internet</li>
+  Freedoms of Speech, Press, and Association</a> on the Internet.</li>
 
   <li><a href="/philosophy/privacyaction.html">Protect Postal
   Privacy</a>, a campaign to resist the proposed rule by the United
@@ -437,20 +481,38 @@
   Stallman (originally published under the title &ldquo;Second
   Sight&rdquo;).</li>
 
-  <li><a 
href="http://web.archive.org/web/20070806183422/http://www.insnet.org/ins_headlines.rxml?cust=212&amp;id=967";>
+  <li><a href="/philosophy/fs-and-sustainable-development.html">
   Free Software and Sustainable Development</a> &mdash; A short
   article by Richard Stallman regarding the use of proprietary
   software in cultural development.</li>
 
+  <li><a href="/philosophy/keep-control-of-your-computing.html">
+  Keep control of your computing, so it doesn't control you!</a></li>
+
+  <li><a href="/philosophy/judge-internet-usage.html">
+  A wise user judges each Internet usage scenario carefully</a></li>
+
+  <li><a href="/philosophy/the-danger-of-ebooks.html">The Danger of 
E-Books</a></li>
+
+  <li><a href="/philosophy/is-ever-good-use-nonfree-program.html">
+  Is It Ever a Good Thing to Use a Nonfree Program?</a> By
+  Richard Stallman.</li>
+
+ <li><a href="/philosophy/contradictory-support.html">
+  Beware of Contradictory &ldquo;Support&rdquo;</a></li>
 </ul>
 
 
 <h4 id="misc">Misc</h4>
+
 <ul>
   <li><a href="/philosophy/proprietary.html">Clearly established 
   cases of proprietary software that does nasty things to the
   users</a>.</li>
 
+  <li><a href="/philosophy/practical.html">The advantages of free 
+  software</a>.</li>
+
   <li><a href="/philosophy/bug-nobody-allowed-to-understand.html">The
   Bug Nobody is Allowed to Understand</a>, By Richard Stallman.</li>
 
@@ -476,12 +538,25 @@
   <li><a href="/philosophy/dat.html">The Right Way to Tax DAT</a></li>
 
   <li><a href="/philosophy/censoring-emacs.html">Censoring My
-  Software</a>, by <a href="http://www.stallman.org";>Richard
-  Stallman</a></li>
+  Software</a>, by Richard Stallman.</li>
   
   <li><a href="/philosophy/funding-art-vs-funding-software.html">Funding
-  Art vs Funding Software</a>, by <a href="http://www.stallman.org";>Richard
-  Stallman</a></li>
+  Art vs Funding Software</a>, by Richard Stallman.</li>
+
+  <li><a href="/philosophy/android-and-users-freedom.html">
+  Android and Users' Freedom</a></li>
+
+  <li><a href="/philosophy/ubuntu-spyware.html">Ubuntu Spyware: What to 
Do?</a></li>
+
+  <li><a href="/philosophy/whats-wrong-with-youtube.html">What's Wrong with 
+  YouTube</a></li>
+
+  <li><a href="/philosophy/netscape.html">Netscape and Free Software</a>,
+  an old article that clarifies some misunderstandings about an 
+  announcement by Netscape.</li>
+
+  <li><a href="/philosophy/rms-comment-longs-article.html">Comments on 
+  Roderick Long's Article</a>.</li>
 </ul>
 
 <h3 id="terminology">Terminology and Definitions</h3>
@@ -491,6 +566,10 @@
       Free Hardware and Free Hardware Designs</a></li>
   <li><a href="/philosophy/words-to-avoid.html">Confusing Words</a>
       which You Might Want to Avoid</li>
+  <li><a href="/philosophy/wipo-PublicAwarenessOfCopyright-2002.html">
+      Public Awareness of Copyright, WIPO, June 2002</a>. On how WIPO 
+      recognizes that their system is designed to restrict the public, and
+      how they propose to modify terminology so that people won't notice.</li>
   <li><a href="/philosophy/open-source-misses-the-point.html">Why
       &ldquo;Open Source&rdquo; misses the point of Free Software</a></li>
   <li><a href="/philosophy/free-software-for-freedom.html">&ldquo;Open
@@ -505,7 +584,7 @@
   <li><a href="/philosophy/loyal-computers.html">
       What Does It Mean for Your Computer to Be Loyal?</a></li>
   <li><a href="/philosophy/fs-translations.html">Translations of the
-      term &ldquo;free software&rdquo;</a> into various languages</li>
+      term &ldquo;free software&rdquo;</a> into various languages.</li>
   <li><a href="/philosophy/why-call-it-the-swindle.html">Why call it the
       Swindle</a></li>
 </ul>
@@ -513,13 +592,17 @@
 <h3 id="upholding">Upholding Software Freedom</h3>
 
 <ul>
+  <li><a href="/philosophy/install-fest-devil.html">Install Fests:
+      What to Do about the Deal with the Devil</a></li>
+  <li><a href="/philosophy/upgrade-windows.html">What Is the Right Way to
+      Upgrade an Installation of Windows?</a></li>
   <li><a href="/philosophy/use-free-software.html">The Free Software 
       Community After 20 Years</a>, With great but incomplete success, 
       what now?</li>
-  <li><a href="/philosophy/mcvoy.html">Thank You, Larry McVoy</a> 
-      by Richard M. Stallman</li>
+  <li><a href="/philosophy/mcvoy.html">Thank You, Larry McVoy</a>, 
+      by Richard M. Stallman.</li>
   <li><a href="/philosophy/social-inertia.html">
-      Overcoming Social Inertia</a>, by Richard M. Stallman</li>
+      Overcoming Social Inertia</a>, by Richard M. Stallman.</li>
   <li><a href="/philosophy/compromise.html">Avoiding Ruinous 
Compromises</a></li>
   <li><a href="/philosophy/free-software-even-more-important.html">
       Free Software Is Even More Important Now</a></li>
@@ -532,17 +615,8 @@
     We don't have to be serious <i>all</i> the time.</li>
 </ul>
 
-<h3>Links to more philosophy articles</h3>
-
-<ul>
-<li id="Speeches"><a href="/philosophy/speeches-and-interview.html">
-Speeches and interviews</a></li>
-<li id="ThirdPartyIdeas"><a href="/philosophy/third-party-ideas.html">
-Third party ideas</a></li>
-<li id="Philosophy"><a href="/philosophy/">The main philosophy page</a></li>
-</ul>
 </div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -570,7 +644,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 1996-2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1996-2019 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -580,10 +654,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/10/07 10:37:28 $
+$Date: 2020/01/01 14:08:33 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: license-list.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/license-list.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- license-list.html   2 Nov 2015 10:57:55 -0000       1.41
+++ license-list.html   1 Jan 2020 14:08:33 -0000       1.42
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.90 -->
 <title>Various Licenses and Comments about Them
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/licenses/po/license-list.translist" -->
@@ -8,51 +8,58 @@
 <!--
 /* These statements are commented out in HTML to
    make them untranslatable.  */
-#TableOfContents { margin-bottom: 1em; }
-#TableOfContents p { font-weight: bold; margin-bottom: .5em; }
-#content p.back { margin-top: 3em; }
-#content blockquote#fsf-licensing { margin-top: .7em; }
+div.toc { margin-bottom: 1em; }
+.toc ul { font-weight: normal; }
+.toc > ul { font-weight: bold; list-style: none; }
+#fsf-licensing { margin: 1em auto; }
+p.back { margin-top: 2em; }
 /* Definitions for color-coded border */
-#content dl.green, #content dl.orange,
- #content dl.red, #content dl.blue, #content dl.purple {
+dl.green, dl.orange, dl.red, dl.blue, dl.purple {
    padding-left: 1em;
    margin-left: 0;
 }
 
-#content dl.green { border-left: .4em solid green; }
-#content dl.orange { border-left: .4em dashed orange; }
-#content dl.red { border-left: .4em dotted red; }
-#content dl.blue { border-left: .4em double  blue; }
-#content dl.purple { border-left: .4em groove purple; }
+dl.green { border-left: .4em solid green; }
+dl.orange { border-left: .4em dashed orange; }
+dl.red { border-left: .4em dotted red; }
+dl.blue { border-left: .4em double  blue; }
+dl.purple { border-left: .4em groove purple; }
 
 /* Disable legend for CSS1-only browsers:
    they don't support :before and :after */
-#content div#legend { display: none; }
+#legend { display: none; }
 /* Enable legend for CSS2+ browsers. */
 @media print,screen {
-#content div#legend { display: block; }
+div#legend { display: block; }
 }
-#content div#legend {
-   float: right;
-   width: 18.4em; max-width: 90%;
-   font-family: FreeSans, sans-serif;
+#legend {
+   float: left;
+   max-width: 92%;
+   padding: 1.2em 4%;
+   margin: 1.5em 0;
+   background: #f5f5f5;
+   border: 1px solid #bbb; 
+}
+#legend blockquote {
    font-style: normal;
-   padding: .7em 1em 1em 1em;
-   margin: 2em 0 1.5em 0;
-   background: #f0f2f4;
-   border-left: 1.5em solid white;
 }
-@media (max-width: 46em) {
-   #content div#legend {
-      float: none; width: 30em; max-width: 80%;
-      margin: 2.4em auto 1.5em auto;
+@media (min-width: 48em) {
+   #fsf-licensing {
+      margin: 1.7em  0 2em 2em;
+   }
+   #legend {
+      float: right;
+      width: 20em;
+      max-width: 40%;
+      padding: 1.2em;
+      margin: 1.6em 0 2em 1.5em;
    }
 }
-#content div#legend dl { margin: 1em 0 0 0; }
-#content div#legend dt { padding: 1em 0; margin: 0; }
-#content div#legend dd { margin: 0; }
+#legend dl { margin: 1em 0 0 0; }
+#legend dt { padding: .8em 0; margin: 0; }
+#legend dd { margin: 0; }
 
-#legend blockquote { font-size: 1.2em; font-style: normal; text-align: center; 
font-weight: bold; }
+#legend blockquote { font-size: 1.2em; font-style: normal; text-align: center; 
font-weight: bold; margin: 0; }
 #legend dl.green dt:after, #legend dl.orange dt:after,
 #legend dl.red dt:after, #legend dl.blue dt:after, #legend dl.purple dt:after 
{ font-weight: normal; }
 -->
@@ -61,7 +68,7 @@
      and their contents aren't commented out on purpose:
      they should be translated, preferably as separate strings.  -->
 <style type="text/css" media="print,screen">
-#legend blockquote:before { content: "Meaning of the left border"; }
+#legend blockquote:before { content: "Code for the left border"; }
 </style>
 <style type="text/css" media="print,screen">
 #legend dl.green dt:after {
@@ -85,48 +92,55 @@
 #legend dl.blue dt:after { content: "Licenses for works stating a viewpoint"; }
 </style>
 
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
-<h2>Various Licenses and Comments about&nbsp;Them</h2>
+<!--#include virtual="/server/banner.html" -->
+<h2>Various Licenses and Comments about Them</h2>
 
-<div id="TableOfContents" class="toc">
+<div class="toc">
 
-<p><strong><a href="#Introduction">Introduction</a></strong></p>
+<h3 id="TableOfContents">Table of Contents</h3>
 
-<p><strong><a href="#SoftwareLicenses">Software Licenses</a></strong></p>
 <ul>
+<li><a href="#Introduction">Introduction</a></li>
+
+<li><a href="#SoftwareLicenses">Software Licenses</a>
+  <ul>
   <li><a href="#GPLCompatibleLicenses">
       GPL-Compatible Free Software Licenses</a></li>
   <li><a href="#GPLIncompatibleLicenses">
       GPL-Incompatible Free Software Licenses</a></li>
   <li><a href="#NonFreeSoftwareLicenses">Nonfree Software Licenses</a></li>
-</ul>
+  </ul>
+</li>
 
-<p><strong><a href="#DocumentationLicenses">Licenses For 
Documentation</a></strong></p>
-<ul>
+<li><a href="#DocumentationLicenses">Licenses For Documentation</a>
+  <ul>
   <li><a href="#FreeDocumentationLicenses">Free Documentation Licenses</a></li>
   <li><a href="#NonFreeDocumentationLicenses">
       Nonfree Documentation Licenses</a></li>
-</ul>
+  </ul>
+</li>
 
-<p><strong><a href="#OtherLicenses">Licenses for Other Works</a></strong></p>
-<ul>
+<li><a href="#OtherLicenses">Licenses for Other Works</a>
+  <ul>
   <li><a href="#OtherLicenses">Licenses for Works of Practical Use
       besides Software and Documentation</a></li>
   <li><a href="#Fonts">Licenses for Fonts</a></li>
   <li><a href="#OpinionLicenses">Licenses for Works stating a Viewpoint
       (e.g., Opinion or Testimony)</a></li>
   <li><a href="#Designs">Licenses for Designs for Physical Objects</a></li>
+  </ul>
+</li>
 </ul>
 
 </div> <!-- /class="toc" -->
+<!--#include virtual="/licenses/fsf-licensing.html" -->
 
 <div class="big-section">
 <h3  id="Introduction">
     Introduction</h3>
 </div>
-<div style="clear: left;">
-<!--#include virtual="/licenses/fsf-licensing.html" -->
-</div>
+<div style="clear: left;"></div>
+
 <p>We classify a license according to certain key criteria:</p>
 
 <ul>
@@ -179,10 +193,10 @@
 developers.  We will do our best to help you find an existing free
 software license that meets your needs.</p>
 
-<p>If you are wondering what license a particular software package is using, 
-please visit the <a href="http://directory.fsf.org";>Free Software 
Directory</a>. 
-The Free Software Directory catalogues over 6000 free software packages and 
-their licensing information.</p>
+<p>If you are wondering what license a particular software package is
+  using, please visit the <a href="https://directory.fsf.org";>Free
+  Software Directory</a>, which catalogs thousands of free software
+  packages and their licensing information.</p>
 
 
 <div id="legend">
@@ -209,10 +223,9 @@
 </div>
 
 <p><strong>The following licenses qualify as <a
-href="/philosophy/free-sw.html">free software</a>
-licenses, and are compatible with the <a href="#GNUGPL">GNU
-GPL</a>.</strong></p>
-
+href="/philosophy/free-sw.html">free software</a> licenses, and
+are <a href="/licenses/gpl-faq.html#WhatDoesCompatMean">compatible</a>
+with the <a href="#GNUGPL">GNU GPL</a>.</strong></p>
 
 <dl class="green">
 
@@ -221,7 +234,7 @@
     GNU General Public License (GPL) version 3</a>
     <span class="anchor-reference-id">
       (<a href="#GNUGPL">#GNUGPL</a>)
-      (<a href="#GNUGPL">#GNUGPLv3</a>)
+      (<a href="#GNUGPLv3">#GNUGPLv3</a>)
     </span></dt>
 <dd>
 <p>This is the latest version of the GNU GPL: a free software license, and
@@ -258,7 +271,7 @@
     GNU Lesser General Public License (LGPL) version 3</a>
     <span class="anchor-reference-id">
       (<a href="#LGPL">#LGPL</a>)
-      (<a href="#LGPL">#LGPLv3</a>)</span></dt>
+      (<a href="#LGPLv3">#LGPLv3</a>)</span></dt>
 <dd>
 <p>This is the latest version of the LGPL: a free software license, but not
 a strong copyleft license, because it permits linking with nonfree
@@ -356,9 +369,11 @@
 <p>This license is a free software license, compatible with the GPL
 thanks to the relicensing option in section 4(c)(ii).</p></dd>
 
-<dt><a href=
-  "http://gianluca.dellavedova.org/2011/01/03/clarified-artistic-license/";>
-    Clarified Artistic License</a></dt>
+<dt><a id="ClarifiedArtistic" href=
+  "https://directory.fsf.org/wiki/License:Clarified_Artistic_License_1.0";>
+    Clarified Artistic License</a>
+    <span class="anchor-reference-id">
+       (<a href="#ClarifiedArtistic">#ClarifiedArtistic</a>)</span></dt>
 <dd>
 <p>This license is a free software license, compatible with the GPL.  It
 is the minimal set of changes needed to correct the vagueness of the <a
@@ -408,23 +423,7 @@
 since it prevents patent treachery.</p></dd>
 
 
-<dt><a id="CC0"
-       href="http://directory.fsf.org/wiki/License:CC0";>
-    CC0</a>
-    <span class="anchor-reference-id">(<a href="#CC0">#CC0</a>)</span></dt>
-<dd>
-<p>CC0 is a public domain dedication from Creative Commons.  A
-work released under CC0 is dedicated to the public domain to the
-fullest extent permitted by law.  If that is not possible for any
-reason, CC0 also provides a lax, permissive license as a fallback.
-Both public domain works and the lax license provided by CC0 are
-compatible with the GNU GPL.</p>
-
-<p>If you want to release your work to the public domain, we recommend
-you use CC0.</p></dd>
-
-
-<dt><a id="CeCILL" href="http://www.cecill.info/licences.en.html";>
+<dt><a id="CeCILL" href="https://directory.fsf.org/wiki/License:CeCILLv2";>
     CeCILL version 2</a>
     <span class="anchor-reference-id">(<a href="#CeCILL">#CeCILL</a>)</span>
     </dt>
@@ -470,7 +469,8 @@
       (<a href="#CryptixGeneralLicense">#CryptixGeneralLicense</a>)</span></dt>
 <dd>
 <p>This is a lax, permissive non-copyleft free software license,
-compatible with the GNU GPL.  It is very similar to the X11 license.</p></dd>
+compatible with the GNU GPL. It is nearly identical to the <a 
href="#FreeBSD">FreeBSD (also
+called &ldquo;2-clause BSD&rdquo;) license</a>.</p></dd>
 
 
 
@@ -508,7 +508,7 @@
        (<a href="#Eiffel">#Eiffel</a>)</span></dt>
 <dd>
 <p>This is a free software license, compatible with the GNU GPL.  <a
-href="http://www.eiffel-nice.org/license/forum.txt";>Previous
+href="https://opensource.org/licenses/ver1_eiffel";>Previous
 releases</a> of the Eiffel license are not compatible with the
 GPL.</p></dd>
 
@@ -528,8 +528,14 @@
     <span class="anchor-reference-id">(<a href="#Expat">#Expat</a>)</span></dt>
 <dd>
 <p>This is a lax, permissive non-copyleft free software license,
-compatible with the GNU GPL.  It is sometimes ambiguously referred to as
-the <em>MIT License</em>.</p>
+compatible with the GNU GPL.</p>
+
+<p>Some people call this license &ldquo;the MIT License,&rdquo; but
+that term is misleading, since MIT has used many licenses for
+software.  It is also ambiguous, since the same people also call
+the <a href="#X11License">X11 license</a> &ldquo;the MIT License,&rdquo;
+failing to distinguish them.  We recommend not using the term &ldquo;MIT
+License.&rdquo;</p>
 
 <p>For substantial programs it is better to use the Apache 2.0 license
 since it blocks patent treachery.</p></dd>
@@ -635,24 +641,11 @@
     ISC License</a>
     <span class="anchor-reference-id">(<a href="#ISC">#ISC</a>)</span></dt>
 <dd>
-<p>This license is sometimes also known as the OpenBSD License.  It is a
-lax, permissive free software license, and compatible with the GNU GPL.</p>
+<p>This license is sometimes also known as the OpenBSD License. It is a free 
software license, and compatible with the GNU GPL.</p>
 
-<p>This license does have an unfortunate wording choice: it provides
-recipients with &quot;Permission to use, copy, modify, and/or distribute
-this software&hellip;&quot; This is roughly the same language from the
-license of Pine that the University of Washington later claimed
-prohibited people from distributing modified versions of the
-software.</p>
-
-<p>ISC has told us they do not share the University of Washington's
-interpretation, and we have every reason to believe them.  Thus, there's
-no reason to avoid software released under this license.  However, to
-help make sure this language cannot cause any trouble in the future, we
-encourage developers to choose a different license for their own works.
-The <a href="#Expat">Expat License</a> and <a href="#FreeBSD">FreeBSD
-License</a> are similarly permissive and brief.</p></dd>
+<p>This license had an unfortunate wording choice: it provided recipients with 
&ldquo;Permission to use, copy, modify, and distribute this 
software&hellip;&rdquo; This was the same language from the license of Pine 
that the University of Washington later claimed prohibited people from 
distributing modified versions of the software.</p>
 
+<p>ISC has told us they do not share the University of Washington's 
interpretation, and we have every reason to believe them. ISC also updated the 
license to read &ldquo;Permission to use, copy, modify, <strong>and/or</strong> 
distribute this software&hellip;&rdquo; While the inclusion of 
&ldquo;and/or&rdquo; doesn't completely solve the issue, there's no reason to 
avoid software released under this license. However, to help make sure this 
language cannot cause any trouble in the future, we encourage developers to 
choose a different license for their own works. The <a href="#FreeBSD">FreeBSD 
License</a> is similarly permissive and brief. However, if you want a lax, weak 
license, we recommend using the Apache 2.0 license.</p></dd>
 
 <dt><a id="MPL-2.0"
        href="http://directory.fsf.org/wiki/License:MPLv2.0";>Mozilla Public
@@ -661,7 +654,7 @@
 <dd>
 <p>This is a free software license.  Section 3.3 provides indirect
 compatibility between this license and the GNU GPL version 2.0, the
-GNU LGPL version 2.1, the GNU AGPL version 3.0, and all later versions
+GNU LGPL version 2.1, the GNU AGPL version 3, and all later versions
 of those licenses.  When you receive work under MPL 2.0,
 you may make a &ldquo;Larger Work&rdquo; that combines that work with
 work under those GNU licenses.  When you do, section 3.3 gives
@@ -926,7 +919,7 @@
 free and GPL-compatible.</p></dd>
 
 
-<dt><a id="WTFPL" href="http://sam.zoy.org/wtfpl/COPYING";>
+<dt><a id="WTFPL" href="https://directory.fsf.org/wiki/License:WTFPL-2";>
     WTFPL, Version 2</a>
     <span class="anchor-reference-id">(<a href="#WTFPL">#WTFPL</a>)</span></dt>
 <dd>
@@ -940,18 +933,27 @@
 license for one, we recommend the Apache 2.0 license since it protects
 users from patent treachery.</p></dd>
 
-<dt><a id="Wx"></a>WxWidgets License <span class="anchor-reference-id">(<a 
href="#Wx">#Wx</a>)</span></dt>
+<dt id="Wx"><a
+ href="https://directory.fsf.org/wiki/License:WxWindows_Library_Licence-3.1";>
+ WxWidgets Library License</a>
+<span class="anchor-reference-id">(<a href="#Wx">#Wx</a>)</span></dt>
 <dd>
 <p>The WxWidgets license is a GPL-compatible free software license. It
-consists of the  <a href="/licenses/old-licenses/lgpl-2.0.html">LGPL 2.0</a> 
-or any later version, plus an additional permission allowing binary
-distributions that use the library to be licensed under terms of the
-distributor's choice (including proprietary). Like the LGPL it is a
-weak copyleft license, so we recommend it <a
-href="/licenses/why-not-lgpl.html"> only in special
+consists of the <a href="/licenses/old-licenses/lgpl-2.0.html">GNU
+Lesser GPL 2.0</a> or any later version, plus an additional permission
+allowing binary distributions that use the library to be licensed
+under terms of the distributor's choice (including proprietary).  It
+is a weak copyleft, even weaker than the LGPL, so we recommend
+it <a href="/licenses/why-not-lgpl.html"> only in special
 circumstances</a>.</p>
 </dd>
 
+<dt id="Wxwind">WxWindows Library License
+<span class="anchor-reference-id">(<a href="#Wxwind">#Wxwind</a>)</span></dt>
+<dd>
+<p>An older name for the <a href="#Wx">WxWidgets Library license</a>.</p>
+</dd>
+
 <dt><a id="X11License" href="http://directory.fsf.org/wiki/License:X11";>
     X11 License</a>
     <span class="anchor-reference-id">
@@ -963,9 +965,12 @@
 versions of XFree86 are distributed under the <a
 href="#XFree861.1License">XFree86 1.1 license</a>.</p>
 
-<p>This license is sometimes called the <em>MIT license</em>, but that
-term is misleading, since MIT has used many licenses for
-software.</p>
+<p>Some people call this license &ldquo;the MIT License,&rdquo; but
+that term is misleading, since MIT has used many licenses for
+software.  It is also ambiguous, since the same people also call
+the <a href="#Expat">Expat license</a> &ldquo;the MIT License,&rdquo;
+failing to distinguish them.  We recommend not using the term &ldquo;MIT
+License.&rdquo;</p>
 
 <p>This is a fine license for a small program.  A larger program
 usually ought to be copyleft; but if you are set on a lax permissive
@@ -1069,7 +1074,7 @@
 <dd>
 <p>This is a lax, permissive non-copyleft free software license with an
 advertising clause.  This creates <a
-href="/philosophy/bsd.html">practical problems</a> like
+href="/licenses/bsd.html">practical problems</a> like
 those of the original BSD license, including incompatibility with the GNU
 GPL.</p></dd>
 
@@ -1108,7 +1113,7 @@
 a serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The
 flaw is not fatal; that is, it does not render the software nonfree.
 But it does cause <a
-href="/philosophy/bsd.html">practical problems</a>,
+href="/licenses/bsd.html">practical problems</a>,
 including incompatibility with the GNU GPL.</p>
 
 <p>We urge you not to use the original BSD license for software you
@@ -1121,6 +1126,32 @@
 <p>However, there is no reason not to use programs that have been released
 under the original BSD license.</p></dd>
 
+<dt><a id="CeCILL-B" href="https://directory.fsf.org/wiki/License:CeCILL-B";>
+    CeCILL-B version 1</a>
+    <span class="anchor-reference-id">(<a 
href="#CeCILL-B">#CeCILL-B</a>)</span>
+    </dt>
+<dd>
+<p>The CeCILL-B is a free software license. It is incompatible with the
+GPL because it has requirements that are not present in the GPL. The
+credit requirements in section 5.3.4 exceed those of the GPL. It also
+has a strange requirement that you use your &ldquo;best efforts&rdquo;
+to get third parties to agree &ldquo;to comply with the obligations set
+forth in this Article.&rdquo;</p>
+
+<p>Please do not release software under this license.</p></dd>
+
+<dt><a id="CeCILL-C" href="https://directory.fsf.org/wiki/License:CeCILL-C";>
+    CeCILL-C version 1</a>
+    <span class="anchor-reference-id">(<a 
href="#CeCILL-C">#CeCILL-C</a>)</span>
+    </dt>
+<dd>
+<p>The CeCILL-C is a free software license with a weak copyleft
+somewhat like the <a href="#LGPL">GNU Lesser General Public
+License</a>.  It is incompatible with the GNU GPL because it does not
+contain the explicit GPL-compatibility clause of
+the <a href="#CeCILL">basic CeCILL</a>.</p>
+
+<p>Please do not release software under this license.</p></dd>
 
 <dt><a id="CDDL"
        href="http://directory.fsf.org/wiki/License:CDDLv1.0";>
@@ -1134,12 +1165,18 @@
 cannot legally be linked together.  We urge you not to use the CDDL
 for this reason.</p>
 
+<p>For an illustrative example of why you should not combine
+CDDL-licensed works with the GPL-licensed works, see the FSF's
+statement, <a href="https://www.fsf.org/licensing/zfs-and-linux";>
+<em>Interpreting, enforcing and changing the GNU GPL, as applied to
+combining Linux and ZFS</em></a>.</p>
+
 <p>Also unfortunate in the CDDL is its use of the term &ldquo;<a
-href="/philosophy/not-ipr.html">intellectual
-property</a>&rdquo;.</p></dd>
+href="/philosophy/not-ipr.html">intellectual property</a>&rdquo;.</p></dd>
 
 
-<dt><a id="CPAL" 
href="https://www.socialtext.net/open/cpal_license_in_wikitext";>
+<dt><a id="CPAL"
+href="https://directory.fsf.org/wiki/License:Common_Public_Attribution_License_Version_1.0";>
     Common Public Attribution License 1.0 (CPAL)</a>
     <span class="anchor-reference-id"> (<a href="#CPAL">#CPAL</a>)</span></dt>
 <dd>
@@ -1189,10 +1226,27 @@
 infringement suits specifically against Contributors to the EPL'd
 program.</p></dd>
 
+<dt><a id="EPL2" href="http://directory.fsf.org/wiki/License:EPLv2.0";>
+    Eclipse Public License Version 2.0</a>
+    <span class="anchor-reference-id">(<a href="#EPL2">#EPL2</a>)</span></dt>
+<dd>
+<p>In terms of GPL compatibility, the Eclipse Public License version
+2.0 is essentially equivalent to version 1.0. The only change is that
+it explicitly offers the option of designating the GNU GPL version 2
+or later as a &ldquo;secondary license&rdquo; for a certain piece of
+code.</p>
+
+<p>If an initial contributor releases a specific piece of code and
+designates GNU GPL version 2 or later as a secondary license, that
+provides explicit compatibility with those GPL versions for that
+code. (Doing so is roughly equivalent, for users, to releasing that
+piece of code under a dual license, EPL | GPL.) However, the EPL2
+without this designation remains incompatible with the GPL.</p></dd>
 
-<dt><a id="EUPL" href="http://directory.fsf.org/wiki/License:EUPLv1.1";>
+<dt><a id="EUPL"></a> <!-- old id, leave for compatibility -->
+    <a id="EUPL-1.1" href="http://directory.fsf.org/wiki/License:EUPLv1.1";>
     European Union Public License (EUPL) version 1.1</a>
-    <span class="anchor-reference-id">(<a href="#EUPL">#EUPL</a>)</span></dt>
+    <span class="anchor-reference-id">(<a 
href="#EUPL-1.1">#EUPL-1.1</a>)</span></dt>
 <dd>
 <p>This is a free software license.  By itself, it has a copyleft
 comparable to the GPL's, and incompatible with it.  However, it gives
@@ -1219,6 +1273,57 @@
 Adding that code to the CeCILL-covered program provides grounds to
 relicense it to GPLv3+.</p></dd>
 
+<dt><a id="EUPL-1.2" href="http://directory.fsf.org/wiki/License:EUPLv1.2";>
+    European Union Public License (EUPL) version 1.2</a>
+    <span class="anchor-reference-id">(<a 
href="#EUPL-1.2">#EUPL-1.2</a>)</span></dt>
+<dd>
+<p>This is a free software license. By itself, it has a copyleft
+comparable to the GPL's, and incompatible with it. However, it gives
+recipients ways to relicense the work under the terms of other selected
+licenses, and some of those&mdash;the Eclipse Public License in
+particular&mdash;only provide a weaker copyleft. Thus, developers can't
+rely on this license to provide a strong copyleft.</p>
+
+<p>The EUPL allows relicensing to GPLv2 only and GPLv3 only, because
+those licenses are listed as two of the alternative licenses that users
+may convert to. It also, indirectly, allows relicensing to GPL
+version&nbsp;3 or any later version, 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.</p>
+
+<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 to relicense it to the
+CeCILL v2. Then you need to write 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 GPLv3+.</p></dd>
+
+<dt><a id="fdk"
+       href="http://directory.fsf.org/wiki/License:fdk";>
+    Fraunhofer FDK AAC license</a>
+    <span class="anchor-reference-id">(<a href="#fdk">#fdk</a>)</span></dt>
+<dd><p>This is a free software license as far as it goes. It is
+incompatible with any version of the GNU GPL.</p>
+
+<p>It has a special danger in the form of a term expressly stating it
+does not grant you any patent licenses, with an invitation to buy
+some.  Because of this, and because the license author is a known
+patent aggressor, we encourage you to be careful about using or
+redistributing software under this license: you should first consider
+whether the licensor might aim to lure you into patent infringement.
+If you conclude that the program is bait for a patent trap, it would
+be wise to avoid the program.</p>
+
+<p>It is possible that the pertinent patents have expired.  Depending on
+whether Fraunhofer still has active patents covering the work, the
+software might be a trap now, or not.  (Of course, any program is
+potentially threatened by patents, and the only way to end that is to
+change patent law to <a href="/philosophy/limit-patent-effect.html">
+make software safe from patents</a>.)</p>
+</dd>
+
 <dt><a id="gnuplot"
        href="http://directory.fsf.org/wiki/License:Gnuplot";>
     Gnuplot license</a>
@@ -1383,8 +1488,9 @@
 License version 1.1 with an added clause that permits Netscape to use
 your added code <em>even in their proprietary versions of the
 program</em>.  Of course, they do not give <em>you</em> permission to
-use <em>their</em> code in the analogous way.  We urge you not to use
-the NPL.</p></dd>
+use <em>their</em> code in the analogous
+way.  <a href="/philosophy/netscape-npl">We urge you not to use
+the NPL.</a> </p></dd>
 
 
 <dt><a id="Nokia" href="http://directory.fsf.org/wiki/License:NokOSv1.0a";>
@@ -1439,18 +1545,17 @@
     <span class="anchor-reference-id">
        (<a href="#OpenSSL">#OpenSSL</a>)</span></dt>
 <dd>
-<p>The license of OpenSSL is a conjunction of two licenses, one of them
-being the license of SSLeay.  You must follow both.  The combination
-results in a copyleft free software license that is incompatible with
-the GNU GPL.  It also has an advertising clause like the <a
-href="#OriginalBSD">original BSD license</a> and the <a
-href="#apache1">Apache&nbsp;1 license</a>.</p>
+<p>The license of OpenSSL is a conjunction of two licenses, one called
+&ldquo;OpenSSL License&rdquo; and the other being the license of SSLeay. You 
must
+follow both.  The combination results in a copyleft free software
+license that is incompatible with the GNU GPL.  It also has an
+advertising clause like the <a href="#OriginalBSD">original BSD
+license</a> and the <a href="#apache1">Apache&nbsp;1 license</a>.</p>
 
 <p>We recommend using GNUTLS instead of OpenSSL in software you write.
 However, there is no reason not to use OpenSSL and applications that
 work with OpenSSL.</p></dd>
 
-
 <dt><a id="Phorum" href="http://directory.fsf.org/wiki/License:Phorum2.0";>
     Phorum License, Version 2.0</a>
     <span class="anchor-reference-id">
@@ -1532,8 +1637,8 @@
 
 
 <dt><a id="SISSL"
-       href="http://www.openoffice.org/licenses/sissl_license.html";>
-       Sun Industry Standards Source License 1.0</a>
+       href="https://directory.fsf.org/wiki/License:SISSL-1.1";>
+       Sun Industry Standards Source License 1.1</a>
     <span class="anchor-reference-id">(<a href="#SISSL">#SISSL</a>)</span></dt>
 <dd>
 <p>This is a free software license, not a strong copyleft, which is
@@ -1564,7 +1669,7 @@
 
 
 <dt><a id="Yahoo"
-       href="http://www.zimbra.com/license/yahoo_public_license_1.1.html";>
+       href="http://directory.fsf.org/wiki/License:YPLv1.1";>
     Yahoo! Public License 1.1</a>
     <span class="anchor-reference-id">(<a href="#Yahoo">#Yahoo</a>)</span></dt>
 <dd>
@@ -1582,14 +1687,14 @@
 <dd>
 <p>This license is used by one part of PHP4.  It is a non-copyleft free
 software license which is incompatible with the GNU GPL, and has <a
-href="/philosophy/bsd.html">practical problems</a>
+href="/licenses/bsd.html">practical problems</a>
 like those of the original BSD license.</p>
 
 <p>We recommend that you not use this license for anything you write.</p></dd>
 
 
 <dt><a id="Zimbra"
-       href="http://www.zimbra.com/license/zimbra-public-license-1-3.html";>
+       href="https://directory.fsf.org/wiki/License:ZPL-1.3";>
     Zimbra Public License 1.3</a>
     <span class="anchor-reference-id">
        (<a href="#Zimbra">#Zimbra</a>)</span></dt>
@@ -1601,13 +1706,13 @@
 
 
 <dt><a id="Zope"
-href="http://web.archive.org/web/20000816090640/http://www.zope.org/Resources/ZPL";>
+href="https://directory.fsf.org/wiki/License:ZPL-1.0";>
     Zope Public License version 1</a>
     <span class="anchor-reference-id">
        (<a href="#Zope">#Zope</a>)</span></dt>
 <dd>
 <p>This is a lax, fairly permissive non-copyleft free software
-license with <a href="/philosophy/bsd.html">practical
+license with <a href="/licenses/bsd.html">practical
 problems</a> like those of the original BSD license, including
 incompatibility with the <a
 href="/licenses/gpl.html">GNU GPL</a>.</p>
@@ -1693,7 +1798,8 @@
 allow the state to have a copyright on government writings.</p>
 </dd>
 
-<dt><a id="Aladdin">Aladdin Free Public License</a>
+<dt><a id="Aladdin" href="https://directory.fsf.org/wiki/License:Aladdin";>
+    Aladdin Free Public License</a>
     <span class="anchor-reference-id">
        (<a href="#Aladdin">#Aladdin</a>)</span></dt>
 <dd>
@@ -1702,6 +1808,18 @@
 packaging software licensed under it with anything for which a charge
 is made.</p></dd>
 
+<dt><a id="Anti-996" href="https://directory.fsf.org/wiki/License:996";>
+    Anti-996 License</a>
+    <span class="anchor-reference-id">
+       (<a href="#Anti-996">#Anti-996</a>)</span></dt>
+<dd>
+<p>This is not a free software license. It places <a
+href="/philosophy/programs-must-not-limit-freedom-to-run.html">restrictions
+on the freedom to use the program for any purpose</a>.</p>
+
+<p>Please do not use this license for your own software. We will avoid
+using software under this license, as we do all other nonfree software.</p>
+</dd>
 
 <dt><a id="apsl1" href=
     "http://directory.fsf.org/wiki/License:APSLv1.x";>
@@ -1770,6 +1888,29 @@
 on how you read section 3.4, you may not have permission to distribute
 the software by itself at all.</p></dd>
 
+<dt><a id="comclause" 
href="https://directory.fsf.org/wiki/License:Commons-Clause";>Commons Clause</a>
+    <span class="anchor-reference-id">
+       (<a href="#comclause">#comclause</a>)</span></dt>
+<dd>
+<p>The &ldquo;Commons Clause&rdquo; is a nonfree license because it
+forbids selling copies of the program, and even running the program as
+part of implementing any commercial service.  Adding insult to injury,
+it also twists the words &ldquo;commons&rdquo; and &ldquo;sell.&rdquo;</p>
+
+<p>We urge people to reject programs under this license and to develop
+free replacements.  Where a previous version was available as free
+software, continuing development of that version is an option.</p></dd>
+
+<dt><a id="DOR"
+ href="https://directory.fsf.org/wiki/License:CNRI";>
+   CNRI Digital Object Repository License Agreement</a>
+    <span class="anchor-reference-id">
+       (<a href="#DOR">#DOR</a>)</span></dt>
+<dd>
+<p>This license is non-free because of Article 3, which arguably
+includes a requirement not to violate the license of <em>any</em>
+program that the user runs&mdash;even proprietary programs.</p></dd>
+
 <dt><a id="eCos11" 
href="http://directory.fsf.org/wiki/License:ECosPLv1.1";>eCos Public License, 
version 1.1</a>
     <span class="anchor-reference-id">
        (<a href="#eCos11">#eCos11</a>)</span></dt>
@@ -1783,16 +1924,14 @@
 <p>Today <a href="#eCos20">eCos is available</a> under the GNU GPL with
 additional permission for linking with nonfree programs.</p></dd>
 
-
-<dt><a id="DOR"
- href="http://dorepository.org/download.html";>
-   CNRI Digital Object Repository License Agreement</a>
+<dt><a id="firstdonoharm" 
href="https://firstdonoharm.dev/version/1/1/license.txt";>
+    First Do No Harm License</a>
     <span class="anchor-reference-id">
-       (<a href="#DOR">#DOR</a>)</span></dt>
+       (<a href="#firstdonoharm">#firstdonoharm</a>)</span></dt>
 <dd>
-<p>This license is non-free because of Article 3, which arguably
-includes a requirement not to violate the license of <em>any</em>
-program that the user runs&mdash;even proprietary programs.</p></dd>
+<p>This is not a free software license, because
+it <a href="/philosophy/programs-must-not-limit-freedom-to-run.html">restricts
+what jobs users can use the software for</a>.  That denies freedom 0.</p></dd>
 
 <dt><a id="GPL-PA"
  href="http://directory.fsf.org/wiki/License:GPL-PA";>
@@ -1812,7 +1951,7 @@
 </ul><p></p></dd>
 
 
-<dt><a id="HESSLA" href="http://www.hacktivismo.com/about/hessla.php";>
+<dt><a id="HESSLA" href="https://directory.fsf.org/wiki/License:HESSLA";>
     Hacktivismo Enhanced-Source Software License Agreement</a> (HESSLA)
     <span class="anchor-reference-id">
        (<a href="#HESSLA">#HESSLA</a>)</span></dt>
@@ -1823,7 +1962,7 @@
 jobs modified versions of the program can do</a>.</p></dd>
 
 
-<dt><a id="Jahia" 
href="http://web.archive.org/web/20050317081359/http://www.jahia.org/jahia/page145.html";>
+<dt><a id="Jahia" href="https://directory.fsf.org/wiki/License:JahiaCSL";>
     Jahia Community Source License</a>
     <span class="anchor-reference-id">(<a href="#Jahia">#Jahia</a>)</span></dt>
 <dd>
@@ -1843,7 +1982,8 @@
 Thus, the license is nonfree.</p></dd>
 
 
-<dt><a id="ksh93">Old license of ksh93</a>
+<dt><a id="ksh93" href="https://directory.fsf.org/wiki/License:Old_ksh93";>
+    Old license of ksh93</a>
     <span class="anchor-reference-id">(<a href="#ksh93">#ksh93</a>)</span></dt>
 <dd>
 <p>ksh93 used to be shipped with an original license that was not a free
@@ -1935,6 +2075,15 @@
 should not be used for software, manuals, or other works that ought to
 be free.</p></dd>
 
+<dt><a id="PPL3a" href="//directory.fsf.org/wiki/License:PPL3a">
+    Personal Public License Version 3a</a>
+    <span class="anchor-reference-id">
+       (<a href="#PPL3a">#PPL3a</a>)</span></dt>
+<dd>
+<p>The Personal Public License Version 3a is a nonfree license because it
+denies some users (organizations, governments, businesses) the four
+freedoms.</p></dd>
+
 <dt><a id="PINE" href="http://directory.fsf.org/wiki/License:PINE";>License of 
PINE</a>
     <span class="anchor-reference-id">(<a href="#PINE">#PINE</a>)</span></dt>
 <dd>
@@ -1948,7 +2097,8 @@
 href="#apache2">Apache License, version 2.0</a>.</p></dd>
 
 
-<dt><a id="Plan9">Old Plan 9 license</a>
+<dt><a id="Plan9" href="https://directory.fsf.org/wiki/License:Old-plan9";>
+    Old Plan 9 license</a>
     <span class="anchor-reference-id">(<a href="#Plan9">#Plan9</a>)</span></dt>
 <dd>
 <p>This is not a free software license; it lacks essential freedoms such
@@ -2041,7 +2191,8 @@
 we urge you to avoid any software that has been released under
 it.</p></dd>
 
-<dt><a id="SunSolarisSourceCode">
+<dt><a id="SunSolarisSourceCode"
+    href="https://directory.fsf.org/wiki/License:SSSCFR-1.1";>
     Sun Solaris Source Code (Foundation Release) License, Version 1.1</a>
     <span class="anchor-reference-id">
        (<a href="#SunSolarisSourceCode">#SunSolarisSourceCode</a>)</span></dt>
@@ -2052,7 +2203,7 @@
 
 
 <dt><a id="Sybase"></a>
-    <a id="Watcom" 
href="http://www.openwatcom.org/index.php/Open_Watcom_Public_License";>
+    <a id="Watcom" href="https://directory.fsf.org/wiki/License:Watcom-1.0";>
     Sybase Open Watcom Public License version 1.0</a>
     <span class="anchor-reference-id">
        (<a href="#Watcom">#Watcom</a>)</span></dt>
@@ -2064,7 +2215,7 @@
 
 
 <dt><a id="SystemC-3.0"
-    
href="http://www.accellera.org/about/policies/SystemC_Open_Source_License.pdf";>
+    href="https://directory.fsf.org/wiki/License:SCOSL-3.0";>
     SystemC &ldquo;Open Source&rdquo; License, Version 3.0</a>
     <span class="anchor-reference-id">
        (<a href="#SystemC-3.0">#SystemC-3.0</a>)</span></dt>
@@ -2103,12 +2254,13 @@
 
 
 <dt><a id="UtahPublicLicense"
-       href="http://www.cs.utah.edu/~gk/teem/txt/LICENSE.txt";>
-    University of Utah Public License</a>
+       href="https://directory.fsf.org/wiki/License:UnivUtahRFPL";>
+    University of Utah Research Foundation Public License</a>
     <span class="anchor-reference-id">
        (<a href="#UtahPublicLicense">#UtahPublicLicense</a>)</span></dt>
 <dd>
-<p>The University of Utah Public License is a nonfree license because
+<p>The University of Utah Research Foundation Public License
+is a nonfree license because
 it does not allow commercial redistribution.  It also purports to
 restrict commercially running the software and even commercially giving
 consultation about it.  Those restrictions are probably not legally
@@ -2129,7 +2281,7 @@
 <p>The earlier you raise the issue, the better.</p></dd>
 
 
-<dt><a id="YaST">
+<dt><a id="YaST" href="https://directory.fsf.org/wiki/License:YaST-license";>
     YaST License</a>
     <span class="anchor-reference-id">(<a href="#YaST">#YaST</a>)</span></dt>
 <dd>
@@ -2171,12 +2323,12 @@
 <dt><a id="FDL" href="/licenses/fdl.html">
     GNU Free Documentation License</a>
     <span class="anchor-reference-id">(<a href="#FDL">#FDL</a>)</span></dt>
-<dd>
-<p>This is a license intended for use on copylefted free documentation.
-We plan to adopt it for all GNU manuals.  It is also suitable for other
-kinds of useful works (such as textbooks and dictionaries, for
-instance).  Its applicability is not limited to textual works
-(&ldquo;books&rdquo;).</p></dd>
+<dd><p>This is a license intended for use on
+copylefted <a href="/philosophy/free-doc.html">free documentation</a>.  We
+plan to <a href="/licenses/using-gfdl.html">adopt it</a> for all GNU
+manuals.  It is also suitable for other kinds of useful works (such as
+textbooks and dictionaries, for instance).  Its applicability is not
+limited to textual works (&ldquo;books&rdquo;).</p></dd>
 
 
 <dt><a id="FreeBSDDL"
@@ -2205,7 +2357,7 @@
 
 
 <dt><a id="RealOPL"></a>  <!-- old id, leave for compatibility -->
-    <a id="OpenPublicationL" href="http://opencontent.org/openpub/";>
+    <a id="OpenPublicationL" href="https://opencontent.org/openpub/";>
     Open Publication License, Version 1.0</a>
     <span class="anchor-reference-id">
        (<a href="#OpenPublicationL">#OpenPublicationL</a>)</span></dt>
@@ -2275,20 +2427,27 @@
 spelling their names in full to make sure people understand what you
 say.</p></dd>
 
-<dt><a id="CC-BY-NC" href="?">Creative Commons Nocommercial, any version</a>
+<dt><a id="CC-BY-NC" href="//creativecommons.org/licenses/by-nc-nd/4.0/">
+    Creative Commons NonCommercial, any version</a>
     <span class="anchor-reference-id">
       (<a href="#CC-BY-NC">#CC-BY-NC</a>)</span></dt>
 <dd>
-<p>This license does not qualify as free, because there are restrictions on
-charging money for copies.  We recommend you do not use this license.</p></dd>
+<p>This license does not qualify as free, because there are
+restrictions on charging money for copies.  Thus, we recommend you do
+not use this license for documentation.</p>
+
+<p>In addition, it has a drawback for any sort of work: when a
+modified version has many authors, in practice getting permission for
+commercial use from all of them would become infeasible.</p></dd>
 
-<dt><a id="CC-BY-ND" href="?">Creative Commons Noderivatives, any version</a>
+<dt><a id="CC-BY-ND" href="//creativecommons.org/licenses/by-nc-nd/4.0/">
+    Creative Commons Noderivatives, any version</a>
     <span class="anchor-reference-id">
       (<a href="#CC-BY-ND">#CC-BY-ND</a>)</span></dt>
 <dd>
 <p>This license does not qualify as free, because there are
 restrictions on distributing modified versions.  We recommend you do
-not use this license.</p></dd>
+not use this license for documentation.</p></dd>
 
 </dl> <!-- end class="red" -->
 
@@ -2335,6 +2494,29 @@
 </dl> <!-- end class="purple" -->
 <dl  class="green">
 
+<dt><a id="CC0"
+       href="http://directory.fsf.org/wiki/License:CC0";>
+    CC0</a>
+    <span class="anchor-reference-id">(<a href="#CC0">#CC0</a>)</span></dt>
+<dd>
+<p>CC0 is a public domain dedication from Creative Commons.  A
+work released under CC0 is dedicated to the public domain to the
+fullest extent permitted by law.  If that is not possible for any
+reason, CC0 also provides a lax, permissive license as a fallback.
+Both public domain works and the lax license provided by CC0 are
+compatible with the GNU GPL.</p>
+
+<p>If you want to release your non-software work to the public domain, we
+recommend you use CC0.  For works of software it is not recommended, as
+CC0 has a term expressly stating it does not grant you any patent licenses.</p>
+
+<p>Because of this lack of patent grant, we encourage you to be careful
+about using software under this license; you should first consider
+whether the licensor might want to sue you for patent infringement.  If
+the developer is refusing users patent licenses, the program is in
+effect a trap for users and users should avoid the program.</p></dd>
+
+
 <dt><a id="ccby" href="http://creativecommons.org/licenses/by/4.0/legalcode";>
     Creative Commons Attribution 4.0 license</a>
     (a.k.a. CC&nbsp;BY)
@@ -2342,8 +2524,9 @@
 <dd>
 <p>This is a non-copyleft free license that is good for art and
 entertainment works, and educational works.  It is compatible with all
-versions of the GNU GPL; however, it is not recommended for use on
-software.</p>
+versions of the GNU GPL; however, like all CC
+licenses, <a 
href="https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software";>it
 <em>should
+not be used on software</em></a>.</p>
 
 <p id="which-cc">
 <span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
@@ -2369,20 +2552,23 @@
 <dd>
 
 <p>This is a copyleft free license that is good for artistic and
-entertainment works, and educational works. It is one-way compatible
-with the GNU GPL version 3.0, which means you may license your
-contributions to adaptations of CC BY-SA 4.0 materials under the terms
-of the GNU GPL version 3.0, but you may not license your GNU GPL
-version 3.0 licensed works under the terms of CC BY-SA 4.0. </p>
+entertainment works, and educational works.  Like all CC
+licenses, <a 
href="https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software";>it
 <em>should
+not be used on software</em></a>.</p>
+
+<p>CC BY-SA 4.0 is one-way compatible with the GNU GPL version 3: this
+means you may license your modified versions of CC BY-SA 4.0 materials
+under GNU GPL version 3, but you may not relicense GPL 3 licensed
+works under CC BY-SA 4.0.</p>
 
-<p>Because Creative Commons lists only version 3.0 of the GNU GPL on
+<p>Because Creative Commons lists only version 3 of the GNU GPL on
 its <a href="http://creativecommons.org/compatiblelicenses";>compatible
 licenses</a> list, it means that you can not license your adapted CC
 BY-SA works under the terms of &ldquo;GNU GPL version 3, or (at your option)
-any later version.&rdquo; However, Section 14 of the GNU GPL version 3.0
+any later version.&rdquo; However, Section 14 of the GNU GPL version 3
 allows licensors to specify a proxy to determine whether future
 versions of the GNU GPL can be used. Therefore, if someone adapts a CC
-BY-SA 4.0 work and incorporates it into a GNU GPL version 3.0 licensed
+BY-SA 4.0 work and incorporates it into a GNU GPL version 3 licensed
 project, <a
 
href="https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions";>they
 can specify Creative Commons as their proxy</a> (via <a
@@ -2509,7 +2695,7 @@
 and could be overly burdensome in other contexts.</p></dd>
 
 
-<dt><a id="SILOFL" href="http://scripts.sil.org/OFL_web";>
+<dt><a id="SILOFL" 
href="http://directory.fsf.org/wiki/SIL_Open_Font_License_1.1";>
     SIL Open Font License 1.1</a>
     <span class="anchor-reference-id">
        (<a href="#SILOFL">#SILOFL</a>)</span></dt>
@@ -2559,8 +2745,8 @@
 
 
 <dt><a id="ccbynd"
-       href="http://creativecommons.org/licenses/by-nd/3.0/legalcode";>
-    Creative Commons Attribution-NoDerivs 3.0 license
+       href="https://creativecommons.org/licenses/by-nd/4.0/legalcode";>
+    Creative Commons Attribution-NoDerivs 4.0 license
     (a.k.a. CC&nbsp;BY-ND)</a>
     <span class="anchor-reference-id">
        (<a href="#ccbynd">#ccbynd</a>)</span></dt>
@@ -2568,9 +2754,11 @@
 <dd><p>This is the license used throughout the GNU and FSF web sites.
 This license provides much the same permissions as our verbatim
 copying license, but it's much more detailed.  We particularly
-recommend it for audio and/or video works of opinion.
-Please <a href="#which-cc">be specific about which Creative Commons
-license is being used</a>.</p></dd>
+recommend it for audio and/or video works of opinion.  Previous
+versions of this license are also OK to use, but we do recommend
+upgrading to this version if you can.  Please <a href="#which-cc">be
+specific about which Creative Commons license is being
+used</a>.</p></dd>
 
 </dl> <!-- end class="blue" -->
 
@@ -2592,10 +2780,12 @@
 <p>3D-printer plans for decorative objects are artistic works; any of the
 Creative Commons licenses is ok for them.</p>
 
+<hr class="separator" />
+
 
 <p class="back"><strong><a href="/licenses/licenses.html">More about 
licenses</a></strong></p>
 </div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -2623,7 +2813,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software 
Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -2633,10 +2823,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/11/02 10:57:55 $
+$Date: 2020/01/01 14:08:33 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy.html     7 Oct 2015 10:55:29 -0000       1.13
+++ philosophy.html     1 Jan 2020 14:08:33 -0000       1.14
@@ -1,13 +1,18 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.86 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <title>Philosophy of the GNU Project
 - GNU Project - Free Software Foundation</title>
 
 <!--#include virtual="/philosophy/po/philosophy.translist" -->
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/philosophy-menu.html" -->
+<!--#include virtual="/server/banner.html" -->
+
+<div id="education-content">
+
+<!--#include virtual="/philosophy/philosophy-menu.html" -->
+
+</div> <!-- id="education-content" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -15,7 +20,6 @@
 <!--#include virtual="/server/top-addendum.html" -->
 <!--#endif -->
 <!--#endif -->
-
 <h2>Philosophy of the GNU Project</h2>
 
 <blockquote><p>
@@ -43,7 +47,8 @@
 <p>For further reading, please select a section
 from the menu above.</p>
 
-<p>We also maintain a list of <a href="/philosophy/latest-articles.html">most 
recently added articles</a>.</p>
+<p>We also maintain a list of <a
+href="/philosophy/latest-articles.html">most recently added articles</a>.</p>
 
 <h3 id="introduction">Introduction</h3>
 
@@ -51,7 +56,7 @@
   <li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
   <li><a href="/philosophy/free-software-even-more-important.html">
       Why we must insist on free software</a></li>
-  <li><a href="/philosophy/proprietary.html">
+  <li><a href="/proprietary/proprietary.html">
       Proprietary software is often malware</a></li>
   <li><a href="/gnu/gnu.html">History of GNU/Linux</a></li>
   <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatic 
Idealism</a></li>
@@ -63,26 +68,27 @@
   Dystopian Short Story</a> by <a href="http://www.stallman.org/";>
   Richard Stallman</a></li>
   <li><a href="/philosophy/open-source-misses-the-point.html">Why
-       "Open Source" misses the point of Free Software</a></li>
- <li><a 
href="/philosophy/when-free-software-isnt-practically-superior.html">When Free 
Software Isn't (Practically) Superior</a></li>
-  <li><a href="/philosophy/government-free-software.html">Measures governments 
can use to promote free software</a></li>       
+       &ldquo;Open Source&rdquo; misses the point of Free Software</a></li>
+  <li><a 
href="/philosophy/when-free-software-isnt-practically-superior.html">When
+       Free Software Isn't (Practically) Superior</a></li>
+  <li><a href="/philosophy/government-free-software.html">Measures
+       governments can use to promote free software</a></li>       
   <li><a href="/education/education.html">Free software in education</a></li>
 </ul>
 
-<p>
 <!-- please leave both these ID attributes here. ... -->
-<a id="TOCFreedomOrganizations">We</a>
-<a id="FreedomOrganizations">also</a>
 <!-- ... we removed this as an H$ section as it was duplicating the  -->
 <!-- same information on links.html, but it's possible that some users -->
 <!-- have the URLs bookmarked or on their pages. -len -->
-keep a list of
+<div id="TOCFreedomOrganizations">
+<p id="FreedomOrganizations">We also keep a list of
 <a href="/links/links.html#FreedomOrganizations">Organizations
 that Work for Freedom in
 Computer Development and Electronic Communications</a>.</p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -128,7 +134,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2013, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2013, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -138,10 +144,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/10/07 10:55:29 $
+$Date: 2020/01/01 14:08:33 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/software.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- software.html       2 Nov 2015 10:57:55 -0000       1.21
+++ software.html       1 Jan 2020 14:08:33 -0000       1.22
@@ -1,45 +1,61 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.87 -->
 <title>Software
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/software/po/software.translist" -->
 
 <style type="text/css" media="print,screen">
 <!--
-#dynamic-duo {
+div.package-list {
+   padding: 1em 1.5em;
+   margin: 1.5em 0;
+}
+div.package-list a, div.package-list a:visited {
+   display: inline-block;
+   width: 9em;
+   line-height: 1.5em;
+   text-decoration: none;
+}
+#dynamic-duo { display: none; }
+@media (min-width: 48em) {
+   #dynamic-duo {
+      display: block;
    float: right;
-   width: 20.4em; max-width: 90%;
-   font-style: normal;
+      width: 20em;
+      max-width: 40%;
    text-align: center;
-   padding: .8em;
+      padding: .9em;
    margin: .3em 0 1em 1.5em;
-   border: .5em solid #acc890;
-}
-#dynamic-duo p strong {
+      background: #f9f9f9;
+      border: .3em solid #acc890;
+   }
+   #dynamic-duo p strong {
    font-size: 1.3em;
+   }
+   #dynamic-duo img { width: 100%; }
 }
-#dynamic-duo img { width: 100%; }
-#dynamic-duo p.highlight-para {
-   text-align: center;
-   padding: .5em .8em .7em .8em;
-   margin: .5em;
-   border-width: 1px;
-} -->
+-->
 <!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
 <!--
-#content #dynamic-duo { float: left; margin: .3em 1.5em 1em 0; } -->
-<!--#endif -->
-<!--
-@media (max-width: 46em) {
-   #content #dynamic-duo { display: none; }
+div.package-list {
+   direction: ltr;
+   text-align: left;
+}
+@media (min-width: 48em) {
+   #dynamic-duo {
+      float: left;
+      margin: .3em 1.5em 1em 0;
+   }
 } -->
+<!--#endif -->
 </style>
 
 <!--#include virtual="/server/fs-gang-definitions.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/banner.html" -->
 <h2>GNU Software</h2>
 
 <div class="summary">
+<hr class="no-display" />
 <ul>
   <li><strong><a href="/distros/free-distros.html">Wholly free GNU/Linux 
Distributions</a></strong></li>
   <li><a href="/distros/distros.html">GNU/Linux Distributions</a></li>
@@ -48,8 +64,8 @@
   <li><a href="/software/devel.html">Development resources</a></li>
   <li><a href="/software/gethelp.html">Get help</a></li>
 </ul>
+<hr class="no-display" />
 </div>
-
 <p><a href="/gnu/about-gnu.html">GNU</a> is an operating system which is
 100% free software.  It was launched in 1983 by Richard Stallman (rms)
 and has been developed by many people working together for the sake of
@@ -80,21 +96,25 @@
 href="/doc/doc.html">Free software documentation links</a> are listed
 separately.</p>
 
-<p>Finally, we have a <a href="/software/for-windows.html">short list of
-free software for Microsoft Windows</a>, for Windows users who would
-like to try free software.</p>
+<p>Finally, we have <a
+href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements";>
+a short list of free software replacements</a> for proprietary software
+running on various proprietary systems.</p>
 
+<p>We have also published a <a 
href="/software/free-software-for-education.html">
+list of recommended educational software</a>.</p>
 
+<div style="clear:both"></div>
 <h3 id="getgnu">How to get GNU software</h3>
 
-<blockquote id="dynamic-duo">
+<div id="dynamic-duo">
 <p><strong>Download distributions</strong></p>
 <p><a href="/distros/free-distros.html">
 <img src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux" 
/></a></p>
-<p class="highlight-para">If you're looking for a whole system to
+<p><em>If you're looking for a whole system to
 install, see our <a href="/distros/free-distros.html">list of
-GNU/Linux distributions which are entirely free software</a>.</p>
-</blockquote>
+GNU/Linux distributions which are entirely free software</a>.</em></p>
+</div>
 
 <p>GNU software is available by several different methods:</p>
 
@@ -114,7 +134,7 @@
 (Please also make a <a href="/help/donate.html">donation</a> to the FSF
 if you can, to help support the development of more free software.)</li>
 
-<li>Use the <a href="/software/guix/guix.html">GNU Guix</a> functional
+<li>Use the <a href="/software/guix/">GNU Guix</a> functional
 package manager to install and manage GNU package releases.</li>
 
 <li>Use the <a href="/software/gsrc/gsrc.html">GNU GSRC</a> collection to
@@ -147,10 +167,13 @@
 packages and helping with development, see the <a
 href="/help/help.html">GNU help wanted</a> page.</p>
 
-<p>If you're writing a new program and would like to make your software
-an official GNU package, see the <a
-href="/help/evaluation.html">evaluation information and submission
-form</a>.</p>
+<p>If you're writing a new program and would like to make your
+  software an official GNU package, see
+  the <a href="/help/evaluation.html">evaluation information and
+  submission form</a>. Refer to
+  the <a href="/software/repo-criteria.html">ethical repository
+  criteria</a> for guidance choosing a hosting service for your
+  project.</p>
 
 <p>If you're maintaining or developing a GNU package, whether newly
 dubbed or of long standing, this short list of <a
@@ -159,13 +182,13 @@
 href="/software/devel.html">GNU software developer resources</a>.</p>
 
 
-
+<div style="clear:both"></div>
 <h3><a id="allgnupkgs">All GNU packages</a></h3>
 
-<p>Here is a list of all current GNU packages, using their package
-identifiers (rather than long names) for brevity, and sorted
-alphabetically.  If you have corrections to or questions about this
-list, please email <a
+<p>Links to the home pages of all current GNU packages are given
+below, using their identifiers (rather than long names) for brevity.
+They are sorted alphabetically from left to right.  If you have
+corrections to this list or questions about it, please email <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p>Also available are lists of:</p>
@@ -179,11 +202,12 @@
 <li><a href="/software/recent-releases.html">recent GNU releases</a>.</li>
 </ul>
 
+<div class="package-list emph-box">
 <!-- regenerate when official list changes, via
        gm generate packages html  (or see the Makefile)
      in the womb/gnumaint CVS source directory on savannah.  -->    
 <!--#include virtual="/software/allgnupkgs.html" -->
-
+</div>
 
 <h3>Decommissioned GNU packages</h3>
 
@@ -194,94 +218,105 @@
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  Here
 is the list; we leave the old project pages up (when they existed):
 
+<a href="abcsh/">abcsh</a>,
 <a href="aeneas/">aeneas</a>,
 <a href="aetherspace/">aetherspace</a>,
+<a href="alexandria/">alexandria</a>,
 <a href="aroundme/">aroundme</a>,
-<a href="gnu3dkit/">3dkit</a>,
-<a href="abcsh/">abcsh</a>,
 <a href="awacs/">awacs</a>,
 <a href="cfs-el/">cfs-el</a>,
 <a href="checker/">checker</a>,
 <a href="cons/">cons</a>,
-<a href="dgs/">dgs</a> (display&nbsp;ghostscript),
+<a href="dbmanual/">dbmanual</a>,
+<a href="dgs/">dgs</a>,
 <a href="dld/">dld</a>,
 <a href="dotgnu/">dotgnu</a>,
 <a href="dotgnu-pnet/">dotgnu-pnet</a>,
-<a href="http://directory.fsf.org/project/DrGenius/";>dr.genius</a>,
+<a href="dotgnu-see/">dotgnu-see</a>,
+<a href="drgenius/">drgenius</a>,
 <a href="elib/">elib</a>,
 <a href="fcrypt/">fcrypt</a>,
 <a href="ffp/">ffp</a>,
 <a href="fhp/">fhp</a>,
-<a href="free/">free&nbsp;(gnu.free)</a>,
-<a href="gcron/">gcron</a> (see <a href="mcron/">mcron</a>),
+<a href="free/">free</a>,
+<a href="gcron/">gcron</a>,
 <a href="gfe/">gfe</a>,
-<a href="http://directory.fsf.org/GNU/ggv.html";>ggv</a> (see <a 
href="gv/">gv</a>),
-gicqd,
-<a href="http://directory.fsf.org/project/giptables/";>giptables</a>,
+<a href="ggv/">ggv</a>,
+<a href="gicqd/">gicqd</a>,
+<a href="giptables/">giptables</a>,
 <a href="gmorph/">gmorph</a>,
-<a href="http://directory.fsf.org/project/gnochive/";>gnochive</a>,
-gnotary,
-<a href="http://directory.fsf.org/project/gnotepad/";>gnotepad+</a>,
-gnubios,
+<a href="gnochive/">gnochive</a>,
+<a href="gnotary/">gnotary</a>,
+<a href="gnotepad/">gnotepad</a>,
+<a href="gnu3dkit/">gnu3dkit</a>,
+<a href="gnubios/">gnubios</a>,
 <a href="gnu-arch/">gnu-arch</a>,
 <a href="gnu-queue/">gnu-queue</a>,
-gnucad,
+<a href="gnucad/">gnucad</a>,
+<a href="gnue-sb/">gnue-sb</a>,
 <a href="gnufi/">gnufi</a>,
-gnupedia (see <a href="http://wikipedia.org";>wikipedia</a>),
+<a href="gnupedia/">gnupedia</a>,
 <a href="gnuskies/">gnuskies</a>,
 <a href="gnusql/">gnusql</a>,
 <a href="gnustep-db/">gnustep-db</a>,
 <a href="gnuts/">gnuts</a>,
 <a href="goldwater/">goldwater</a>,
-<a href="goodbye/">goodbye</a>,
 <a href="goose/">goose</a>,
 <a href="gphoto/">gphoto</a>,
 <a href="graphics/">graphics</a>,
-grover,
+<a href="grover/">grover</a>,
 <a href="gtkeditor/">gtkeditor</a>,
 <a href="gtkeyboard/">gtkeyboard</a>,
 <a href="guss/">guss</a>,
 <a href="hegemonie/">hegemonie</a>,
-isofsmk,
+<a href="hydrant/">hydrant</a>,
+<a href="isofsmk/">isofsmk</a>,
 <a href="jdresolve/">jdresolve</a>,
-lengualibre,
-leonardo,
-libopts (see <a href="autogen/">autogen</a>),
-mana,
+<a href="lengualibre/">lengualibre</a>,
+<a href="leonardo/">leonardo</a>,
+<a href="libcvs-spec/">libcvs-spec</a>,
+<a href="libopts/">libopts</a>,
+<a href="m68hc11/">m68hc11</a>,
+<a href="mana/">mana</a>,
+<a href="mathmoon/">mathmoon</a>,
 <a href="messenger/">messenger</a>,
 <a href="mgcp/">mgcp</a>,
 <a href="mll2html/">mll2html</a>,
 <a href="myserver/">myserver</a>,
 <a href="obst/">obst</a>,
 <a href="octal/">octal</a>,
-p2c,
+<a href="p2c/">p2c</a>,
 <a href="packaging/">packaging</a>,
+<a href="paperclips/">paperclips</a>,
 <a href="patchwork/">patchwork</a>,
 <a href="phpgroupware/">phpgroupware</a>,
+<a href="pier/">pier</a>,
 <a href="pips/">pips</a>,
 <a href="poc/">poc</a>,
 <a href="proto/">proto</a>,
 <a href="radar/">radar</a>,
 <a href="rat/">rat</a>,
 <a href="regex/">regex</a>,
-<a href="rpge/">rpge</a>,
 <a href="snakecharmer/">snakecharmer</a>,
 <a href="songanizer/">songanizer</a>,
 <a href="sourceinstall/">sourceinstall</a>,
-sovix,
+<a href="sovix/">sovix</a>,
 <a href="sweater/">sweater</a>,
 <a href="sxml/">sxml</a>,
 <a href="toutdoux/">toutdoux</a>,
+<a href="url/">url</a>,
 <a href="vmslib/">vmslib</a>,
+<a href="vtags/">vtags</a>,
 <a href="webpublish/">webpublish</a>,
 <a href="xbase/">xbase</a>,
+<a href="xhippo/">xhippo</a>,
 <a href="xinfo/">xinfo</a>,
 <a href="xmhtml/">xmhtml</a>,
 <a href="zebra/">zebra</a>.
 </p>
 
 </div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
 
 <!--#include virtual="/server/fs-gang.html" -->
 
@@ -330,7 +365,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015, 2016, 2018, 2019 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -340,10 +375,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/11/02 10:57:55 $
+$Date: 2020/01/01 14:08:33 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>



reply via email to

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