www-commits
[Top][All Lists]
Advanced

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

www/licenses licenses.ja.html licenses.nl.html ...


From: GNUN
Subject: www/licenses licenses.ja.html licenses.nl.html ...
Date: Sun, 17 Jun 2018 23:00:14 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/06/17 23:00:14

Modified files:
        licenses       : licenses.ja.html licenses.nl.html 
                         licenses.pl.html 
        licenses/po    : licenses.nl-diff.html licenses.pl-diff.html 
Added files:
        licenses/po    : licenses.ja-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ja.html?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.nl.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.pl.html?cvsroot=www&r1=1.95&r2=1.96
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.nl-diff.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.pl-diff.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ja-diff.html?cvsroot=www&rev=1.1

Patches:
Index: licenses.ja.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ja.html,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- licenses.ja.html    17 Jan 2017 08:30:02 -0000      1.50
+++ licenses.ja.html    18 Jun 2018 03:00:12 -0000      1.51
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/licenses.ja.po">
+ https://www.gnu.org/licenses/po/licenses.ja.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/licenses.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/licenses.ja-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2018-04-19" --><!--#set 
var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
 
 <!--#include virtual="/server/header.ja.html" -->
 <!-- Parent-Version: 1.79 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/licenses/po/licenses.translist" -->
 <!--#include virtual="/server/banner.ja.html" -->
+<!--#include virtual="/server/outdated.ja.html" -->
 <h2>ライセンス</h2>
 
 <div class="summary">
@@ -393,7 +399,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2017/01/17 08:30:02 $
+$Date: 2018/06/18 03:00:12 $
 
 <!-- timestamp end -->
 </p>

Index: licenses.nl.html
===================================================================
RCS file: /web/www/www/licenses/licenses.nl.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- licenses.nl.html    22 May 2017 08:00:59 -0000      1.24
+++ licenses.nl.html    18 Jun 2018 03:00:13 -0000      1.25
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/licenses.nl.po">
+ https://www.gnu.org/licenses/po/licenses.nl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/licenses.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/licenses.nl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2018-04-19" --><!--#set 
var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
 
 <!--#include virtual="/server/header.nl.html" -->
 <!-- Parent-Version: 1.79 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/licenses/po/licenses.translist" -->
 <!--#include virtual="/server/banner.nl.html" -->
+<!--#include virtual="/server/outdated.nl.html" -->
 <h2>Licenties</h2>
 
 <div class="summary">
@@ -524,7 +530,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2017/05/22 08:00:59 $
+$Date: 2018/06/18 03:00:13 $
 
 <!-- timestamp end -->
 </p>

Index: licenses.pl.html
===================================================================
RCS file: /web/www/www/licenses/licenses.pl.html,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- licenses.pl.html    24 Apr 2017 22:29:23 -0000      1.95
+++ licenses.pl.html    18 Jun 2018 03:00:13 -0000      1.96
@@ -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">
+ https://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="2018-04-19" --><!--#set 
var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
 
 <!--#include virtual="/server/header.pl.html" -->
 <!-- Parent-Version: 1.79 -->
@@ -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>
 
 <div class="summary">
@@ -556,7 +562,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2017/04/24 22:29:23 $
+$Date: 2018/06/18 03:00:13 $
 
 <!-- timestamp end -->
 </p>

Index: po/licenses.nl-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.nl-diff.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/licenses.nl-diff.html    5 Oct 2016 18:28:51 -0000       1.25
+++ po/licenses.nl-diff.html    18 Jun 2018 03:00:13 -0000      1.26
@@ -11,7 +11,7 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;!-- Parent-Version: 1.79 --&gt;
 &lt;title&gt;Licenses
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/licenses/po/licenses.translist" --&gt;
@@ -40,12 +40,13 @@
 
 &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.
+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), <span 
class="inserted"><ins><em>specifying version 3 or any
+later version,</em></ins></span> 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;
@@ -124,12 +125,12 @@
       &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;,
-      <span class="inserted"><ins><em>Docbook</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/licenses/gpl.dbk"&gt;Docbook&lt;/a&gt;,</strong></del></span>
 <span class="inserted"><ins><em>href="/licenses/gpl.dbk"&gt;v4&lt;/a&gt; or 
-      &lt;a href="/licenses/gpl.xml"&gt;v5&lt;/a&gt;,</em></ins></span>
+      Docbook &lt;a href="/licenses/gpl.dbk"&gt;v4&lt;/a&gt; or 
+      &lt;a href="/licenses/gpl.xml"&gt;v5&lt;/a&gt;,
       &lt;a href="/licenses/gpl.texi"&gt;Texinfo&lt;/a&gt;,
-      <span class="inserted"><ins><em>&lt;a 
href="/licenses/gpl.tex"&gt;LaTeX&lt;/a&gt;, 
-      &lt;a href="/licenses/gpl.md"&gt;Markdown&lt;/a&gt;,</em></ins></span> 
and
-      &lt;a <span 
class="removed"><del><strong>href="/licenses/gpl.tex"&gt;LaTeX&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/gpl.rtf"&gt;RTF&lt;/a&gt;.</em></ins></span>
+      &lt;a href="/licenses/gpl.tex"&gt;LaTeX&lt;/a&gt;, 
+      &lt;a href="/licenses/gpl.md"&gt;Markdown&lt;/a&gt;, and
+      &lt;a href="/licenses/gpl.rtf"&gt;RTF&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
@@ -151,10 +152,10 @@
       &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;, 
-      <span class="inserted"><ins><em>&lt;a 
href="/licenses/lgpl.texi"&gt;Texinfo&lt;/a&gt;, 
+      &lt;a href="/licenses/lgpl.texi"&gt;Texinfo&lt;/a&gt;, 
       &lt;a href="/licenses/lgpl.md"&gt;Markdown&lt;/a&gt;, 
-      &lt;a href="/licenses/lgpl.odt"&gt;ODF&lt;/a&gt;,</em></ins></span> and
-      &lt;a <span 
class="removed"><del><strong>href="/licenses/lgpl.texi"&gt;Texinfo&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/lgpl.rtf"&gt;RTF&lt;/a&gt;.</em></ins></span>
+      &lt;a href="/licenses/lgpl.odt"&gt;ODF&lt;/a&gt;, and
+      &lt;a href="/licenses/lgpl.rtf"&gt;RTF&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
@@ -180,10 +181,10 @@
       &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;, 
-      <span class="inserted"><ins><em>&lt;a 
href="/licenses/agpl.tex"&gt;LaTeX&lt;/a&gt;, 
+      &lt;a href="/licenses/agpl.tex"&gt;LaTeX&lt;/a&gt;, 
       &lt;a href="/licenses/agpl.md"&gt;Markdown&lt;/a&gt;, 
-      &lt;a href="/licenses/agpl.odt"&gt;ODF&lt;/a&gt;,</em></ins></span> and
-      &lt;a <span 
class="removed"><del><strong>href="/licenses/agpl.tex"&gt;LaTeX&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/agpl.rtf"&gt;RTF&lt;/a&gt;.</em></ins></span>
+      &lt;a href="/licenses/agpl.odt"&gt;ODF&lt;/a&gt;, and
+      &lt;a href="/licenses/agpl.rtf"&gt;RTF&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;
@@ -203,13 +204,13 @@
   &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;,
-      <span class="inserted"><ins><em>Docbook &lt;a 
href="/licenses/fdl.xml"&gt;v4&lt;/a&gt; or</em></ins></span> 
-      &lt;a <span 
class="removed"><del><strong>href="/licenses/fdl.xml"&gt;Docbook&lt;/a&gt;,</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/fdl-db5.xml"&gt;v5&lt;/a&gt;,</em></ins></span>
 
+      Docbook &lt;a href="/licenses/fdl.xml"&gt;v4&lt;/a&gt; or 
+      &lt;a href="/licenses/fdl-db5.xml"&gt;v5&lt;/a&gt;, 
       &lt;a href="/licenses/fdl.texi"&gt;Texinfo&lt;/a&gt;, 
-      <span class="inserted"><ins><em>&lt;a 
href="/licenses/fdl.tex"&gt;LaTeX&lt;/a&gt;, 
+      &lt;a href="/licenses/fdl.tex"&gt;LaTeX&lt;/a&gt;, 
       &lt;a href="/licenses/fdl.md"&gt;Markdown&lt;/a&gt;, 
-      &lt;a href="/licenses/fdl.odt"&gt;ODF&lt;/a&gt;,</em></ins></span> and
-      &lt;a <span 
class="removed"><del><strong>href="/licenses/fdl.tex"&gt;LaTeX&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/fdl.rtf"&gt;RTF&lt;/a&gt;.</em></ins></span>
+      &lt;a href="/licenses/fdl.odt"&gt;ODF&lt;/a&gt;, and
+      &lt;a href="/licenses/fdl.rtf"&gt;RTF&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
@@ -294,9 +295,8 @@
 &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
-<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 Attribution-NoDerivs <span class="removed"><del><strong>3.0 United 
States</strong></del></span> <span class="inserted"><ins><em>4.0 
International</em></ins></span> License&lt;/a&gt;.  It used to
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivs 4.0 International License&lt;/a&gt;.  It used to
 be (and for a few pages still is):&lt;/p&gt;
 
 &lt;blockquote&gt;&lt;p&gt;Verbatim
@@ -511,7 +511,7 @@
      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, 2016 Free Software Foundation, 
Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2018</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
@@ -521,7 +521,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2016/10/05 18:28:51 $
+$Date: 2018/06/18 03:00:13 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/licenses.pl-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.pl-diff.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/licenses.pl-diff.html    18 Nov 2016 07:32:41 -0000      1.12
+++ po/licenses.pl-diff.html    18 Jun 2018 03:00:13 -0000      1.13
@@ -11,14 +11,14 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.79</em></ins></span> --&gt;
+&lt;!-- Parent-Version: 1.79 --&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;
 
-<span class="inserted"><ins><em>&lt;div class="summary"&gt;
+&lt;div class="summary"&gt;
 &lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;
 &lt;ul&gt;
   &lt;li&gt;&lt;a href="#Evaluation"&gt;Evaluating 
Licenses&lt;/a&gt;&lt;/li&gt;
@@ -36,16 +36,17 @@
   &lt;li&gt;&lt;a href="#OtherWorks"&gt;Licenses for Other Types of 
Works&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 &lt;hr class="no-display" /&gt;
-&lt;/div&gt;</em></ins></span>
+&lt;/div&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.
+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), <span 
class="inserted"><ins><em>specifying version 3 or any
+later version,</em></ins></span> 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;
@@ -70,9 +71,7 @@
 
 &lt;p&gt;We also have a page that discusses &lt;a 
href="/licenses/bsd.html"&gt;the BSD License Problem&lt;/a&gt;.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h3&gt;Evaluating</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;h3 
id="Evaluation"&gt;Evaluating</em></ins></span> Licenses&lt;/h3&gt;
+&lt;h3 id="Evaluation"&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
@@ -84,9 +83,7 @@
 difficult philosophical problems, so we can't promise to decide
 quickly.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h3&gt;Common</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;h3 
id="CommonResources"&gt;Common</em></ins></span> Resources for our Software 
Licenses&lt;/h3&gt;
+&lt;h3 id="CommonResources"&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;
@@ -128,12 +125,12 @@
       &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;,
-      <span class="inserted"><ins><em>Docbook</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/licenses/gpl.dbk"&gt;Docbook&lt;/a&gt;,</strong></del></span>
 <span class="inserted"><ins><em>href="/licenses/gpl.dbk"&gt;v4&lt;/a&gt; or 
-      &lt;a href="/licenses/gpl.xml"&gt;v5&lt;/a&gt;,</em></ins></span>
+      Docbook &lt;a href="/licenses/gpl.dbk"&gt;v4&lt;/a&gt; or 
+      &lt;a href="/licenses/gpl.xml"&gt;v5&lt;/a&gt;,
       &lt;a href="/licenses/gpl.texi"&gt;Texinfo&lt;/a&gt;,
-      <span class="inserted"><ins><em>&lt;a 
href="/licenses/gpl.tex"&gt;LaTeX&lt;/a&gt;, 
-      &lt;a href="/licenses/gpl.md"&gt;Markdown&lt;/a&gt;,</em></ins></span> 
and
-      &lt;a <span 
class="removed"><del><strong>href="/licenses/gpl.tex"&gt;LaTeX&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/gpl.rtf"&gt;RTF&lt;/a&gt;.</em></ins></span>
+      &lt;a href="/licenses/gpl.tex"&gt;LaTeX&lt;/a&gt;, 
+      &lt;a href="/licenses/gpl.md"&gt;Markdown&lt;/a&gt;, and
+      &lt;a href="/licenses/gpl.rtf"&gt;RTF&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
@@ -155,10 +152,10 @@
       &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;, 
-      <span class="inserted"><ins><em>&lt;a 
href="/licenses/lgpl.texi"&gt;Texinfo&lt;/a&gt;, 
+      &lt;a href="/licenses/lgpl.texi"&gt;Texinfo&lt;/a&gt;, 
       &lt;a href="/licenses/lgpl.md"&gt;Markdown&lt;/a&gt;, 
-      &lt;a href="/licenses/lgpl.odt"&gt;ODF&lt;/a&gt;,</em></ins></span> and
-      &lt;a <span 
class="removed"><del><strong>href="/licenses/lgpl.texi"&gt;Texinfo&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/lgpl.rtf"&gt;RTF&lt;/a&gt;.</em></ins></span>
+      &lt;a href="/licenses/lgpl.odt"&gt;ODF&lt;/a&gt;, and
+      &lt;a href="/licenses/lgpl.rtf"&gt;RTF&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
@@ -184,10 +181,10 @@
       &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;, 
-      <span class="inserted"><ins><em>&lt;a 
href="/licenses/agpl.tex"&gt;LaTeX&lt;/a&gt;, 
+      &lt;a href="/licenses/agpl.tex"&gt;LaTeX&lt;/a&gt;, 
       &lt;a href="/licenses/agpl.md"&gt;Markdown&lt;/a&gt;, 
-      &lt;a href="/licenses/agpl.odt"&gt;ODF&lt;/a&gt;,</em></ins></span> and
-      &lt;a <span 
class="removed"><del><strong>href="/licenses/agpl.tex"&gt;LaTeX&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/agpl.rtf"&gt;RTF&lt;/a&gt;.</em></ins></span>
+      &lt;a href="/licenses/agpl.odt"&gt;ODF&lt;/a&gt;, and
+      &lt;a href="/licenses/agpl.rtf"&gt;RTF&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;
@@ -207,13 +204,13 @@
   &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;,
-      <span class="inserted"><ins><em>Docbook &lt;a 
href="/licenses/fdl.xml"&gt;v4&lt;/a&gt; or</em></ins></span> 
-      &lt;a <span 
class="removed"><del><strong>href="/licenses/fdl.xml"&gt;Docbook&lt;/a&gt;,</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/fdl-db5.xml"&gt;v5&lt;/a&gt;,</em></ins></span>
 
+      Docbook &lt;a href="/licenses/fdl.xml"&gt;v4&lt;/a&gt; or 
+      &lt;a href="/licenses/fdl-db5.xml"&gt;v5&lt;/a&gt;, 
       &lt;a href="/licenses/fdl.texi"&gt;Texinfo&lt;/a&gt;, 
-      <span class="inserted"><ins><em>&lt;a 
href="/licenses/fdl.tex"&gt;LaTeX&lt;/a&gt;, 
+      &lt;a href="/licenses/fdl.tex"&gt;LaTeX&lt;/a&gt;, 
       &lt;a href="/licenses/fdl.md"&gt;Markdown&lt;/a&gt;, 
-      &lt;a href="/licenses/fdl.odt"&gt;ODF&lt;/a&gt;,</em></ins></span> and
-      &lt;a <span 
class="removed"><del><strong>href="/licenses/fdl.tex"&gt;LaTeX&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/fdl.rtf"&gt;RTF&lt;/a&gt;.</em></ins></span>
+      &lt;a href="/licenses/fdl.odt"&gt;ODF&lt;/a&gt;, and
+      &lt;a href="/licenses/fdl.rtf"&gt;RTF&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
@@ -277,10 +274,7 @@
 &lt;p&gt;See also the &lt;a href="old-licenses/"&gt;old licenses 
page&lt;/a&gt;.&lt;/p&gt;
 
 
-<span class="removed"><del><strong>&lt;h3&gt;Unofficial</strong></del></span>
-
-
-<span class="inserted"><ins><em>&lt;h3 
id="UnofficialTransl"&gt;Unofficial</em></ins></span> Translations&lt;/h3&gt;
+&lt;h3 id="UnofficialTransl"&gt;Unofficial Translations&lt;/h3&gt;
 
 &lt;p&gt;
 Legally speaking, the original (English) version of the licenses is what
@@ -301,34 +295,27 @@
 &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
-<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 Attribution-NoDerivs <span class="removed"><del><strong>3.0 United 
States</strong></del></span> <span class="inserted"><ins><em>4.0 
International</em></ins></span> License&lt;/a&gt;.  It used to
-be (and for a few pages still <span class="removed"><del><strong>is): 
&lt;em&gt;&lt;span class="highlight"&gt;Verbatim</strong></del></span> <span 
class="inserted"><ins><em>is):&lt;/p&gt;
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivs 4.0 International License&lt;/a&gt;.  It used to
+be (and for a few pages still is):&lt;/p&gt;
 
-&lt;blockquote&gt;&lt;p&gt;Verbatim</em></ins></span>
+&lt;blockquote&gt;&lt;p&gt;Verbatim
 copying and distribution of this entire article are permitted worldwide,
 without royalty, in any medium, provided this notice is
-<span class="removed"><del><strong>preserved&lt;/span&gt;.&lt;/em&gt; 
Please</strong></del></span>
-<span class="inserted"><ins><em>preserved.&lt;/p&gt;&lt;/blockquote&gt;
+preserved.&lt;/p&gt;&lt;/blockquote&gt;
 
-&lt;p&gt;Please</em></ins></span> note the following commentary about this
+&lt;p&gt;Please note the following commentary about this
 &ldquo;verbatim license&rdquo; by Eben Moglen:&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;</em></ins></span>
+&lt;blockquote&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 <span 
class="removed"><del><strong>required&rdquo;.
-&lt;/p&gt;
-
-&lt;h3&gt;List</strong></del></span> <span 
class="inserted"><ins><em>required.&rdquo;
+printed URL in non-HTML media) is required.&rdquo;
 &lt;/p&gt;&lt;/blockquote&gt;
 
-&lt;h3 id="FSLicenses"&gt;List</em></ins></span> of Free Software 
Licenses&lt;/h3&gt;
+&lt;h3 id="FSLicenses"&gt;List of Free Software Licenses&lt;/h3&gt;
 
 &lt;ul&gt;
   &lt;li&gt;
@@ -455,9 +442,7 @@
 GPL, so that you can copy code into another program covered by the GPL.
 &lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h3&gt;Licenses</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;h3 
id="OtherWorks"&gt;Licenses</em></ins></span> for Other Types of 
Works&lt;/h3&gt;
+&lt;h3 id="OtherWorks"&gt;Licenses for Other Types of Works&lt;/h3&gt;
 
 &lt;p&gt;
 We believe that published software and documentation should be
@@ -526,7 +511,7 @@
      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, 2016 Free Software Foundation, 
Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2018</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
@@ -536,7 +521,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2016/11/18 07:32:41 $
+$Date: 2018/06/18 03:00:13 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/licenses.ja-diff.html
===================================================================
RCS file: po/licenses.ja-diff.html
diff -N po/licenses.ja-diff.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ po/licenses.ja-diff.html    18 Jun 2018 03:00:13 -0000      1.1
@@ -0,0 +1,531 @@
+<!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.79 --&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;div class="summary"&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;
+&lt;ul&gt;
+  &lt;li&gt;&lt;a href="#Evaluation"&gt;Evaluating 
Licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#CommonResources"&gt;Common Resources for our Software 
Licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#GPL"&gt;The GNU General Public 
License&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#LGPL"&gt;The GNU Lesser General Public 
License&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#AGPL"&gt;The GNU Affero General Public 
License&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#FDL"&gt;The GNU Free Documentation 
License&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#Exceptions"&gt;Exceptions to GNU 
Licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#LicenseURLs"&gt;License URLs&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#UnofficialTransl"&gt;Unofficial 
Translations&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#VerbatimCopying"&gt;Verbatim Copying and 
Distribution&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#FSLicenses"&gt;List of Free Software 
Licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#WhatIsCopyleft"&gt;What Is 
Copyleft?&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#OtherWorks"&gt;Licenses for Other Types of 
Works&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&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), <span 
class="inserted"><ins><em>specifying version 3 or any
+later version,</em></ins></span> 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 
href="/licenses/bsd.html"&gt;the BSD License Problem&lt;/a&gt;.&lt;/p&gt;
+
+&lt;h3 id="Evaluation"&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 id="CommonResources"&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 href="/licenses/license-compatibility.html"&gt;License 
Compatibility
+  and Relicensing&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 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;,
+      Docbook &lt;a href="/licenses/gpl.dbk"&gt;v4&lt;/a&gt; or 
+      &lt;a href="/licenses/gpl.xml"&gt;v5&lt;/a&gt;,
+      &lt;a href="/licenses/gpl.texi"&gt;Texinfo&lt;/a&gt;,
+      &lt;a href="/licenses/gpl.tex"&gt;LaTeX&lt;/a&gt;, 
+      &lt;a href="/licenses/gpl.md"&gt;Markdown&lt;/a&gt;, and
+      &lt;a href="/licenses/gpl.rtf"&gt;RTF&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;, 
+      &lt;a href="/licenses/lgpl.texi"&gt;Texinfo&lt;/a&gt;, 
+      &lt;a href="/licenses/lgpl.md"&gt;Markdown&lt;/a&gt;, 
+      &lt;a href="/licenses/lgpl.odt"&gt;ODF&lt;/a&gt;, and
+      &lt;a href="/licenses/lgpl.rtf"&gt;RTF&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;, 
+      &lt;a href="/licenses/agpl.tex"&gt;LaTeX&lt;/a&gt;, 
+      &lt;a href="/licenses/agpl.md"&gt;Markdown&lt;/a&gt;, 
+      &lt;a href="/licenses/agpl.odt"&gt;ODF&lt;/a&gt;, and
+      &lt;a href="/licenses/agpl.rtf"&gt;RTF&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;,
+      Docbook &lt;a href="/licenses/fdl.xml"&gt;v4&lt;/a&gt; or 
+      &lt;a href="/licenses/fdl-db5.xml"&gt;v5&lt;/a&gt;, 
+      &lt;a href="/licenses/fdl.texi"&gt;Texinfo&lt;/a&gt;, 
+      &lt;a href="/licenses/fdl.tex"&gt;LaTeX&lt;/a&gt;, 
+      &lt;a href="/licenses/fdl.md"&gt;Markdown&lt;/a&gt;, 
+      &lt;a href="/licenses/fdl.odt"&gt;ODF&lt;/a&gt;, and
+      &lt;a href="/licenses/fdl.rtf"&gt;RTF&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 id="UnofficialTransl"&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/4.0/"&gt;Creative
+Commons Attribution-NoDerivs 4.0 International License&lt;/a&gt;.  It used to
+be (and for a few pages still is):&lt;/p&gt;
+
+&lt;blockquote&gt;&lt;p&gt;Verbatim
+copying and distribution of this entire article are permitted worldwide,
+without royalty, in any medium, provided this notice is
+preserved.&lt;/p&gt;&lt;/blockquote&gt;
+
+&lt;p&gt;Please note the following commentary about this
+&ldquo;verbatim license&rdquo; by Eben Moglen:&lt;/p&gt;
+
+&lt;blockquote&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;/blockquote&gt;
+
+&lt;h3 id="FSLicenses"&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 id="OtherWorks"&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, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2018</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: 2018/06/18 03:00:13 $
+&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]