www-commits
[Top][All Lists]
Advanced

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

www gnu/gnu-linux-faq.ca.html gnu/gnu-linux-faq...


From: GNUN
Subject: www gnu/gnu-linux-faq.ca.html gnu/gnu-linux-faq...
Date: Fri, 12 Feb 2016 10:12:34 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/02/12 10:12:34

Modified files:
        gnu            : gnu-linux-faq.ca.html gnu-linux-faq.pl.html 
        gnu/po         : gnu-linux-faq.ca-diff.html 
                         gnu-linux-faq.pl-diff.html 
        licenses       : bsd.ca.html bsd.pl.html licenses.ca.html 
                         licenses.de.html licenses.pl.html 
        licenses/po    : bsd.ca-diff.html licenses.ca-diff.html 
                         licenses.pl-diff.html 
        philosophy     : netscape-npl.nl.html netscape-npl.pl.html 
                         x.ko.html x.nl.html x.pl.html 
        philosophy/po  : netscape-npl.nl-diff.html x.ko-diff.html 
                         x.nl-diff.html 
Added files:
        licenses/po    : bsd.pl-diff.html licenses.de-diff.html 
        philosophy/po  : netscape-npl.pl-diff.html x.pl-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ca.html?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.pl.html?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.pl-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/bsd.ca.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/bsd.pl.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ca.html?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.de.html?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.pl.html?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/bsd.ca-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ca-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.pl-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/bsd.pl-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.de-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/netscape-npl.nl.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/netscape-npl.pl.html?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.ko.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.nl.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.pl.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl.nl-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ko-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.nl-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl.pl-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.pl-diff.html?cvsroot=www&rev=1.1

Patches:
Index: gnu/gnu-linux-faq.ca.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ca.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- gnu/gnu-linux-faq.ca.html   7 Sep 2015 07:47:21 -0000       1.44
+++ gnu/gnu-linux-faq.ca.html   12 Feb 2016 10:07:23 -0000      1.45
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/gnu/gnu-linux-faq.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/gnu/po/gnu-linux-faq.ca.po">
+ http://www.gnu.org/gnu/po/gnu-linux-faq.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/gnu/gnu-linux-faq.html"
+ --><!--#set var="DIFF_FILE" value="/gnu/po/gnu-linux-faq.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/gnu-linux-faq.en.html" -->
 
 <!--#include virtual="/server/header.ca.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
 
 <!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
 <!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/server/outdated.ca.html" -->
 <h2>Preguntes freqüents sobre GNU/Linux per Richard Stallman</h2>
 
 <div class="announcement">
@@ -1543,7 +1549,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2015/09/07 07:47:21 $
+$Date: 2016/02/12 10:07:23 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/gnu-linux-faq.pl.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.pl.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- gnu/gnu-linux-faq.pl.html   18 Jul 2015 21:28:26 -0000      1.59
+++ gnu/gnu-linux-faq.pl.html   12 Feb 2016 10:07:40 -0000      1.60
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/gnu/gnu-linux-faq.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/gnu/po/gnu-linux-faq.pl.po">
+ http://www.gnu.org/gnu/po/gnu-linux-faq.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/gnu/gnu-linux-faq.html"
+ --><!--#set var="DIFF_FILE" value="/gnu/po/gnu-linux-faq.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/gnu-linux-faq.en.html" -->
 
 <!--#include virtual="/server/header.pl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
 <!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
 <h2>GNU Linux FAQ &ndash; Richard Stallman</h2>
 
 <div class="announcement">
@@ -1673,7 +1679,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2015/07/18 21:28:26 $
+$Date: 2016/02/12 10:07:40 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/gnu-linux-faq.ca-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ca-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/po/gnu-linux-faq.ca-diff.html   1 Aug 2015 12:57:08 -0000       1.3
+++ gnu/po/gnu-linux-faq.ca-diff.html   12 Feb 2016 10:08:11 -0000      1.4
@@ -138,12 +138,12 @@
 &lt;li&gt;&lt;a href="#whyorder" id="TOCwhyorder"&gt;Why 
&ldquo;GNU/Linux&rdquo;
 rather than &ldquo;Linux/GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
-&lt;li&gt;&lt;a <span class="inserted"><ins><em>href="#distronames0" 
id="TOCdistronames0"&gt;My distro's developers call it
+&lt;li&gt;&lt;a href="#distronames0" id="TOCdistronames0"&gt;My distro's 
developers call it
     &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like?&lt;/a&gt;&lt;/li&gt;
 
-&lt;li&gt;&lt;a</em></ins></span> href="#distronames" 
id="TOCdistronames"&gt;My distro is called
+&lt;li&gt;&lt;a href="#distronames" id="TOCdistronames"&gt;My distro is called
     &ldquo;Foobar Linux&rdquo;; doesn't that show it's really
     Linux?&lt;/a&gt;&lt;/li&gt;
 
@@ -190,10 +190,10 @@
 &lt;li&gt;&lt;a href="#justlinux" id="TOCjustlinux"&gt;Can't Linux be used 
without
 GNU?&lt;/a&gt;&lt;/li&gt;
 
-&lt;li&gt;&lt;a <span class="inserted"><ins><em>href="#howmuch" 
id="TOChowmuch"&gt;How much of the GNU system
+&lt;li&gt;&lt;a href="#howmuch" id="TOChowmuch"&gt;How much of the GNU system
 is needed for the system to be GNU/Linux?&lt;/a&gt;&lt;/li&gt;
 
-&lt;li&gt;&lt;a</em></ins></span> href="#linuxsyswithoutgnu" 
id="TOClinuxsyswithoutgnu"&gt;Are there complete Linux systems [sic] without 
GNU?&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href="#linuxsyswithoutgnu" id="TOClinuxsyswithoutgnu"&gt;Are 
there complete Linux systems [sic] without GNU?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#helplinus" id="TOChelplinus"&gt;Why not call the system
     &ldquo;Linux&rdquo; anyway, and strengthen Linus Torvalds' role as
@@ -599,10 +599,9 @@
 
 &lt;p&gt;
 We are now developing an advanced Scheme-based package manager called
-<span class="removed"><del><strong>GUIX,</strong></del></span>
-<span class="inserted"><ins><em>Guix</em></ins></span> and <span 
class="removed"><del><strong>this</strong></del></span> <span 
class="inserted"><ins><em>a complete system distribution based on it called the
+Guix and a complete system distribution based on it called the
 &lt;a href="/software/guix"&gt;Guix System Distribution&lt;/a&gt; or GuixSD.
-This</em></ins></span> includes repackaging a substantial part of the GNU 
system.&lt;/p&gt;
+This includes repackaging a substantial part of the GNU system.&lt;/p&gt;
 
 &lt;p&gt;
 We never took the last step of packaging GNU under the name
@@ -847,7 +846,7 @@
 make it seem that the whole system is Linux.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="distronames0"&gt;My distro's 
developers call it
+&lt;dt id="distronames0"&gt;My distro's developers call it
     &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
     what the system consists of.  Why shouldn't they call it whatever
     they like? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#distronames0"&gt;#distronames0&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -862,7 +861,7 @@
 would tell them.  Well, it's not Linux either.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="distronames"&gt;My distro is called
+&lt;dt id="distronames"&gt;My distro is called
     &ldquo;Foobar Linux&rdquo;; doesn't that show it's really Linux? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#distronames"&gt;#distronames&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
@@ -879,8 +878,7 @@
 &lt;dd&gt;&lt;p&gt;If it's allowed for them to change &ldquo;GNU&rdquo; to
 &ldquo;Foobar Linux&rdquo;, it's allowed for you to change it back and
 call it &ldquo;Foobar GNU/Linux&rdquo;.  This is what you ought to do,
-<span class="removed"><del><strong>because otherwise you'd be 
propagating</strong></del></span>
-<span class="inserted"><ins><em>to avoid</em></ins></span> their <span 
class="removed"><del><strong>error and 
unfairness.&lt;/p&gt;&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>error.&lt;/p&gt;&lt;/dd&gt;</em></ins></span>
+to avoid their error.&lt;/p&gt;&lt;/dd&gt;
 
 &lt;dt id="companies"&gt;Wouldn't it be more
     effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1183,7 +1181,7 @@
 from GNU/Linux is the absence of GNU.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="howmuch"&gt;How much of the GNU 
system is needed for the system
+&lt;dt id="howmuch"&gt;How much of the GNU system is needed for the system
 to be
 GNU/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#howmuch"&gt;#howmuch&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1204,7 +1202,7 @@
 &lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="helplinus"&gt;Why not call the system
+&lt;dt id="helplinus"&gt;Why not call the system
     &ldquo;Linux&rdquo; anyway, and strengthen Linus Torvalds' role as 
posterboy for our
     community? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#helplinus"&gt;#helplinus&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1418,7 +1416,7 @@
 credit we deserve.
 
 &lt;p&gt;
-Please note that there are at least &lt;a href="/philosophy/bsd.html"&gt;
+Please note that there are at least &lt;a <span 
class="removed"><del><strong>href="/philosophy/bsd.html"&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="/licenses/bsd.html"&gt;</em></ins></span>
 two different BSD licenses&lt;/a&gt;.  For clarity's sake, please don't use
 the term &ldquo;BSD license&rdquo; without specifying which one.&lt;/p&gt;
 &lt;/dd&gt;
@@ -1515,7 +1513,7 @@
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  Please do NOT change or 
remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -1534,15 +1532,14 @@
 Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
-<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
-Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2015/08/01 12:57:08 $
+$Date: 2016/02/12 10:08:11 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: gnu/po/gnu-linux-faq.pl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.pl-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/po/gnu-linux-faq.pl-diff.html   12 Apr 2014 13:53:30 -0000      1.4
+++ gnu/po/gnu-linux-faq.pl-diff.html   12 Feb 2016 10:08:20 -0000      1.5
@@ -11,7 +11,7 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.75</strong></del></span> <span 
class="inserted"><ins><em>1.77</em></ins></span> --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
 &lt;title&gt;GNU/Linux FAQ
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-linux-faq.translist" --&gt;
@@ -81,14 +81,17 @@
 &lt;li&gt;&lt;a href="#kernelmost" id="TOCkernelmost"&gt;Isn't writing the 
kernel
     most of the work in an operating system?&lt;/a&gt;&lt;/li&gt;
 
-&lt;li&gt;&lt;a <span class="inserted"><ins><em>href="#notinstallable" 
id="TOCnotinstallable"&gt;How can GNU be an
+&lt;li&gt;&lt;a href="#notinstallable" id="TOCnotinstallable"&gt;How can GNU 
be an
     operating system, if I can't get something called &ldquo;GNU&rdquo;
     and install it?&lt;/a&gt;&lt;/li&gt;
 
-&lt;li&gt;&lt;a</em></ins></span> href="#afterkernel" 
id="TOCafterkernel"&gt;We're calling the whole
+&lt;li&gt;&lt;a href="#afterkernel" id="TOCafterkernel"&gt;We're calling the 
whole
     system after the kernel, Linux.  Isn't it normal to name an
     operating system after a kernel?&lt;/a&gt;&lt;/li&gt;
 
+&lt;li&gt;&lt;a href="#feel" id="TOCfeel"&gt;Can another system have &ldquo;the
+    feel of Linux&rdquo;?&lt;/a&gt;&lt;/li&gt;
+
 &lt;li&gt;&lt;a href="#long" id="TOClong"&gt;The problem with
     &ldquo;GNU/Linux&rdquo; is that it is too long.  How about
     recommending a shorter name?&lt;/a&gt;&lt;/li&gt;
@@ -97,6 +100,10 @@
     &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should
     I go to the trouble of saying &ldquo;GNU/&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
+&lt;li&gt;&lt;a href="#long3" id="TOClong3"&gt;Unfortunately,
+    &ldquo;GNU/Linux&rdquo; is five syllables. People won't use such a
+    long term. Shouldn't you find a shorter one?&lt;/a&gt;&lt;/li&gt;
+
 &lt;li&gt;&lt;a href="#justgnu" id="TOCjustgnu"&gt;Since Linux is a secondary
     contribution, would it be false to the facts to call the system
     simply &ldquo;GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
@@ -131,6 +138,11 @@
 &lt;li&gt;&lt;a href="#whyorder" id="TOCwhyorder"&gt;Why 
&ldquo;GNU/Linux&rdquo;
 rather than &ldquo;Linux/GNU&rdquo;?&lt;/a&gt;&lt;/li&gt;
 
+&lt;li&gt;&lt;a href="#distronames0" id="TOCdistronames0"&gt;My distro's 
developers call it
+    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    what the system consists of.  Why shouldn't they call it whatever
+    they like?&lt;/a&gt;&lt;/li&gt;
+
 &lt;li&gt;&lt;a href="#distronames" id="TOCdistronames"&gt;My distro is called
     &ldquo;Foobar Linux&rdquo;; doesn't that show it's really
     Linux?&lt;/a&gt;&lt;/li&gt;
@@ -178,7 +190,10 @@
 &lt;li&gt;&lt;a href="#justlinux" id="TOCjustlinux"&gt;Can't Linux be used 
without
 GNU?&lt;/a&gt;&lt;/li&gt;
 
-&lt;li&gt;&lt;a href="#linuxsyswithoutgnu" id="TOClinuxsyswithoutgnu"&gt;Are 
there complete Linux systems without GNU?&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href="#howmuch" id="TOChowmuch"&gt;How much of the GNU system
+is needed for the system to be GNU/Linux?&lt;/a&gt;&lt;/li&gt;
+
+&lt;li&gt;&lt;a href="#linuxsyswithoutgnu" id="TOClinuxsyswithoutgnu"&gt;Are 
there complete Linux systems [sic] without GNU?&lt;/a&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;a href="#helplinus" id="TOChelplinus"&gt;Why not call the system
     &ldquo;Linux&rdquo; anyway, and strengthen Linus Torvalds' role as
@@ -190,11 +205,11 @@
 &lt;li&gt;&lt;a href="#linusagreed" id="TOClinusagreed"&gt;Does Linus Torvalds
     agree that Linux is just the kernel?&lt;/a&gt;&lt;/li&gt;
 
-&lt;li&gt;&lt;a <span class="inserted"><ins><em>href="#finishhurd" 
id="TOCfinishhurd"&gt;Why not finish
+&lt;li&gt;&lt;a href="#finishhurd" id="TOCfinishhurd"&gt;Why not finish
     the GNU Hurd kernel, release the GNU system as a whole,
     and forget the question of what to call GNU/Linux?&lt;/a&gt;&lt;/li&gt;
     
-&lt;li&gt;&lt;a</em></ins></span> href="#lost" id="TOClost"&gt;The battle is 
already
+&lt;li&gt;&lt;a href="#lost" id="TOClost"&gt;The battle is already
     lost&mdash;society has made its decision and we can't change it,
     so why even think about it?&lt;/a&gt;&lt;/li&gt;
     
@@ -242,10 +257,10 @@
 &lt;li&gt;&lt;a href="#somanyright" id="TOCsomanyright"&gt;Since many people 
call it
     &ldquo;Linux&rdquo;, doesn't that make it right?&lt;/a&gt;&lt;/li&gt;
 
-&lt;li&gt;&lt;a <span class="inserted"><ins><em>href="#knownname" 
id="TOCknownname"&gt;Isn't it better to call the
+&lt;li&gt;&lt;a href="#knownname" id="TOCknownname"&gt;Isn't it better to call 
the
     system by the name most users already know?&lt;/a&gt;&lt;/li&gt;
 
-&lt;li&gt;&lt;a</em></ins></span> href="#winning" id="TOCwinning"&gt;Many 
people care about what's convenient or
+&lt;li&gt;&lt;a href="#winning" id="TOCwinning"&gt;Many people care about 
what's convenient or
     who's winning, not about arguments of right or wrong.  Couldn't you
     get more of their support by a different road?&lt;/a&gt;&lt;/li&gt;
 
@@ -556,9 +571,9 @@
 No, many components take a lot of work.
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="notinstallable"&gt;How can GNU be an
+&lt;dt id="notinstallable"&gt;How can GNU be an
     operating system, if I can't get something called &ldquo;GNU&rdquo;
-    and install it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#TOCnotinstallable"&gt;#notinstallable&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    and install it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#notinstallable"&gt;#notinstallable&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
 Many &lt;a href="/distros/distros.html"&gt; packaged and installable
@@ -584,8 +599,9 @@
 
 &lt;p&gt;
 We are now developing an advanced Scheme-based package manager called
-GUIX, and this includes repackaging a substantial part of the GNU
-system.&lt;/p&gt;
+Guix and a complete system distribution based on it called the
+&lt;a href="/software/guix"&gt;Guix System Distribution&lt;/a&gt; or GuixSD.
+This includes repackaging a substantial part of the GNU system.&lt;/p&gt;
 
 &lt;p&gt;
 We never took the last step of packaging GNU under the name
@@ -593,7 +609,7 @@
 GNU is an operating system.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="afterkernel"&gt;We're calling the
+&lt;dt id="afterkernel"&gt;We're calling the
     whole system after the kernel, Linux.  Isn't it normal to name an
     operating system after a kernel? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#afterkernel"&gt;#afterkernel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -612,6 +628,17 @@
 &ldquo;the kernel, Linux&rdquo; or &ldquo;Linux, the kernel.&rdquo;&lt;/p&gt;
 &lt;/dd&gt;
 
+&lt;dt id="feel"&gt;Can another system have &ldquo;the
+    feel of Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#feel"&gt;#feel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+
+&lt;dd&gt;
+There is no such thing as the &ldquo;feel of Linux&rdquo; because
+Linux has no user interfaces.  Like any modern kernel, Linux is a base
+for running programs; user interfaces belong elsewhere in the system.
+Human interaction with GNU/Linux always goes through other programs,
+and the &ldquo;feel&rdquo; comes from them.
+&lt;/dd&gt;
+
 &lt;dt id="long"&gt;The problem with &ldquo;GNU/Linux&rdquo; is that it is too 
long.
     How about recommending a shorter name? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#long"&gt;#long&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -635,6 +662,14 @@
 to recognize our work?&lt;/p&gt;
 &lt;/dd&gt;
 
+&lt;dt id="long3"&gt;Unfortunately, &ldquo;GNU/Linux&rdquo; is five
+  syllables. People won't use such a long term. Shouldn't you find a
+  shorter one?
+  &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long3"&gt;#long3&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dd&gt;&lt;p&gt;Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.
+  &ldquo;Unfortunately&rdquo; is five syllables, yet people show no
+  sign of reluctance to use that word.&lt;/p&gt;&lt;/dd&gt;
+
 &lt;dt id="justgnu"&gt;Since Linux is a secondary
     contribution, would it be false to the facts to call the system simply
     &ldquo;GNU&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#justgnu"&gt;#justgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -811,6 +846,21 @@
 make it seem that the whole system is Linux.&lt;/p&gt;
 &lt;/dd&gt;
 
+&lt;dt id="distronames0"&gt;My distro's developers call it
+    &ldquo;Foobar Linux&rdquo;, but that doesn't say anything about
+    what the system consists of.  Why shouldn't they call it whatever
+    they like? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#distronames0"&gt;#distronames0&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dd&gt;
+Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor
+of &ldquo;Linux,&rdquo; and people &lt;a href="#distronames"&gt;understand
+it that way&lt;/a&gt;.
+
+&lt;p&gt;
+If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would
+call that a mistake.  &ldquo;This system is not BSD,&rdquo; you
+would tell them.  Well, it's not Linux either.&lt;/p&gt;
+&lt;/dd&gt;
+
 &lt;dt id="distronames"&gt;My distro is called
     &ldquo;Foobar Linux&rdquo;; doesn't that show it's really Linux? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#distronames"&gt;#distronames&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -827,8 +877,8 @@
 
 &lt;dd&gt;&lt;p&gt;If it's allowed for them to change &ldquo;GNU&rdquo; to
 &ldquo;Foobar Linux&rdquo;, it's allowed for you to change it back and
-call the distro &ldquo;Foobar GNU/Linux&rdquo;.  It can't be more wrong
-to correct the mistake than it was to make the mistake.&lt;/p&gt;&lt;/dd&gt;
+call it &ldquo;Foobar GNU/Linux&rdquo;.  This is what you ought to do,
+to avoid their error.&lt;/p&gt;&lt;/dd&gt;
 
 &lt;dt id="companies"&gt;Wouldn't it be more
     effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1109,23 +1159,47 @@
 are from GNU/Linux.
 &lt;/dd&gt;
 
-&lt;dt id="linuxsyswithoutgnu"&gt;Are there complete Linux systems without 
GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dt id="linuxsyswithoutgnu"&gt;Are there complete Linux systems [sic] 
without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
 There are complete systems that contain Linux and not GNU; Android is
 an example.  But it is a mistake to call them &ldquo;Linux&rdquo;
-systems.
+systems, just as it is a mistake to call GNU a &ldquo;Linux&rdquo; system.
+&lt;p&gt;
+Android is very different from the GNU/Linux system&mdash;because
+the two have very little code in common.  In fact, the only thing they
+have in common is Linux.&lt;/p&gt;
 &lt;p&gt;
-Android is very different from the GNU/Linux system&mdash;because it
-contains very little of the GNU system, only Linux.  Overall, it's a
-different system.  If you call the whole <span 
class="inserted"><ins><em>GNU/Linux</em></ins></span> system 
&ldquo;Linux&rdquo;,
+If you call the whole GNU/Linux system &ldquo;Linux&rdquo;,
 you will find it necessary to say things like, &ldquo;Android contains
 Linux, but it isn't Linux, because it doesn't have the usual Linux
-[sic] libraries and utilities [meaning the GNU system].&rdquo; Android
-contains just as much of Linux as GNU/Linux does.  What it doesn't
-have is the GNU system.  Android replaces that with Google software
-that works quite differently.  Thus, what makes Android different
-<span class="inserted"><ins><em>from GNU/Linux</em></ins></span> is the <span 
class="removed"><del><strong>lack</strong></del></span> <span 
class="inserted"><ins><em>absence</em></ins></span> of GNU.&lt;/p&gt;
+[sic] libraries and utilities [meaning the GNU system].&rdquo;&lt;/p&gt;
+&lt;p&gt;
+Android contains just as much of Linux as GNU/Linux does.  What it
+doesn't have is the GNU system.  Android replaces that with Google
+software that works quite differently.  What makes Android different
+from GNU/Linux is the absence of GNU.&lt;/p&gt;
+&lt;/dd&gt;
+
+&lt;dt id="howmuch"&gt;How much of the GNU system is needed for the system
+to be
+GNU/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#howmuch"&gt;#howmuch&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+
+&lt;dd&gt;
+&ldquo;How much&rdquo; is not a meaningful question because the GNU
+system does not have precise boundaries.
+&lt;p&gt;
+GNU is an operating system maintained by a community.  It includes far
+more than just the GNU software packages (of which we have a specific
+list), and people add more packages constantly.  Despite these
+changes, it remains the GNU system, and adding Linux to that yields
+GNU/Linux.  If you use part of the GNU system and omit part, there is
+no meaningful way to say &ldquo;how much&rdquo; you used.&lt;/p&gt;
+&lt;p&gt;
+If we look at the level of packages, Linux is one important package in
+the GNU/Linux system.  The inclusion of one important GNU package is
+enough to justify our request for equal mention.
+&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt id="helplinus"&gt;Why not call the system
@@ -1185,7 +1259,7 @@
 for more info&rdquo;&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="finishhurd"&gt;Why not finish the 
GNU Hurd kernel, release the GNU system
+&lt;dt id="finishhurd"&gt;Why not finish the GNU Hurd kernel, release the GNU 
system
     as a whole, and forget the question of what to call GNU/Linux?
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#finishhurd"&gt;#finishhurd&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1201,7 +1275,7 @@
 free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="lost"&gt;The battle is already lost&mdash;society
+&lt;dt id="lost"&gt;The battle is already lost&mdash;society
     has made its decision and we can't change it, so why even think about
     it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#lost"&gt;#lost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1342,7 +1416,7 @@
 credit we deserve.
 
 &lt;p&gt;
-Please note that there are at least &lt;a href="/philosophy/bsd.html"&gt;
+Please note that there are at least &lt;a <span 
class="removed"><del><strong>href="/philosophy/bsd.html"&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="/licenses/bsd.html"&gt;</em></ins></span>
 two different BSD licenses&lt;/a&gt;.  For clarity's sake, please don't use
 the term &ldquo;BSD license&rdquo; without specifying which one.&lt;/p&gt;
 &lt;/dd&gt;
@@ -1380,8 +1454,8 @@
 We don't think that the popularity of an error makes it the truth.
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="knownname"&gt;Isn't it better to 
call the
-    system by the name most users already know? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#knownname"&gt;#somanyright&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dt id="knownname"&gt;Isn't it better to call the
+    system by the name most users already know? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#knownname"&gt;#knownname&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
@@ -1390,7 +1464,7 @@
 &lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="winning"&gt;Many people care about what's
+&lt;dt id="winning"&gt;Many people care about what's
     convenient or who's winning, not about arguments of right or wrong.
     Couldn't you get more of their support by a different
     road? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#winning"&gt;#winning&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -1398,8 +1472,8 @@
 &lt;dd&gt;
 To care only about what's convenient or who's winning is an amoral
 approach to life.  Non-free software is an example of that amoral
-approach and thrives on it.  <span 
class="removed"><del><strong>So</strong></del></span>  <span 
class="inserted"><ins><em>Thus,</em></ins></span> in the long run it <span 
class="removed"><del><strong>is</strong></del></span> <span 
class="inserted"><ins><em>would be</em></ins></span>
-self-defeating for us to <span class="removed"><del><strong>bow 
to</strong></del></span> <span 
class="inserted"><ins><em>adopt</em></ins></span> that approach.  We will 
continue
+approach and thrives on it.  Thus, in the long run it would be
+self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
 &lt;p&gt;
 We hope that you are one of those for whom right and wrong do matter.&lt;/p&gt;
@@ -1410,7 +1484,7 @@
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
-<span class="inserted"><ins><em>&lt;div 
class="unprintable"&gt;</em></ins></span>
+&lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
 &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
@@ -1435,11 +1509,11 @@
 href="/server/standards/README.translations.html"&gt;Translations
 README&lt;/a&gt; for information on coordinating and submitting translations
 of this article.&lt;/p&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
+&lt;/div&gt;
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -1454,20 +1528,18 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, <span 
class="removed"><del><strong>2013</strong></del></span> <span 
class="inserted"><ins><em>2013, 2014</em></ins></span>
+&lt;p&gt;Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015
 Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.&lt;/p&gt;
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Updated:</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2014/04/12 13:53:30 $
+$Date: 2016/02/12 10:08:20 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: licenses/bsd.ca.html
===================================================================
RCS file: /web/www/www/licenses/bsd.ca.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/bsd.ca.html        14 Dec 2015 08:48:26 -0000      1.1
+++ licenses/bsd.ca.html        12 Feb 2016 10:08:38 -0000      1.2
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/bsd.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/bsd.ca.po">
+ http://www.gnu.org/licenses/po/bsd.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/bsd.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/bsd.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/licenses/bsd.en.html" -->
 
 <!--#include virtual="/server/header.ca.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/licenses/po/bsd.translist" -->
 <!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/server/outdated.ca.html" -->
 <h2>El problema de la llicència BSD</h2>
 
 <p>
@@ -214,7 +220,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2015/12/14 08:48:26 $
+$Date: 2016/02/12 10:08:38 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/bsd.pl.html
===================================================================
RCS file: /web/www/www/licenses/bsd.pl.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- licenses/bsd.pl.html        14 Dec 2015 09:00:36 -0000      1.2
+++ licenses/bsd.pl.html        12 Feb 2016 10:08:46 -0000      1.3
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/bsd.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/bsd.pl.po">
+ http://www.gnu.org/licenses/po/bsd.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/bsd.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/bsd.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/licenses/bsd.en.html" -->
 
 <!--#include virtual="/server/header.pl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/licenses/po/bsd.translist" -->
 <!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
 <h2>Problem licencji BSD</h2>
 
 <p>
@@ -223,7 +229,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2015/12/14 09:00:36 $
+$Date: 2016/02/12 10:08:46 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/licenses.ca.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ca.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- licenses/licenses.ca.html   7 Sep 2015 09:57:21 -0000       1.51
+++ licenses/licenses.ca.html   12 Feb 2016 10:08:51 -0000      1.52
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/licenses.ca.po">
+ http://www.gnu.org/licenses/po/licenses.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/licenses.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/licenses.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
 
 <!--#include virtual="/server/header.ca.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/licenses/po/licenses.translist" -->
 <!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/server/outdated.ca.html" -->
 <h2>Llicències</h2>
 
 <p>
@@ -506,7 +512,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2015/09/07 09:57:21 $
+$Date: 2016/02/12 10:08:51 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/licenses.de.html
===================================================================
RCS file: /web/www/www/licenses/licenses.de.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- licenses/licenses.de.html   11 Jul 2015 14:33:44 -0000      1.56
+++ licenses/licenses.de.html   12 Feb 2016 10:08:55 -0000      1.57
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/licenses.de.po">
+ http://www.gnu.org/licenses/po/licenses.de.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/licenses.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/licenses.de-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
 
 <!--#include virtual="/server/header.de.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/licenses/po/licenses.translist" -->
 <!--#include virtual="/server/banner.de.html" -->
+<!--#include virtual="/server/outdated.de.html" -->
 <h2>Lizenzen</h2>
 
 <p>
@@ -525,7 +531,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2015/07/11 14:33:44 $
+$Date: 2016/02/12 10:08:55 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/licenses.pl.html
===================================================================
RCS file: /web/www/www/licenses/licenses.pl.html,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- licenses/licenses.pl.html   1 Aug 2015 02:59:23 -0000       1.89
+++ licenses/licenses.pl.html   12 Feb 2016 10:09:07 -0000      1.90
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/licenses.pl.po">
+ http://www.gnu.org/licenses/po/licenses.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/licenses.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/licenses.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
 
 <!--#include virtual="/server/header.pl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/licenses/po/licenses.translist" -->
 <!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
 <h2>Licencje</h2>
 
 <p>
@@ -511,7 +517,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2015/08/01 02:59:23 $
+$Date: 2016/02/12 10:09:07 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/bsd.ca-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/bsd.ca-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/bsd.ca-diff.html        14 Dec 2015 08:48:21 -0000      1.1
+++ licenses/po/bsd.ca-diff.html        12 Feb 2016 10:09:13 -0000      1.2
@@ -11,23 +11,30 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.76</strong></del></span> <span 
class="inserted"><ins><em>1.77</em></ins></span> --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
 &lt;title&gt;BSD License Problem
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/licenses/po/bsd.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;h2&gt;The BSD License Problem&lt;/h2&gt;
 
+<span class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;
+See &lt;a href="/licenses/license-recommendations.html"&gt;&ldquo;How to
+choose a license for your own work&rdquo;&lt;/a&gt; for general
+recommendations about choosing a license for your work.&lt;/p&gt;
+&lt;/blockquote&gt;</em></ins></span>
+
 &lt;p&gt;
     The two major categories of free software license are &lt;a
         href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt; and &lt;a
-        href="/licenses/categories.html#Non-CopyleftedFreeSoftware"&gt;
-        non-copyleft &lt;/a&gt;.  &lt;a
+        href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"&gt;
+        <span class="removed"><del><strong>non-copyleft 
&lt;/a&gt;.</strong></del></span>
+        <span 
class="inserted"><ins><em>non-copyleft&lt;/a&gt;.</em></ins></span>  &lt;a
         href="/licenses/license-list.html#GPLCompatibleLicenses"&gt;Copyleft
         licenses&lt;/a&gt; such as the &lt;a href="/licenses/gpl.html"&gt;GNU
         GPL&lt;/a&gt; insist that modified versions of the program must be
     free software as well.  Non-copyleft licenses do not insist on this.
-    &lt;a href="/licenses/why-copyleft.html"&gt;We recommend 
copyleft&lt;/a&gt;,
+    &lt;a href="/philosophy/why-copyleft.html"&gt;We recommend 
copyleft&lt;/a&gt;,
     because it protects freedom for all users, but non-copylefted
     software can still be free software, and useful to the free software
     community.
@@ -144,14 +151,25 @@
     Or you could mention the non-copyleft license
     which &lt;a href="/licenses/license-recommendations.html"&gt; we
     recommend over the other non-copyleft licenses&lt;/a&gt;: the Apache 2.0
-    license, which has a clause to prevent <span 
class="removed"><del><strong>patent treachery.</strong></del></span> <span 
class="inserted"><ins><em>treachery with patents.</em></ins></span>
+    license, which has a clause to prevent treachery with patents.
 &lt;/p&gt;
 &lt;p&gt;
     When you want to refer specifically to one of the BSD licenses,
     please always state which one: the &ldquo;original BSD license&rdquo; or 
the
-    &ldquo;revised BSD license&rdquo;.
+    &ldquo;Modified BSD license&rdquo;.
 &lt;/p&gt;
 
+&lt;hr/&gt;
+
+&lt;p&gt;
+    Later a third BSD license variant was introduced, with only the
+    first two of the original BSD license's four clauses.  We call it
+    the &ldquo;FreeBSD license.&rdquo; It is a lax, noncopyleft free
+    license, compatible with the GNU GPL, much like the modified BSD
+    license.
+&lt;/p&gt;
+
+
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
@@ -182,20 +200,19 @@
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
-&lt;p&gt;Copyright &copy; 1998, 1999, 2001, 2003, 2007, <span 
class="removed"><del><strong>2013</strong></del></span> <span 
class="inserted"><ins><em>2013, 2014</em></ins></span>
+&lt;p&gt;Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013, 2014, 2015
 Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.&lt;/p&gt;
+<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
+<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-<span 
class="removed"><del><strong>&lt;p&gt;&lt;/p&gt;&lt;p</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;p</em></ins></span> 
class="unprintable"&gt;Updated:
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2015/12/14 08:48:21 $
+$Date: 2016/02/12 10:09:13 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: licenses/po/licenses.ca-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ca-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- licenses/po/licenses.ca-diff.html   11 Aug 2015 21:58:08 -0000      1.4
+++ licenses/po/licenses.ca-diff.html   12 Feb 2016 10:09:29 -0000      1.5
@@ -48,9 +48,9 @@
 our &lt;a href="/licenses/recommended-copylefts.html"&gt;recommended
 copyleft licenses&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;We also have a page that discusses &lt;a 
href="/philosophy/bsd.html"&gt;the BSD License Problem&lt;/a&gt;.&lt;/p&gt;
+&lt;p&gt;We also have a page that discusses &lt;a <span 
class="removed"><del><strong>href="/philosophy/bsd.html"&gt;the</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/bsd.html"&gt;the</em></ins></span> 
BSD License Problem&lt;/a&gt;.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h3&gt;Evaluating Licenses&lt;/h3&gt;
+&lt;h3&gt;Evaluating Licenses&lt;/h3&gt;
 
 &lt;p&gt;If you come across a license not mentioned in our
 &lt;a href="/licenses/license-list.html"&gt;license list&lt;/a&gt;, you can 
ask us
@@ -60,7 +60,7 @@
 licensing experts in the staff and the board of directors will review
 it.  If the license has some unusual conditions, they may pose
 difficult philosophical problems, so we can't promise to decide
-quickly.&lt;/p&gt;</em></ins></span>
+quickly.&lt;/p&gt;
 
 &lt;h3&gt;Common Resources for our Software Licenses&lt;/h3&gt;
 
@@ -75,7 +75,9 @@
   own software&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/licenses/gpl-violation.html"&gt;What to do if you see 
a
   violation of a GNU license&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/licenses/license-list.html"&gt;List of Free Software 
Licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a <span 
class="inserted"><ins><em>href="/licenses/license-compatibility.html"&gt;License
 Compatibility
+  and Relicensing&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a</em></ins></span> href="/licenses/license-list.html"&gt;List 
of Free Software Licenses&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/philosophy/university.html"&gt;Releasing Free 
Software if
   you work at a university&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/licenses/why-assign.html"&gt;Why the FSF gets 
copyright
@@ -456,7 +458,7 @@
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  Please do NOT change or 
remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -471,18 +473,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015 Free Software Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, <span 
class="removed"><del><strong>2015</strong></del></span> <span 
class="inserted"><ins><em>2015, 2016</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
-<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
-Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2015/08/11 21:58:08 $
+$Date: 2016/02/12 10:09:29 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: licenses/po/licenses.pl-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.pl-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/licenses.pl-diff.html   19 Apr 2015 19:28:25 -0000      1.1
+++ licenses/po/licenses.pl-diff.html   12 Feb 2016 10:09:53 -0000      1.2
@@ -48,14 +48,19 @@
 our &lt;a href="/licenses/recommended-copylefts.html"&gt;recommended
 copyleft licenses&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;We also have a page that discusses &lt;a 
href="/philosophy/bsd.html"&gt;the BSD License Problem&lt;/a&gt;.&lt;/p&gt;
+&lt;p&gt;We also have a page that discusses &lt;a <span 
class="removed"><del><strong>href="/philosophy/bsd.html"&gt;the</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/bsd.html"&gt;the</em></ins></span> 
BSD License Problem&lt;/a&gt;.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;
-Our documentation licenses are currently being revised, and we welcome
-your comments on the proposed texts. Please
-visit &lt;a href="http://gplv3.fsf.org"&gt;our license update site&lt;/a&gt; to
-read the current drafts and participate in the process.
-&lt;/p&gt;</strong></del></span>
+&lt;h3&gt;Evaluating Licenses&lt;/h3&gt;
+
+&lt;p&gt;If you come across a license not mentioned in our
+&lt;a href="/licenses/license-list.html"&gt;license list&lt;/a&gt;, you can 
ask us
+to evaluate whether it is a free license.  Please email a copy of the
+license (and the URL where you found it)
+to &lt;a href="mailto:address@hidden"&gt;address@hidden&lt;/a&gt;.  Our
+licensing experts in the staff and the board of directors will review
+it.  If the license has some unusual conditions, they may pose
+difficult philosophical problems, so we can't promise to decide
+quickly.&lt;/p&gt;
 
 &lt;h3&gt;Common Resources for our Software Licenses&lt;/h3&gt;
 
@@ -70,7 +75,9 @@
   own software&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/licenses/gpl-violation.html"&gt;What to do if you see 
a
   violation of a GNU license&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/licenses/license-list.html"&gt;List of Free Software 
Licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a <span 
class="inserted"><ins><em>href="/licenses/license-compatibility.html"&gt;License
 Compatibility
+  and Relicensing&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a</em></ins></span> href="/licenses/license-list.html"&gt;List 
of Free Software Licenses&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/philosophy/university.html"&gt;Releasing Free 
Software if
   you work at a university&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/licenses/why-assign.html"&gt;Why the FSF gets 
copyright
@@ -337,7 +344,7 @@
 
 &lt;p&gt;
 Copyleft also helps programmers who want to contribute
-&lt;a <span 
class="removed"><del><strong>href="/software/software.html#HelpWriteSoftware"&gt;improvements&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/software/software.html#develop"&gt;improvements&lt;/a&gt;</em></ins></span>
 to
+&lt;a href="/software/software.html#develop"&gt;improvements&lt;/a&gt; to
 &lt;a href="/philosophy/free-sw.html"&gt;free software&lt;/a&gt; get 
permission to
 do that.  These programmers often work for companies or universities
 that would do almost anything to get more money.  A programmer may
@@ -451,7 +458,7 @@
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -466,17 +473,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; <span 
class="removed"><del><strong>2014</strong></del></span> <span 
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, <span 
class="removed"><del><strong>2015</strong></del></span> <span 
class="inserted"><ins><em>2015, 2016</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.&lt;/p&gt;
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2015/04/19 19:28:25 $
+$Date: 2016/02/12 10:09:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy/netscape-npl.nl.html
===================================================================
RCS file: /web/www/www/philosophy/netscape-npl.nl.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/netscape-npl.nl.html     9 Feb 2015 21:03:00 -0000       1.14
+++ philosophy/netscape-npl.nl.html     12 Feb 2016 10:09:58 -0000      1.15
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/netscape-npl.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/netscape-npl.nl.po">
+ http://www.gnu.org/philosophy/po/netscape-npl.nl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/netscape-npl.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/netscape-npl.nl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/netscape-npl.en.html" -->
 
 <!--#include virtual="/server/header.nl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/philosophy/po/netscape-npl.translist" -->
 <!--#include virtual="/server/banner.nl.html" -->
+<!--#include virtual="/server/outdated.nl.html" -->
 <h2>Over de Netscape Public License</h2>
 
 <p>
@@ -281,7 +287,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2015/02/09 21:03:00 $
+$Date: 2016/02/12 10:09:58 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/netscape-npl.pl.html
===================================================================
RCS file: /web/www/www/philosophy/netscape-npl.pl.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- philosophy/netscape-npl.pl.html     6 Sep 2014 05:04:04 -0000       1.35
+++ philosophy/netscape-npl.pl.html     12 Feb 2016 10:10:19 -0000      1.36
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/netscape-npl.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/netscape-npl.pl.po">
+ http://www.gnu.org/philosophy/po/netscape-npl.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/netscape-npl.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/netscape-npl.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/netscape-npl.en.html" -->
 
 <!--#include virtual="/server/header.pl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
 
 <!--#include virtual="/philosophy/po/netscape-npl.translist" -->
 <!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
 <h2>O Netscape Public License</h2>
 
 <p>
@@ -315,7 +321,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2014/09/06 05:04:04 $
+$Date: 2016/02/12 10:10:19 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/x.ko.html
===================================================================
RCS file: /web/www/www/philosophy/x.ko.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/x.ko.html        12 Jul 2014 12:59:15 -0000      1.25
+++ philosophy/x.ko.html        12 Feb 2016 10:10:30 -0000      1.26
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/x.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/x.ko.po">
+ http://www.gnu.org/philosophy/po/x.ko.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/x.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/x.ko-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/x.en.html" -->
 
 <!--#include virtual="/server/header.ko.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -12,6 +17,7 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.ko.html" -->
+<!--#include virtual="/server/outdated.ko.html" -->
 <h2>X 윈도우 시스템의 함정</h2>
 
 <p>
@@ -183,7 +189,7 @@
 <p class="unprintable"><!-- timestamp start -->
 최종 수정일:
 
-$Date: 2014/07/12 12:59:15 $
+$Date: 2016/02/12 10:10:30 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/x.nl.html
===================================================================
RCS file: /web/www/www/philosophy/x.nl.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/x.nl.html        9 Feb 2015 21:03:03 -0000       1.14
+++ philosophy/x.nl.html        12 Feb 2016 10:10:43 -0000      1.15
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/x.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/x.nl.po">
+ http://www.gnu.org/philosophy/po/x.nl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/x.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/x.nl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/x.en.html" -->
 
 <!--#include virtual="/server/header.nl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -14,6 +19,7 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.nl.html" -->
+<!--#include virtual="/server/outdated.nl.html" -->
 <h2>De X Window's Valstrik</h2>
 
 <p>
@@ -234,7 +240,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2015/02/09 21:03:03 $
+$Date: 2016/02/12 10:10:43 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/x.pl.html
===================================================================
RCS file: /web/www/www/philosophy/x.pl.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- philosophy/x.pl.html        6 Sep 2014 05:04:08 -0000       1.41
+++ philosophy/x.pl.html        12 Feb 2016 10:10:55 -0000      1.42
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/x.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/x.pl.po">
+ http://www.gnu.org/philosophy/po/x.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/x.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/x.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-14" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/x.en.html" -->
 
 <!--#include virtual="/server/header.pl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -14,6 +19,7 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
 <h2>Pułapka X Window</h2>
 
 <p>
@@ -249,7 +255,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2014/09/06 05:04:08 $
+$Date: 2016/02/12 10:10:55 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/netscape-npl.nl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/netscape-npl.nl-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/netscape-npl.nl-diff.html     12 Apr 2014 13:59:18 -0000      
1.3
+++ philosophy/po/netscape-npl.nl-diff.html     12 Feb 2016 10:11:08 -0000      
1.4
@@ -11,9 +11,9 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.77 
--&gt;</em></ins></span>
+&lt;!-- Parent-Version: 1.77 --&gt;
 &lt;title&gt;Netscape Public License
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
+- GNU Project - Free Software Foundation&lt;/title&gt;
 
 &lt;!--#include virtual="/philosophy/po/netscape-npl.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
@@ -42,9 +42,7 @@
 flaws, we urge that you not use the NPL or the MPL for your free
 software.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h4&gt;1.</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;h3&gt;1.</em></ins></span> Not all users 
are <span class="removed"><del><strong>equal&lt;/h4&gt;</strong></del></span> 
<span class="inserted"><ins><em>equal&lt;/h3&gt;</em></ins></span>
+&lt;h3&gt;1. Not all users are equal&lt;/h3&gt;
 
 &lt;p&gt;
 The first problem I noticed in the NPL was that it does not give
@@ -55,8 +53,7 @@
 
 &lt;p&gt;
 The problem here is subtle, because this does not make the program
-<span class="removed"><del><strong>non-free.</strong></del></span>
-<span class="inserted"><ins><em>nonfree.</em></ins></span>  It does not stop 
us from redistributing the program, or
+nonfree.  It does not stop us from redistributing the program, or
 from changing it; it does not deny us any particular freedom.
 Considered from a purely pragmatic viewpoint, it may not look like a
 problem at all.&lt;/p&gt;
@@ -84,9 +81,7 @@
 The MPL (Mozilla Public License) does &lt;em&gt;not&lt;/em&gt; have this 
problem.
 That is the principal difference between the MPL and the NPL.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h4&gt;2.</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;h3&gt;2.</em></ins></span> Not a <span 
class="removed"><del><strong>copyleft&lt;/h4&gt;</strong></del></span> <span 
class="inserted"><ins><em>copyleft&lt;/h3&gt;</em></ins></span>
+&lt;h3&gt;2. Not a copyleft&lt;/h3&gt;
 
 &lt;p&gt;
 The NPL has the form of a copyleft; it explicitly says that all
@@ -101,10 +96,10 @@
 
 &lt;p&gt;
 The lack of real copyleft is not a catastrophe; it does not make the
-software <span class="removed"><del><strong>non-free.</strong></del></span> 
<span class="inserted"><ins><em>nonfree.</em></ins></span>  For example, the 
X.org distribution terms do not
+software nonfree.  For example, the X.org distribution terms do not
 try to use copyleft at all, yet X.org is free software nonetheless.
 BSD is also non-copylefted free software (although the older BSD terms
-have a &lt;a href="/philosophy/bsd.html"&gt;serious drawback&lt;/a&gt; and 
should
+have a &lt;a <span 
class="removed"><del><strong>href="/philosophy/bsd.html"&gt;serious</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/bsd.html"&gt;serious</em></ins></span>
 drawback&lt;/a&gt; and should
 not be imitated&mdash;if you want to release non-copylefted free
 software, please use the X.org terms instead).  NPL-covered software
 is also &lt;a href="/philosophy/categories.html"&gt;free software&lt;/a&gt;
@@ -119,9 +114,7 @@
 case.  To avoid this outcome, we will need to work hard to educate
 people about an issue that is not easy to explain in a few words.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h4&gt;3.</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;h3&gt;3.</em></ins></span> Not compatible 
with the <span 
class="removed"><del><strong>GPL&lt;/h4&gt;</strong></del></span> <span 
class="inserted"><ins><em>GPL&lt;/h3&gt;</em></ins></span>
+&lt;h3&gt;3. Not compatible with the GPL&lt;/h3&gt;
 
 &lt;p&gt;
 The most serious practical problem in the NPL is that it is
@@ -140,7 +133,7 @@
 NPL.&lt;/p&gt;
 
 &lt;p&gt;
-Being incompatible with the GPL does not make a program <span 
class="removed"><del><strong>non-free;</strong></del></span> <span 
class="inserted"><ins><em>nonfree;</em></ins></span> it
+Being incompatible with the GPL does not make a program nonfree; it
 does not raise a fundamental ethical issue.  But it is likely to
 create a serious problem for the free software community, dividing the
 code base into two collections that cannot be mixed.  As a practical
@@ -152,9 +145,7 @@
 is possible to solve this problem with a small change in the NPL.
 (See below for a specific way of doing this.)&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h4&gt;4.</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;h3&gt;4.</em></ins></span> A note about 
<span class="removed"><del><strong>names&lt;/h4&gt;</strong></del></span> <span 
class="inserted"><ins><em>names&lt;/h3&gt;</em></ins></span>
+&lt;h3&gt;4. A note about names&lt;/h3&gt;
 &lt;p&gt;
 NPL stands for Netscape Public License, but GPL does not stand for GNU
 Public License.  The full name of our license is the GNU General
@@ -164,9 +155,7 @@
 &lt;p&gt;
 (This is not a problem, just a fact that you should know.)&lt;/p&gt;
 
-<span 
class="removed"><del><strong>&lt;h4&gt;Conclusion&lt;/h4&gt;</strong></del></span>
-
-<span 
class="inserted"><ins><em>&lt;h3&gt;Conclusion&lt;/h3&gt;</em></ins></span>
+&lt;h3&gt;Conclusion&lt;/h3&gt;
 
 &lt;p&gt;
 Since problem 3 is the most serious, I hope that people will politely
@@ -225,25 +214,16 @@
 acceptable, and adopt it, to avoid confronting free software
 developers with a serious dilemma.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for id="content", starts 
in the include above --&gt;</em></ins></span>
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
-<span class="removed"><del><strong>&lt;p&gt;
-Please</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="unprintable"&gt;
+&lt;div class="unprintable"&gt;
 
-&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
-&lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;em&gt;address@hidden&lt;/em&gt;&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.</em></ins></span>
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
-the FSF.
-<span class="removed"><del><strong>&lt;br /&gt;
-Please send broken</strong></del></span>  <span 
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections 
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
-to &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;em&gt;address@hidden&lt;/em&gt;&lt;/a&gt;.
-&lt;/p&gt;
-
-&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -257,20 +237,16 @@
         &lt;p&gt;For information on coordinating and submitting translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
-        README&lt;/a&gt;. --&gt;</em></ins></span>
+        README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
 README&lt;/a&gt; for information on coordinating and submitting translations
-of this <span class="removed"><del><strong>article.
-&lt;/p&gt;
-
-&lt;p&gt;
-Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+of this article.&lt;/p&gt;
 &lt;/div&gt;
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  Please do NOT change or 
remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -285,30 +261,21 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright</em></ins></span> &copy; 1998, 2003, 2007, <span 
class="inserted"><ins><em>2013</em></ins></span> Free Software Foundation, 
<span class="removed"><del><strong>Inc.,
-&lt;/p&gt;
-&lt;address&gt;51 Franklin St, Fifth Floor, Boston, MA 02110, 
USA&lt;/address&gt;</strong></del></span> <span 
class="inserted"><ins><em>Inc.&lt;/p&gt;</em></ins></span>
+&lt;p&gt;Copyright &copy; 1998, 2003, 2007, <span 
class="removed"><del><strong>2013</strong></del></span> <span 
class="inserted"><ins><em>2013, 2015</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
+<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Updated:</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2014/04/12 13:59:18 $
+$Date: 2016/02/12 10:11:08 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-<span class="removed"><del><strong>&lt;!-- All pages on the GNU web server 
should have the section about    --&gt;
-&lt;!-- verbatim copying.  Please do NOT remove this without talking     --&gt;
-&lt;!-- with the webmasters first. --&gt; 
-&lt;!-- Please make sure the copyright date is consistent with the document 
--&gt;
-&lt;!-- and that it is like this "2001, 2002" not this "2001-2002." 
--&gt;</strong></del></span>
 &lt;/div&gt;
 &lt;/body&gt;
 &lt;/html&gt;

Index: philosophy/po/x.ko-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/x.ko-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/x.ko-diff.html        12 Apr 2014 14:00:13 -0000      1.3
+++ philosophy/po/x.ko-diff.html        12 Feb 2016 10:11:38 -0000      1.4
@@ -11,9 +11,9 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.77 
--&gt;</em></ins></span>
+&lt;!-- Parent-Version: 1.77 --&gt;
 &lt;title&gt;The X Window System Trap
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
+- GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta http-equiv="Keywords"
       content="GNU, FSF, Free Software Foundation, freedom, Richard Stallman, 
rms, free software movement" /&gt;
 &lt;meta http-equiv="Description"
@@ -38,7 +38,7 @@
 &lt;p&gt;
 Some free software developers prefer noncopyleft distribution.
 Noncopyleft licenses such as the XFree86 and
-&lt;a href="/philosophy/bsd.html"&gt;BSD&lt;/a&gt; licenses are based on the 
idea
+&lt;a <span 
class="removed"><del><strong>href="/philosophy/bsd.html"&gt;BSD&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/bsd.html"&gt;BSD&lt;/a&gt;</em></ins></span>
 licenses are based on the idea
 of never saying no to anyone&mdash;not even to someone who seeks to
 use your work as the basis for restricting other people.  Noncopyleft
 licensing does nothing wrong, but it misses the opportunity to
@@ -166,25 +166,16 @@
 defend freedom, not just for ourselves, but for our whole
 community.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for id="content", starts 
in the include above --&gt;</em></ins></span>
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
-<span class="removed"><del><strong>&lt;p&gt;
-Please</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="unprintable"&gt;
+&lt;div class="unprintable"&gt;
 
-&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
-&lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;em&gt;address@hidden&lt;/em&gt;&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.</em></ins></span>
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
-the FSF.
-<span class="removed"><del><strong>&lt;br /&gt;
-Please send broken</strong></del></span>  <span 
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections 
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
-to &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;em&gt;address@hidden&lt;/em&gt;&lt;/a&gt;.
-&lt;/p&gt;
-
-&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -198,20 +189,16 @@
         &lt;p&gt;For information on coordinating and submitting translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
-        README&lt;/a&gt;. --&gt;</em></ins></span>
+        README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
 README&lt;/a&gt; for information on coordinating and submitting translations
-of this <span class="removed"><del><strong>article.
-&lt;/p&gt;
-
-&lt;p&gt;
-Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+of this article.&lt;/p&gt;
 &lt;/div&gt;
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  Please do NOT change or 
remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -226,22 +213,18 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright</em></ins></span> &copy; 1998, 1999, 2009 Richard M. <span 
class="removed"><del><strong>Stallman
-&lt;br /&gt;
-This</strong></del></span> <span class="inserted"><ins><em>Stallman&lt;/p&gt;
-
-&lt;p&gt;This</em></ins></span> page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+&lt;p&gt;Copyright &copy; 1998, 1999, <span 
class="removed"><del><strong>2009</strong></del></span> <span 
class="inserted"><ins><em>2009, 2015</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
 
-&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
+<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Updated:</strong></del></span>
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-<span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2014/04/12 14:00:13 $
+$Date: 2016/02/12 10:11:38 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy/po/x.nl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/x.nl-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/x.nl-diff.html        12 Apr 2014 14:00:13 -0000      1.3
+++ philosophy/po/x.nl-diff.html        12 Feb 2016 10:11:49 -0000      1.4
@@ -11,9 +11,9 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.77 
--&gt;</em></ins></span>
+&lt;!-- Parent-Version: 1.77 --&gt;
 &lt;title&gt;The X Window System Trap
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
+- GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta http-equiv="Keywords"
       content="GNU, FSF, Free Software Foundation, freedom, Richard Stallman, 
rms, free software movement" /&gt;
 &lt;meta http-equiv="Description"
@@ -38,7 +38,7 @@
 &lt;p&gt;
 Some free software developers prefer noncopyleft distribution.
 Noncopyleft licenses such as the XFree86 and
-&lt;a href="/philosophy/bsd.html"&gt;BSD&lt;/a&gt; licenses are based on the 
idea
+&lt;a <span 
class="removed"><del><strong>href="/philosophy/bsd.html"&gt;BSD&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/bsd.html"&gt;BSD&lt;/a&gt;</em></ins></span>
 licenses are based on the idea
 of never saying no to anyone&mdash;not even to someone who seeks to
 use your work as the basis for restricting other people.  Noncopyleft
 licensing does nothing wrong, but it misses the opportunity to
@@ -166,25 +166,16 @@
 defend freedom, not just for ourselves, but for our whole
 community.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for id="content", starts 
in the include above --&gt;</em></ins></span>
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
-<span class="removed"><del><strong>&lt;p&gt;
-Please</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="unprintable"&gt;
+&lt;div class="unprintable"&gt;
 
-&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
-&lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;em&gt;address@hidden&lt;/em&gt;&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.</em></ins></span>
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
-the FSF.
-<span class="removed"><del><strong>&lt;br /&gt;
-Please send broken</strong></del></span>  <span 
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections 
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
-to &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;em&gt;address@hidden&lt;/em&gt;&lt;/a&gt;.
-&lt;/p&gt;
-
-&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -198,20 +189,16 @@
         &lt;p&gt;For information on coordinating and submitting translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
-        README&lt;/a&gt;. --&gt;</em></ins></span>
+        README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
 README&lt;/a&gt; for information on coordinating and submitting translations
-of this <span class="removed"><del><strong>article.
-&lt;/p&gt;
-
-&lt;p&gt;
-Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+of this article.&lt;/p&gt;
 &lt;/div&gt;
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  Please do NOT change or 
remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -226,22 +213,18 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright</em></ins></span> &copy; 1998, 1999, 2009 Richard M. <span 
class="removed"><del><strong>Stallman
-&lt;br /&gt;
-This</strong></del></span> <span class="inserted"><ins><em>Stallman&lt;/p&gt;
-
-&lt;p&gt;This</em></ins></span> page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+&lt;p&gt;Copyright &copy; 1998, 1999, <span 
class="removed"><del><strong>2009</strong></del></span> <span 
class="inserted"><ins><em>2009, 2015</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
 
-&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
+<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Updated:</strong></del></span>
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-<span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2014/04/12 14:00:13 $
+$Date: 2016/02/12 10:11:49 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: licenses/po/bsd.pl-diff.html
===================================================================
RCS file: licenses/po/bsd.pl-diff.html
diff -N licenses/po/bsd.pl-diff.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ licenses/po/bsd.pl-diff.html        12 Feb 2016 10:09:21 -0000      1.1
@@ -0,0 +1,221 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/licenses/bsd.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;title&gt;BSD License Problem
+- GNU Project - Free Software Foundation&lt;/title&gt;
+&lt;!--#include virtual="/licenses/po/bsd.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
+&lt;h2&gt;The BSD License Problem&lt;/h2&gt;
+
+<span class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;
+See &lt;a href="/licenses/license-recommendations.html"&gt;&ldquo;How to
+choose a license for your own work&rdquo;&lt;/a&gt; for general
+recommendations about choosing a license for your work.&lt;/p&gt;
+&lt;/blockquote&gt;</em></ins></span>
+
+&lt;p&gt;
+    The two major categories of free software license are &lt;a
+        href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt; and &lt;a
+        href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"&gt;
+        <span class="removed"><del><strong>non-copyleft 
&lt;/a&gt;.</strong></del></span>
+        <span 
class="inserted"><ins><em>non-copyleft&lt;/a&gt;.</em></ins></span>  &lt;a
+        href="/licenses/license-list.html#GPLCompatibleLicenses"&gt;Copyleft
+        licenses&lt;/a&gt; such as the &lt;a href="/licenses/gpl.html"&gt;GNU
+        GPL&lt;/a&gt; insist that modified versions of the program must be
+    free software as well.  Non-copyleft licenses do not insist on this.
+    &lt;a href="/philosophy/why-copyleft.html"&gt;We recommend 
copyleft&lt;/a&gt;,
+    because it protects freedom for all users, but non-copylefted
+    software can still be free software, and useful to the free software
+    community.
+&lt;/p&gt;
+
+&lt;p&gt;There are many variants of simple &lt;a
+href="/licenses/license-list.html#GPLCompatibleLicenses"&gt;non-copyleft
+free software licenses&lt;/a&gt;, such as the Expat license, FreeBSD license,
+X10 license, the X11 license, and the two BSD (Berkeley Software
+Distribution) licenses.  Most of them are equivalent except for details
+of wording, but the license used for BSD until 1999 had a special
+problem: the &ldquo;obnoxious BSD advertising clause&rdquo;. It said that every
+advertisement mentioning the software must include a particular
+sentence:&lt;/p&gt;
+
+&lt;pre&gt;
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+     This product includes software developed by the University of
+     California, Berkeley and its contributors.
+&lt;/pre&gt;
+
+&lt;p&gt;
+    Initially the obnoxious BSD advertising clause was used only in the
+    Berkeley Software Distribution.  That did not cause any particular
+    problem, because including one sentence in an ad is not a great
+    practical difficulty.
+&lt;/p&gt;
+&lt;p&gt;
+    If other developers who used BSD-like licenses had copied the BSD
+    advertising clause verbatim&mdash;including the sentence that refers to
+    the University of California&mdash;then they would not have made the
+    problem any bigger.
+&lt;/p&gt;
+&lt;p&gt;
+    But, as you might expect, other developers did not copy the clause
+    verbatim.  They changed it, replacing &ldquo;University of 
California&rdquo;
+    with their own institution or their own names.  The result is a
+    plethora of licenses, requiring a plethora of different sentences.
+&lt;/p&gt;
+&lt;p&gt;
+    When people put many such programs together in an operating system,
+    the result is a serious problem.  Imagine if a software system
+    required 75 different sentences, each one naming a different author
+    or group of authors.  To advertise that, you would need a full-page
+    ad.
+&lt;/p&gt;
+&lt;p&gt;
+    This might seem like extrapolation ad absurdum, but it is actual
+    fact.  In a 1997
+    version of NetBSD, I counted 75 of these sentences.  (Fortunately
+    NetBSD has decided to stop adding them, and to remove those it could.)
+&lt;/p&gt;
+&lt;p&gt;
+    To address this problem, in my &ldquo;spare time&rdquo; I talk with
+    developers who have used BSD-style licenses, asking them if they would
+    please remove the advertising clause.  Around 1996 I spoke with the
+    developers of FreeBSD about this, and they decided to remove the
+    advertising clause from all of their own code.  In May 1998 the developers
+    of Flick, at the University of Utah, removed this clause.
+&lt;/p&gt;
+&lt;p&gt;
+    Dean Hal Varian at the University of California took up the cause,
+    and championed it with the administration.  In June 1999, after two
+    years of discussions, the University of California removed this
+    clause from the license of BSD.
+&lt;/p&gt;
+&lt;p&gt;
+    Thus, there is now a new BSD license which does not contain the
+    advertising clause.  Unfortunately, this does not eliminate the
+    legacy of the advertising clause: similar clauses are still present
+    in the licenses of many packages which are not part of BSD.  The
+    change in license for BSD has no effect on the other packages which
+    imitated the old BSD license; only the developers who made them can
+    change them.
+&lt;/p&gt;
+&lt;p&gt;
+    But if they followed Berkeley's lead before, maybe Berkeley's
+    change in policy will convince some of them to change.  It's worth
+    asking.
+&lt;/p&gt;
+&lt;p&gt;
+    So if you have a favorite package which still uses the BSD license
+    with the advertising clause, please ask the maintainer to look at
+    this web page, and consider making the change.
+&lt;/p&gt;
+&lt;p&gt;
+    And if you want to release a program as non-copylefted free
+    software, please don't use the advertising clause.  Thus, instead of
+    copying the BSD license from some released package&mdash;which might
+    still have the old version of the license in it&mdash;please use one
+    of the other permissive licenses, such as Expat or FreeBSD.
+&lt;/p&gt;
+&lt;p&gt;
+    You can also help spread awareness of the issue by not using the
+    term &ldquo;BSD-style&rdquo;, and not saying &ldquo;the BSD license&rdquo;
+    which implies there is only one.  You see, when people refer to all
+    non-copyleft free software licenses as &ldquo;BSD-style licenses&rdquo;,
+    some new free software developer who wants to use a non-copyleft free
+    software license might take for granted that the place to get it is from
+    BSD.  He or she might copy the license with the advertising clause, not by
+    specific intention, just by chance.
+&lt;/p&gt;
+&lt;p&gt;
+    If you would like to cite one specific example of a non-copyleft
+    license, and you have no particular preference, please pick an
+    example which has no particular problem.  For instance, if you talk
+    about &ldquo;X11-style licenses&rdquo;, you will encourage people to copy 
the
+    license from X11, which avoids the advertising clause for certain,
+    rather than take a risk by randomly choosing one of the BSD
+    licenses.
+&lt;/p&gt;
+&lt;p&gt;
+    Or you could mention the non-copyleft license
+    which &lt;a href="/licenses/license-recommendations.html"&gt; we
+    recommend over the other non-copyleft licenses&lt;/a&gt;: the Apache 2.0
+    license, which has a clause to prevent treachery with patents.
+&lt;/p&gt;
+&lt;p&gt;
+    When you want to refer specifically to one of the BSD licenses,
+    please always state which one: the &ldquo;original BSD license&rdquo; or 
the
+    &ldquo;Modified BSD license&rdquo;.
+&lt;/p&gt;
+
+&lt;hr/&gt;
+
+&lt;p&gt;
+    Later a third BSD license variant was introduced, with only the
+    first two of the original BSD license's four clauses.  We call it
+    the &ldquo;FreeBSD license.&rdquo; It is a lax, noncopyleft free
+    license, compatible with the GNU GPL, much like the modified BSD
+    license.
+&lt;/p&gt;
+
+
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
+&lt;!--#include virtual="/server/footer.html" --&gt;
+&lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
+
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this article.&lt;/p&gt;
+&lt;/div&gt;
+
+&lt;p&gt;Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013, 2014, 2015
+Free Software Foundation, Inc.&lt;/p&gt;
+
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
+
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p class="unprintable"&gt;Updated:
+&lt;!-- timestamp start --&gt;
+$Date: 2016/02/12 10:09:21 $
+&lt;!-- timestamp end --&gt;
+&lt;/p&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre></body></html>

Index: licenses/po/licenses.de-diff.html
===================================================================
RCS file: licenses/po/licenses.de-diff.html
diff -N licenses/po/licenses.de-diff.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ licenses/po/licenses.de-diff.html   12 Feb 2016 10:09:40 -0000      1.1
@@ -0,0 +1,493 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/licenses/licenses.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;title&gt;Licenses
+- GNU Project - Free Software Foundation&lt;/title&gt;
+&lt;!--#include virtual="/licenses/po/licenses.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
+&lt;h2&gt;Licenses&lt;/h2&gt;
+
+&lt;p&gt;
+Published software should be &lt;a href="/philosophy/free-sw.html"&gt;free
+software&lt;/a&gt;.  To make it free software, you need to release it
+under a free software license.  We normally use the &lt;a
+href="#GPL"&gt;GNU General Public License&lt;/a&gt; (GNU GPL),
+but occasionally we use &lt;a 
href="/licenses/license-list.html#SoftwareLicenses"&gt;other
+free software licenses&lt;/a&gt;.  We use only licenses that are compatible
+with the GNU GPL for GNU software.
+&lt;/p&gt;
+
+&lt;p&gt;
+Documentation for free software should be
+&lt;a href="/philosophy/free-doc.html"&gt;free documentation&lt;/a&gt;, so that
+people can redistribute it and improve it along with the software
+it describes.  To make it free documentation, you need to release
+it under a free documentation license.  We normally use the
+&lt;a href="#FDL"&gt;GNU Free Documentation License&lt;/a&gt; (GNU
+FDL), but occasionally we use
+&lt;a href="/licenses/license-list.html#DocumentationLicenses"&gt;other free
+documentation licenses&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;p&gt;If you've started a new project and you're not sure what license to
+use, &lt;a href="/licenses/license-recommendations.html"&gt;&ldquo;How to
+choose a license for your own work&rdquo;&lt;/a&gt; details our
+recommendations in an easy-to-follow guide.  If you just want a quick
+list reference, we have a page that names
+our &lt;a href="/licenses/recommended-copylefts.html"&gt;recommended
+copyleft licenses&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;We also have a page that discusses &lt;a <span 
class="removed"><del><strong>href="/philosophy/bsd.html"&gt;the</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/bsd.html"&gt;the</em></ins></span> 
BSD License Problem&lt;/a&gt;.&lt;/p&gt;
+
+&lt;h3&gt;Evaluating Licenses&lt;/h3&gt;
+
+&lt;p&gt;If you come across a license not mentioned in our
+&lt;a href="/licenses/license-list.html"&gt;license list&lt;/a&gt;, you can 
ask us
+to evaluate whether it is a free license.  Please email a copy of the
+license (and the URL where you found it)
+to &lt;a href="mailto:address@hidden"&gt;address@hidden&lt;/a&gt;.  Our
+licensing experts in the staff and the board of directors will review
+it.  If the license has some unusual conditions, they may pose
+difficult philosophical problems, so we can't promise to decide
+quickly.&lt;/p&gt;
+
+&lt;h3&gt;Common Resources for our Software Licenses&lt;/h3&gt;
+
+&lt;p&gt;We have a number of resources to help people understand and use our
+various licenses:&lt;/p&gt;
+
+&lt;ul&gt;
+
+  &lt;li&gt;&lt;a href="/licenses/gpl-faq.html"&gt;Frequently Asked
+  Questions about the GNU licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/gpl-howto.html"&gt;How to use GNU licenses 
for your
+  own software&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/gpl-violation.html"&gt;What to do if you see 
a
+  violation of a GNU license&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a <span 
class="inserted"><ins><em>href="/licenses/license-compatibility.html"&gt;License
 Compatibility
+  and Relicensing&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a</em></ins></span> href="/licenses/license-list.html"&gt;List 
of Free Software Licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/philosophy/university.html"&gt;Releasing Free 
Software if
+  you work at a university&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/why-assign.html"&gt;Why the FSF gets 
copyright
+  assignments from contributors&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/graphics/license-logos.html"&gt;GNU license 
logos&lt;/a&gt; to use
+  with your project&lt;/li&gt;
+  &lt;li&gt;&lt;a href="http://www.fsf.org/licensing"&gt;The FSF Licensing 
&amp; Compliance Lab&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a
+href="/licenses/license-list.html#LicensingEmailAddress"&gt;&lt;address@hidden&gt;&lt;/a&gt;
 for general licensing help
+  &lt;/li&gt;
+
+&lt;/ul&gt;
+
+&lt;h3 id="GPL"&gt;The GNU General Public License&lt;/h3&gt;
+
+&lt;p&gt;
+The GNU General Public License is often called the GNU GPL for short;
+it is used by most GNU programs, and by more than half of all free
+software packages.  The latest version is version 3.
+&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;The GNU General Public License is available in these formats:
+      &lt;a href="/licenses/gpl.html"&gt;HTML&lt;/a&gt;,
+      &lt;a href="/licenses/gpl.txt"&gt;plain text&lt;/a&gt;,
+      &lt;a href="/licenses/gpl.odt"&gt;ODF&lt;/a&gt;,
+      &lt;a href="/licenses/gpl.dbk"&gt;Docbook&lt;/a&gt;,
+      &lt;a href="/licenses/gpl.texi"&gt;Texinfo&lt;/a&gt;, and
+      &lt;a href="/licenses/gpl.tex"&gt;LaTeX&lt;/a&gt;.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/quick-guide-gplv3.html"&gt;A Quick Guide to
+      GPLv3&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/old-licenses/old-licenses.html#GPL"&gt;Older
+  versions of the GNU GPL&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;h3 id="LGPL"&gt;The GNU Lesser General Public License&lt;/h3&gt;
+
+&lt;p&gt;
+The GNU Lesser General Public License is used by a few (not by any means
+all) GNU libraries.  The latest version is version 3.
+&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;The GNU Lesser General Public License text is available in
+      these formats:
+      &lt;a href="/licenses/lgpl.html"&gt;HTML&lt;/a&gt;,
+      &lt;a href="/licenses/lgpl.txt"&gt;plain text&lt;/a&gt;,
+      &lt;a href="/licenses/lgpl.dbk"&gt;Docbook&lt;/a&gt;, and
+      &lt;a href="/licenses/lgpl.texi"&gt;Texinfo&lt;/a&gt;.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/why-not-lgpl.html"&gt;Why you shouldn't use
+  the Lesser GPL for your next library&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/old-licenses/old-licenses.html#LGPL"&gt;Older
+  versions of the GNU LGPL&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;h3 id="AGPL"&gt;The GNU Affero General Public License&lt;/h3&gt;
+
+&lt;p&gt;
+The GNU Affero General Public License is based on the GNU GPL, but has an
+additional term to allow users who interact with the licensed software over
+a network to receive the source for that program.  We recommend that people
+consider using the GNU AGPL for any software which will commonly be run
+over a network.  The latest version is version 3.
+&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;The GNU Affero General Public License text is available in
+      these formats:
+      &lt;a href="/licenses/agpl.html"&gt;HTML&lt;/a&gt;,
+      &lt;a href="/licenses/agpl.txt"&gt;plain text&lt;/a&gt;,
+      &lt;a href="/licenses/agpl.dbk"&gt;Docbook&lt;/a&gt;,
+      &lt;a href="/licenses/agpl.texi"&gt;Texinfo&lt;/a&gt;, and
+      &lt;a href="/licenses/agpl.tex"&gt;LaTeX&lt;/a&gt;.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/why-affero-gpl.html"&gt;Why the Affero 
GPL&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;h3 id="FDL"&gt;The GNU Free Documentation License&lt;/h3&gt;
+
+&lt;p&gt;
+The GNU Free Documentation License is a form of copyleft intended
+for use on a manual, textbook or other document to assure everyone
+the effective freedom to copy and redistribute it, with or without
+modifications, either commercially or non-commercially.  The latest version
+is 1.3.
+&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;The GNU Free Documentation License text is available in these 
formats:
+      &lt;a href="/licenses/fdl.html"&gt;HTML&lt;/a&gt;,
+      &lt;a href="/licenses/fdl.txt"&gt;plain text&lt;/a&gt;,
+      &lt;a href="/licenses/fdl.xml"&gt;Docbook&lt;/a&gt;,
+      &lt;a href="/licenses/fdl.texi"&gt;Texinfo&lt;/a&gt;, and
+      &lt;a href="/licenses/fdl.tex"&gt;LaTeX&lt;/a&gt;.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/why-gfdl.html"&gt;Why publishers should use
+  the GNU FDL&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/fdl.html#addendum"&gt;How to use
+  the GNU FDL for your documentation&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/fdl-howto.html"&gt;Tips on using the GNU 
FDL&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/fdl-howto-opt.html"&gt;How to use the 
optional
+      features of the GNU FDL&lt;/a&gt;&lt;/li&gt;
+      &lt;li&gt;&lt;a href="/licenses/old-licenses/old-licenses.html#FDL"&gt;
+      Older versions of the GNU FDL&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;h3 id="Exceptions"&gt;Exceptions to GNU Licenses&lt;/h3&gt;
+
+&lt;p&gt;Some GNU programs have additional permissions or special exceptions
+  to specific terms in one of the main licenses.  Since some of those
+  are commonly used or inspire a lot of questions on their own, we've
+  started collecting them on
+  our &lt;a href="/licenses/exceptions.html"&gt;exceptions 
page&lt;/a&gt;.&lt;/p&gt;
+
+&lt;h3 id="LicenseURLs"&gt;License URLs&lt;/h3&gt;
+
+&lt;p&gt;When linking to our licenses, it's usually best to link to the latest
+version; hence the standard URLs such as
+&lt;tt&gt;http://www.gnu.org/licenses/gpl.html&lt;/tt&gt; have no version 
number.
+Occasionally, however, you may want to link to a specific version of a
+given license.  In those situations, you can use the following links
+[&lt;a href="#urlskip"&gt;skip links&lt;/a&gt;]:&lt;/p&gt;
+
+&lt;dl&gt;
+&lt;dt&gt;GNU General Public License (GPL)&lt;/dt&gt;
+&lt;!-- Please keep these links absolute.  I'm depending on that for the
+     XSLT to generate pages on fsf.org.  Thanks. -brett --&gt;
+&lt;dd&gt;&lt;a 
href="http://www.gnu.org/licenses/gpl-3.0.html"&gt;GPLv3&lt;/a&gt;,
+&lt;a href="http://www.gnu.org/licenses/gpl-2.0.html"&gt;GPLv2&lt;/a&gt;,
+&lt;a 
href="http://www.gnu.org/licenses/gpl-1.0.html"&gt;GPLv1&lt;/a&gt;&lt;/dd&gt;
+
+&lt;dt&gt;GNU Lesser General Public License (LGPL)&lt;/dt&gt;
+&lt;dd&gt;&lt;a 
href="http://www.gnu.org/licenses/lgpl-3.0.html"&gt;LGPLv3&lt;/a&gt;,
+&lt;a 
href="http://www.gnu.org/licenses/lgpl-2.1.html"&gt;LGPLv2.1&lt;/a&gt;&lt;/dd&gt;
+
+&lt;dt&gt;GNU Affero General Public License (AGPL)&lt;/dt&gt;
+&lt;dd&gt;&lt;a href="http://www.gnu.org/licenses/agpl-3.0.html"&gt;GNU
+    AGPLv3&lt;/a&gt;  (The &lt;a
+    href="http://www.affero.org/oagpl.html"&gt;Affero General 
+    Public License version 1&lt;/a&gt; is not a GNU license, but it was
+    designed to serve a purpose much like the GNU AGPL's.)&lt;/dd&gt;
+
+&lt;dt&gt;GNU Free Documentation License (FDL)&lt;/dt&gt;
+&lt;dd&gt;&lt;a 
href="http://www.gnu.org/licenses/fdl-1.3.html"&gt;FDLv1.3&lt;/a&gt;,
+&lt;a href="http://www.gnu.org/licenses/fdl-1.2.html"&gt;FDLv1.2&lt;/a&gt;,
+&lt;a 
href="http://www.gnu.org/licenses/fdl-1.1.html"&gt;FDLv1.1&lt;/a&gt;&lt;/dd&gt;
+&lt;/dl&gt;
+
+&lt;p&gt;&lt;a name="urlskip"&gt;&lt;/a&gt;Stable links to each license's 
alternative
+  formats are available on its respective page.  Not every version of
+  every license is available in every format.  If you need one that is
+  missing, please &lt;a href="mailto:address@hidden"&gt;email 
us&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;See also the &lt;a href="old-licenses/"&gt;old licenses 
page&lt;/a&gt;.&lt;/p&gt;
+
+
+&lt;h3&gt;Unofficial Translations&lt;/h3&gt;
+
+&lt;p&gt;
+Legally speaking, the original (English) version of the licenses is what
+specifies the actual distribution terms for GNU programs and others that
+use them. But to help people better understand the licenses, we give
+permission to publish translations into other languages provided that
+they follow our regulations for unofficial translations:
+&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;
+    &lt;a href="/licenses/translations.html"&gt;List of unofficial 
translations&lt;/a&gt;
+  &lt;/li&gt;
+  &lt;li&gt;&lt;a href="/licenses/translations.html#rules"&gt;How to create an 
unofficial
+      translation&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;h3 id="VerbatimCopying"&gt;Verbatim Copying and Distribution&lt;/h3&gt;
+
+&lt;p&gt;The standard copyright terms for GNU web pages is now the &lt;a
+href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
+Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.  It used to
+be (and for a few pages still is): &lt;em&gt;&lt;span 
class="highlight"&gt;Verbatim
+copying and distribution of this entire article are permitted worldwide,
+without royalty, in any medium, provided this notice is
+preserved&lt;/span&gt;.&lt;/em&gt; Please note the following commentary about 
this
+&ldquo;verbatim license&rdquo; by Eben Moglen:&lt;/p&gt;
+
+&lt;p&gt;
+&ldquo;Our intention in using the phrase &lsquo;verbatim copying in
+any medium&rsquo; is not to require retention of page headings and
+footers or other formatting features.  Retention of weblinks in both
+hyperlinked and non-hyperlinked media (as notes or some other form of
+printed URL in non-HTML media) is required&rdquo;.
+&lt;/p&gt;
+
+&lt;h3&gt;List of Free Software Licenses&lt;/h3&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;
+    &lt;a href="/licenses/license-list.html"&gt;List of Free Software 
Licenses&lt;/a&gt;
+
+&lt;p&gt; If you are contemplating writing a new license, please contact the
+FSF by writing to &lt;a
+href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;. The
+proliferation of different free software licenses means increased work
+for users in understanding the licenses; we may be able to help you
+find an existing Free Software license that meets your needs.
+&lt;/p&gt;
+
+&lt;p&gt;
+If that isn't possible, if you really need a new license, with our
+help you can ensure that the license really is a Free Software license
+and avoid various practical problems.
+&lt;/p&gt;
+
+  &lt;/li&gt;
+ &lt;/ul&gt;
+
+
+&lt;h3 id="WhatIsCopyleft"&gt;What Is Copyleft?&lt;/h3&gt;
+
+&lt;p&gt;
+&lt;a 
href="/copyleft/copyleft.html"&gt;&lt;em&gt;Copyleft&lt;/em&gt;&lt;/a&gt; is a 
general
+method for making a program free
+software and requiring all modified and extended versions of the
+program to be free software as well.
+&lt;/p&gt;
+
+&lt;p&gt;
+The simplest way to make a program free is to put it in the
+&lt;a href="/philosophy/categories.html#PublicDomainSoftware"&gt;public
+domain&lt;/a&gt;, uncopyrighted.  This allows people to share the program
+and their improvements, if they are so minded.  But it also allows
+uncooperative people to convert the program into
+&lt;a href="/philosophy/categories.html#ProprietarySoftware"&gt;proprietary
+software&lt;/a&gt;.  They can make changes, many or few, and distribute the
+result as a proprietary product.  People who receive the program in
+that modified form do not have the freedom that the original author
+gave them; the middleman has stripped it away.
+&lt;/p&gt;
+
+&lt;p&gt;
+In the &lt;a href="/gnu/thegnuproject.html"&gt;GNU project&lt;/a&gt;, our aim 
is
+to give &lt;em&gt;all&lt;/em&gt; users the freedom to redistribute and change 
GNU
+software.  If middlemen could strip off the freedom, we might have
+many users, but those users would not have freedom.  So instead of
+putting GNU software in the public domain, we &ldquo;copyleft&rdquo;
+it.  Copyleft says that anyone who redistributes the software, with or
+without changes, must pass along the freedom to further copy and
+change it.  Copyleft guarantees that every user has freedom.
+&lt;/p&gt;
+
+&lt;p&gt;
+Copyleft also provides an
+&lt;a href="/philosophy/pragmatic.html"&gt;incentive&lt;/a&gt;
+for other programmers to add to free software.
+Important free programs such as the GNU C++ compiler exist
+only because of this.
+&lt;/p&gt;
+
+&lt;p&gt;
+Copyleft also helps programmers who want to contribute
+&lt;a href="/software/software.html#develop"&gt;improvements&lt;/a&gt; to
+&lt;a href="/philosophy/free-sw.html"&gt;free software&lt;/a&gt; get 
permission to
+do that.  These programmers often work for companies or universities
+that would do almost anything to get more money.  A programmer may
+want to contribute her changes to the community, but her employer may
+want to turn the changes into a proprietary software product.
+&lt;/p&gt;
+
+&lt;p&gt;
+When we explain to the employer that it is illegal to distribute the
+improved version except as free software, the employer usually decides
+to release it as free software rather than throw it away.
+&lt;/p&gt;
+
+&lt;p&gt;
+To copyleft a program, we first state that it is copyrighted; then
+we add distribution terms, which are a legal instrument that gives
+everyone the rights to use, modify, and redistribute the program's
+code &lt;em&gt;or any program derived from it&lt;/em&gt; but only if the
+distribution terms are unchanged.  Thus, the code and the freedoms
+become legally inseparable.
+&lt;/p&gt;
+
+&lt;p&gt;
+Proprietary software developers use copyright to take away the users'
+freedom; we use copyright to guarantee their freedom.  That's why we
+reverse the name, changing &ldquo;copyright&rdquo; into
+&ldquo;copyleft&rdquo;.
+&lt;/p&gt;
+
+&lt;p&gt;
+Copyleft is a general concept; there are many ways to fill in the
+details.  In the GNU Project, the specific distribution terms that we
+use are contained in the GNU General Public License, the GNU Lesser
+General Public License and the GNU Free Documentation License.
+&lt;/p&gt;
+
+&lt;p&gt;
+The appropriate license is included in many manuals and in each GNU
+source code distribution.
+&lt;/p&gt;
+
+&lt;p&gt;
+The GNU GPL is designed so that you can easily apply it to your own
+program if you are the copyright holder.  You don't have to modify the
+GNU GPL to do this, just add notices to your program which refer
+properly to the GNU GPL. Please note that you must use the
+entire text of the GPL, if you use it.  It is an integral whole, and
+partial copies are not permitted.  (Likewise for the LGPL, AGPL, and FDL.)
+&lt;/p&gt;
+
+&lt;p&gt;
+Using the same distribution terms for many different programs makes it
+easy to copy code between various different programs.  Since they all
+have the same distribution terms, there is no need to think about
+whether the terms are compatible.  The Lesser GPL includes a
+provision that lets you alter the distribution terms to the ordinary
+GPL, so that you can copy code into another program covered by the GPL.
+&lt;/p&gt;
+
+&lt;h3&gt;Licenses for Other Types of Works&lt;/h3&gt;
+
+&lt;p&gt;
+We believe that published software and documentation should be
+&lt;a href="/philosophy/free-doc.html"&gt;free software and free 
documentation&lt;/a&gt;.
+We recommend making all sorts of educational and reference works free
+also, using free documentation licenses such as the
+&lt;a href="#FDL"&gt;GNU Free Documentation License&lt;/a&gt; (GNU FDL).
+&lt;/p&gt;
+
+&lt;p&gt;For essays of opinion and scientific papers, we recommend
+either the &lt;a
+href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
+Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;, or the
+simple &ldquo;verbatim copying only&rdquo; license stated above.&lt;/p&gt;
+ 
+&lt;p&gt;
+We don't take the position that artistic or entertainment works must
+be free, but if you want to make one free, we recommend
+the &lt;a href="//directory.fsf.org/wiki/License:Free-Art-L-v1.3"&gt;Free Art
+License&lt;/a&gt;.&lt;/p&gt;
+
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
+&lt;!--#include virtual="/server/footer.html" --&gt;
+&lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
+
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this article.&lt;/p&gt;
+&lt;/div&gt;
+
+&lt;!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. --&gt;
+
+&lt;p&gt;Copyright &copy; 2014, <span 
class="removed"><del><strong>2015</strong></del></span> <span 
class="inserted"><ins><em>2015, 2016</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
+
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p class="unprintable"&gt;Updated:
+&lt;!-- timestamp start --&gt;
+$Date: 2016/02/12 10:09:40 $
+&lt;!-- timestamp end --&gt;
+&lt;/p&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre></body></html>

Index: philosophy/po/netscape-npl.pl-diff.html
===================================================================
RCS file: philosophy/po/netscape-npl.pl-diff.html
diff -N philosophy/po/netscape-npl.pl-diff.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/netscape-npl.pl-diff.html     12 Feb 2016 10:11:18 -0000      
1.1
@@ -0,0 +1,282 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/philosophy/netscape-npl.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;title&gt;Netscape Public License
+- GNU Project - Free Software Foundation&lt;/title&gt;
+
+&lt;!--#include virtual="/philosophy/po/netscape-npl.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
+   
+&lt;h2&gt;On the Netscape Public License&lt;/h2&gt;
+
+&lt;p&gt;
+by &lt;a href="http://www.stallman.org/"&gt;&lt;strong&gt;Richard 
Stallman&lt;/strong&gt;&lt;/a&gt;&lt;/p&gt;
+
+&lt;div class="announcement"&gt;
+&lt;blockquote&gt;&lt;p&gt;
+(The &lt;a href="/philosophy/netscape-npl-old.html"&gt; original 
version&lt;/a&gt;
+of this article was written in March 1998 about a draft of the NPL.
+Our first article on the subject was
+&lt;a href="/philosophy/netscape.html"&gt;Netscape is considering making
+the Netscape browser free software&lt;/a&gt;.)&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;
+
+&lt;p&gt;
+The Netscape Public License, or NPL, as it was ultimately designed in
+1998, is a free software license&mdash;but it has three major flaws.
+One flaw sends a bad philosophical message, another puts the free
+software community in a weak position, while the third creates a major
+practical problem within the free software community.  Two of the
+flaws apply to the Mozilla Public License as well.  Because of these
+flaws, we urge that you not use the NPL or the MPL for your free
+software.&lt;/p&gt;
+
+&lt;h3&gt;1. Not all users are equal&lt;/h3&gt;
+
+&lt;p&gt;
+The first problem I noticed in the NPL was that it does not give
+Netscape and the rest of us equal rights, as the GNU GPL does.  Under
+the NPL, we can use Netscape's code only as specified in the NPL, but
+Netscape can use our changes in any way at all&mdash;even in
+proprietary licensed versions of the software.&lt;/p&gt;
+
+&lt;p&gt;
+The problem here is subtle, because this does not make the program
+nonfree.  It does not stop us from redistributing the program, or
+from changing it; it does not deny us any particular freedom.
+Considered from a purely pragmatic viewpoint, it may not look like a
+problem at all.&lt;/p&gt;
+
+&lt;p&gt;
+The problem lies in the deeper message embodied in this condition.  It
+denies the idea of cooperation among equals that our community rests
+on, and says that working on a free program means contributing to a
+proprietary software product.  Those who accept this condition are
+likely to be changed by it, and the change will not strengthen our
+community.&lt;/p&gt;
+
+&lt;p&gt;
+One proposed solution for this asymmetry is to put a time limit on
+it&mdash;perhaps three or five years.  That would be a big improvement,
+because the time limit would deny the problematical deeper message.&lt;/p&gt;
+
+&lt;p&gt;
+The practical effects of this condition are minimized by another
+drawback of the NPL: it is not designed as a thorough copyleft.  In
+other words, it does not try very hard to ensure that modifications
+made by users are available as free software.&lt;/p&gt;
+
+&lt;p&gt;
+The MPL (Mozilla Public License) does &lt;em&gt;not&lt;/em&gt; have this 
problem.
+That is the principal difference between the MPL and the NPL.&lt;/p&gt;
+
+&lt;h3&gt;2. Not a copyleft&lt;/h3&gt;
+
+&lt;p&gt;
+The NPL has the form of a copyleft; it explicitly says that all
+modifications made by users must be released under the NPL.  But this
+applies only to modifications to the existing code&mdash;not to added
+subroutines, if they are put in separate files.  As a practical
+matter, this means it is easy to make proprietary changes if you want
+to: just put the bulk of your code into a separate file, and call the
+collection a Larger Work.  Only the subroutine calls added to the old
+files will have to be released under the NPL, and they will not be
+very useful on their own.&lt;/p&gt;
+
+&lt;p&gt;
+The lack of real copyleft is not a catastrophe; it does not make the
+software nonfree.  For example, the X.org distribution terms do not
+try to use copyleft at all, yet X.org is free software nonetheless.
+BSD is also non-copylefted free software (although the older BSD terms
+have a &lt;a <span 
class="removed"><del><strong>href="/philosophy/bsd.html"&gt;serious</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/bsd.html"&gt;serious</em></ins></span>
 drawback&lt;/a&gt; and should
+not be imitated&mdash;if you want to release non-copylefted free
+software, please use the X.org terms instead).  NPL-covered software
+is also &lt;a href="/philosophy/categories.html"&gt;free software&lt;/a&gt;
+without being copylefted, and this by itself does not make the NPL
+worse than other non-copyleft free software license.&lt;/p&gt;
+
+&lt;p&gt;
+However, while this is not catastrophic, it is nonetheless a drawback.
+And because the NPL looks like a copyleft, some users may be confused
+about it, and might adopt the NPL, thinking that they are obtaining
+the benefits of copyleft for their software, when that is not the
+case.  To avoid this outcome, we will need to work hard to educate
+people about an issue that is not easy to explain in a few words.&lt;/p&gt;
+
+&lt;h3&gt;3. Not compatible with the GPL&lt;/h3&gt;
+
+&lt;p&gt;
+The most serious practical problem in the NPL is that it is
+incompatible with the GNU GPL.  It is impossible to combine
+NPL-covered code and GNU GPL-covered code together in one program, not
+even by linking separate object files or libraries; no matter how this
+is done, it has to violate one license or the other.&lt;/p&gt;
+
+&lt;p&gt;
+This conflict occurs because the GPL is serious about copyleft: it was
+designed to ensure that all changes and extensions to a free program
+must be free.  So it does not leave a loophole for making changes
+proprietary by putting them into a separate file.  To close this
+loophole, the GPL does not allow linking the copylefted program with
+code that has other restrictions or conditions&mdash;such as the
+NPL.&lt;/p&gt;
+
+&lt;p&gt;
+Being incompatible with the GPL does not make a program nonfree; it
+does not raise a fundamental ethical issue.  But it is likely to
+create a serious problem for the free software community, dividing the
+code base into two collections that cannot be mixed.  As a practical
+matter, this problem is very important.&lt;/p&gt;
+
+&lt;p&gt;
+Solving this by changing the GPL is possible, but that would entail
+abandoning copyleft&mdash;which would do more harm than good.  But it
+is possible to solve this problem with a small change in the NPL.
+(See below for a specific way of doing this.)&lt;/p&gt;
+
+&lt;h3&gt;4. A note about names&lt;/h3&gt;
+&lt;p&gt;
+NPL stands for Netscape Public License, but GPL does not stand for GNU
+Public License.  The full name of our license is the GNU General
+Public License, abbreviated GNU GPL.  Sometimes people leave out the
+word &ldquo;GNU&rdquo; and write just GPL.&lt;/p&gt;
+
+&lt;p&gt;
+(This is not a problem, just a fact that you should know.)&lt;/p&gt;
+
+&lt;h3&gt;Conclusion&lt;/h3&gt;
+
+&lt;p&gt;
+Since problem 3 is the most serious, I hope that people will politely
+and rationally explain to Netscape the importance of solving it.
+Solutions are available; they just have to decide to use them.&lt;/p&gt;
+
+&lt;p&gt;
+Here is a possible way to permit linking NPL-covered code and
+GPL-covered code together.  It can be done by adding these two
+paragraphs to the NPL:&lt;/p&gt;
+
+&lt;pre&gt;
+A.1. You may distribute a Covered Work under the terms of the GNU
+     General Public License, version 2 or newer, as published by the
+     Free Software Foundation, when it is included in a Larger Work
+     which is as a whole distributed under the terms of the same
+     version of the GNU General Public License.
+
+A.2. If you have received a copy of a Larger Work under the terms of a
+     version or a choice of versions of the GNU General Public
+     License, and you make modifications to some NPL-covered portions
+     of this Larger Work, you have the option of altering these
+     portions to say that their distribution terms are that version or
+     that choice of versions of GNU General Public License.
+&lt;/pre&gt;
+&lt;p&gt;
+This allows people to combine NPL-covered code with GPL-covered code,
+and to distribute the combined work under the terms of the GNU GPL.&lt;/p&gt;
+
+&lt;p&gt;
+It permits people to release modifications to such combined works
+under the terms of the GNU GPL&mdash;but the easiest way to release
+them is under the NPL.&lt;/p&gt;
+
+&lt;p&gt;
+When people take advantage of A.2, their changes will be released only
+under the terms of the GNU GPL; so these changes would not be
+available for Netscape to use in proprietary versions.  It makes sense
+that Netscape would see this as unfortunate.&lt;/p&gt;
+
+&lt;p&gt;
+However, the NPL gives proprietary software developers an easy way to
+make their changes entirely unavailable to Netscape&mdash;by putting
+their code into separate files and calling the combination a Larger
+Work.  In fact, this is easier, for them, than A.2 is for GPL
+users.&lt;/p&gt;
+
+&lt;p&gt;
+If Netscape feels it can live with the trouble of (effectively)
+proprietary modifications, surely the trouble of GPL-covered
+modifications is a small by comparison.  If Netscape believes that
+practical considerations will encourage most of the proprietary
+software world to release its changes back to Netscape, without being
+compelled to, the same reasons ought to apply in the free software
+world as well.  Netscape should recognize that this change is
+acceptable, and adopt it, to avoid confronting free software
+developers with a serious dilemma.&lt;/p&gt;
+
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
+&lt;!--#include virtual="/server/footer.html" --&gt;
+&lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
+
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this article.&lt;/p&gt;
+&lt;/div&gt;
+
+&lt;!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  Please do NOT change or 
remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. --&gt;
+
+&lt;p&gt;Copyright &copy; 1998, 2003, 2007, <span 
class="removed"><del><strong>2013</strong></del></span> <span 
class="inserted"><ins><em>2013, 2015</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
+<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
+
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p class="unprintable"&gt;Updated:
+&lt;!-- timestamp start --&gt;
+$Date: 2016/02/12 10:11:18 $
+&lt;!-- timestamp end --&gt;
+&lt;/p&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre></body></html>

Index: philosophy/po/x.pl-diff.html
===================================================================
RCS file: philosophy/po/x.pl-diff.html
diff -N philosophy/po/x.pl-diff.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/x.pl-diff.html        12 Feb 2016 10:12:04 -0000      1.1
@@ -0,0 +1,234 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/philosophy/x.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;title&gt;The X Window System Trap
+- GNU Project - Free Software Foundation&lt;/title&gt;
+&lt;meta http-equiv="Keywords"
+      content="GNU, FSF, Free Software Foundation, freedom, Richard Stallman, 
rms, free software movement" /&gt;
+&lt;meta http-equiv="Description"
+      content="Richard Stallman discusses the history of the movement to 
develop a free operating system." /&gt;
+
+&lt;!--#include virtual="/philosophy/po/x.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
+
+&lt;h2&gt;The X Window System Trap&lt;/h2&gt;
+
+&lt;p&gt;
+  by &lt;strong&gt;Richard M. Stallman&lt;/strong&gt;
+&lt;/p&gt;
+
+&lt;p&gt;
+To copyleft or not to copyleft?  That is one of the major
+controversies in the free software community.  The idea of copyleft is
+that we should fight fire with fire&mdash;that we should use copyright
+to make sure our code stays free.  The GNU General Public License (GNU
+GPL) is one example of a copyleft license.&lt;/p&gt;
+
+&lt;p&gt;
+Some free software developers prefer noncopyleft distribution.
+Noncopyleft licenses such as the XFree86 and
+&lt;a <span 
class="removed"><del><strong>href="/philosophy/bsd.html"&gt;BSD&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/bsd.html"&gt;BSD&lt;/a&gt;</em></ins></span>
 licenses are based on the idea
+of never saying no to anyone&mdash;not even to someone who seeks to
+use your work as the basis for restricting other people.  Noncopyleft
+licensing does nothing wrong, but it misses the opportunity to
+actively protect our freedom to change and redistribute software.  For
+that, we need copyleft.&lt;/p&gt;
+
+&lt;p&gt;
+For many years, the X Consortium was the chief opponent of copyleft.
+It exerted both moral suasion and pressure to discourage free software
+developers from copylefting their programs.  It used moral suasion by
+suggesting that it is not nice to say no.  It used pressure through
+its rule that copylefted software could not be in the X Distribution.&lt;/p&gt;
+
+&lt;p&gt;
+Why did the X Consortium adopt this policy?  It had to do with their
+conception of success.  The X Consortium defined success as
+popularity&mdash;specifically, getting computer companies to use the X
+Window System.  This definition put the computer companies in the
+driver's seat: whatever they wanted, the X Consortium had to help
+them get it.&lt;/p&gt;
+
+&lt;p&gt;
+Computer companies normally distribute proprietary software.  They
+wanted free software developers to donate their work for such use.  If
+they had asked for this directly, people would have laughed.  But the
+X Consortium, fronting for them, could present this request as an
+unselfish one.  &ldquo;Join us in donating our work to proprietary software
+developers,&rdquo; they said, suggesting that this is a noble form of
+self-sacrifice.  &ldquo;Join us in achieving popularity,&rdquo; they said,
+suggesting that it was not even a sacrifice.&lt;/p&gt;
+
+&lt;p&gt;
+But self-sacrifice is not the issue: tossing away the defense that
+copyleft provides, which protects the freedom of the whole community,
+is sacrificing more than yourself.  Those who granted the X
+Consortium's request entrusted the community's future to the goodwill
+of the X Consortium.&lt;/p&gt;
+
+&lt;p&gt;
+This trust was misplaced.  In its last year, the X Consortium made a
+plan to restrict the forthcoming X11R6.4 release so that it would not
+be free software.  They decided to start saying no, not only to
+proprietary software developers, but to our community as well.&lt;/p&gt;
+
+&lt;p&gt;
+There is an irony here.  If you said yes when the X Consortium asked
+you not to use copyleft, you put the X Consortium in a position to
+license and restrict its version of your program, along with the
+code for the core of X.&lt;/p&gt;
+
+&lt;p&gt;
+The X Consortium did not carry out this plan.  Instead it closed down
+and transferred X development to the Open Group, whose staff are now
+carrying out a similar plan.  To give them credit, when I asked them
+to release X11R6.4 under the GNU GPL in parallel with their planned
+restrictive license, they were willing to consider the idea.  (They
+were firmly against staying with the old X11 distribution terms.)
+Before they said yes or no to this proposal, it had already failed for
+another reason: the XFree86 group followed the X Consortium's old
+policy, and will not accept copylefted software.
+&lt;/p&gt;
+
+&lt;p&gt;
+In September 1998, several months after X11R6.4 was released with
+nonfree distribution terms, the Open Group reversed its decision and
+rereleased it under the same noncopyleft free software license that
+was used for X11R6.3.  Thus, the Open Group therefore eventually did
+what was right, but that does not alter the general issue.&lt;/p&gt;
+
+&lt;p&gt;
+Even if the X Consortium and the Open Group had never planned to
+restrict X, someone else could have done it.  Noncopylefted software
+is vulnerable from all directions; it lets anyone make a nonfree
+version dominant, if he will invest sufficient resources to add
+significantly important features using proprietary code.  Users who
+choose software based on technical characteristics, rather than on
+freedom, could easily be lured to the nonfree version for short-term
+convenience.&lt;/p&gt;
+
+&lt;p&gt;
+The X Consortium and Open Group can no longer exert moral suasion by
+saying that it is wrong to say no.  This will make it easier to decide
+to copyleft your X-related software.&lt;/p&gt;
+
+&lt;p&gt;
+When you work on the core of X, on programs such as the X server,
+Xlib, and Xt, there is a practical reason not to use copyleft.  The
+X.org group does an important job for the community in maintaining
+these programs, and the benefit of copylefting our changes would be
+less than the harm done by a fork in development.  So it is better to
+work with them, and not copyleft our changes on these programs.
+Likewise for utilities such as &lt;tt&gt;xset&lt;/tt&gt; and 
&lt;tt&gt;xrdb&lt;/tt&gt;, which are close to the
+core of X and do not need major improvements.  At least we know that
+the X.org group has a firm commitment to developing these programs as
+free software.&lt;/p&gt;
+
+&lt;p&gt;
+The issue is different for programs outside the core of X:
+applications, window managers, and additional libraries and widgets.
+There is no reason not to copyleft them, and we should copyleft them.&lt;/p&gt;
+
+&lt;p&gt;
+In case anyone feels the pressure exerted by the criteria for
+inclusion in the X distributions, the GNU Project will undertake to
+publicize copylefted packages that work with X.  If you would like to
+copyleft something, and you worry that its omission from the X
+distribution will impede its popularity, please ask us to help.&lt;/p&gt;
+
+&lt;p&gt;
+At the same time, it is better if we do not feel too much need for
+popularity.  When a businessman tempts you with &ldquo;more
+popularity,&rdquo; he may try to convince you that his use of your
+program is crucial to its success.  Don't believe it!  If your program
+is good, it will find many users anyway; you don't need to feel
+desperate for any particular users, and you will be stronger if you do
+not.  You can get an indescribable sense of joy and freedom by
+responding, &ldquo;Take it or leave it&mdash;that's no skin off my
+back.&rdquo; Often the businessman will turn around and accept the
+program with copyleft, once you call the bluff.&lt;/p&gt;
+
+&lt;p&gt;
+Friends, free software developers, don't repeat old mistakes!  If we
+do not copyleft our software, we put its future at the mercy of anyone
+equipped with more resources than scruples.  With copyleft, we can
+defend freedom, not just for ourselves, but for our whole
+community.&lt;/p&gt;
+
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
+&lt;!--#include virtual="/server/footer.html" --&gt;
+&lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
+
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this article.&lt;/p&gt;
+&lt;/div&gt;
+
+&lt;!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  Please do NOT change or 
remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. --&gt;
+
+&lt;p&gt;Copyright &copy; 1998, 1999, <span 
class="removed"><del><strong>2009</strong></del></span> <span 
class="inserted"><ins><em>2009, 2015</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
+
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
+<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
+
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p class="unprintable"&gt;Updated:
+&lt;!-- timestamp start --&gt;
+$Date: 2016/02/12 10:12:04 $
+&lt;!-- timestamp end --&gt;
+&lt;/p&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre></body></html>



reply via email to

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