[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses licenses.ca.html licenses.pl.html ...
|
From: |
GNUN |
|
Subject: |
www/licenses licenses.ca.html licenses.pl.html ... |
|
Date: |
Sun, 3 Jul 2016 13:28:56 +0000 (UTC) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 16/07/03 13:28:56
Modified files:
licenses : licenses.ca.html licenses.pl.html
licenses/po : licenses.ca-diff.html licenses.pl-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ca.html?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.pl.html?cvsroot=www&r1=1.91&r2=1.92
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ca-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.pl-diff.html?cvsroot=www&r1=1.2&r2=1.3
Patches:
Index: licenses.ca.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ca.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- licenses.ca.html 23 Apr 2016 17:29:28 -0000 1.53
+++ licenses.ca.html 3 Jul 2016 13:28:56 -0000 1.54
@@ -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="2016-05-04" --><!--#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>
@@ -508,7 +514,7 @@
<p class="unprintable"><!-- timestamp start -->
Updated:
-$Date: 2016/04/23 17:29:28 $
+$Date: 2016/07/03 13:28:56 $
<!-- timestamp end -->
</p>
Index: licenses.pl.html
===================================================================
RCS file: /web/www/www/licenses/licenses.pl.html,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- licenses.pl.html 29 Feb 2016 06:57:38 -0000 1.91
+++ licenses.pl.html 3 Jul 2016 13:28:56 -0000 1.92
@@ -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="2016-05-04" --><!--#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>
@@ -514,7 +520,7 @@
<p class="unprintable"><!-- timestamp start -->
Aktualizowane:
-$Date: 2016/02/29 06:57:38 $
+$Date: 2016/07/03 13:28:56 $
<!-- timestamp end -->
</p>
Index: po/licenses.ca-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ca-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/licenses.ca-diff.html 12 Feb 2016 10:09:29 -0000 1.5
+++ po/licenses.ca-diff.html 3 Jul 2016 13:28:56 -0000 1.6
@@ -18,6 +18,26 @@
<!--#include virtual="/server/banner.html" -->
<h2>Licenses</h2>
+<span class="inserted"><ins><em><div class="summary">
+<h3 class="no-display">Table of Contents</h3>
+<ul>
+ <li><a href="#Evaluation">Evaluating
Licenses</a></li>
+ <li><a href="#CommonResources">Common Resources for our Software
Licenses</a></li>
+ <li><a href="#GPL">The GNU General Public
License</a></li>
+ <li><a href="#LGPL">The GNU Lesser General Public
License</a></li>
+ <li><a href="#AGPL">The GNU Affero General Public
License</a></li>
+ <li><a href="#FDL">The GNU Free Documentation
License</a></li>
+ <li><a href="#Exceptions">Exceptions to GNU
Licenses</a></li>
+ <li><a href="#LicenseURLs">License URLs</a></li>
+ <li><a href="#UnofficialTransl">Unofficial
Translations</a></li>
+ <li><a href="#VerbatimCopying">Verbatim Copying and
Distribution</a></li>
+ <li><a href="#FSLicenses">List of Free Software
Licenses</a></li>
+ <li><a href="#WhatIsCopyleft">What Is
Copyleft?</a></li>
+ <li><a href="#OtherWorks">Licenses for Other Types of
Works</a></li>
+</ul>
+<hr class="no-display" />
+</div></em></ins></span>
+
<p>
Published software should be <a href="/philosophy/free-sw.html">free
software</a>. To make it free software, you need to release it
@@ -48,9 +68,11 @@
our <a href="/licenses/recommended-copylefts.html">recommended
copyleft licenses</a>.</p>
-<p>We also have a page that discusses <a <span
class="removed"><del><strong>href="/philosophy/bsd.html">the</strong></del></span>
<span
class="inserted"><ins><em>href="/licenses/bsd.html">the</em></ins></span>
BSD License Problem</a>.</p>
+<p>We also have a page that discusses <a
href="/licenses/bsd.html">the BSD License Problem</a>.</p>
+
+<span class="removed"><del><strong><h3>Evaluating</strong></del></span>
-<h3>Evaluating Licenses</h3>
+<span class="inserted"><ins><em><h3
id="Evaluation">Evaluating</em></ins></span> Licenses</h3>
<p>If you come across a license not mentioned in our
<a href="/licenses/license-list.html">license list</a>, you can
ask us
@@ -62,7 +84,9 @@
difficult philosophical problems, so we can't promise to decide
quickly.</p>
-<h3>Common Resources for our Software Licenses</h3>
+<span class="removed"><del><strong><h3>Common</strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="CommonResources">Common</em></ins></span> Resources for our Software
Licenses</h3>
<p>We have a number of resources to help people understand and use our
various licenses:</p>
@@ -75,9 +99,9 @@
own software</a></li>
<li><a href="/licenses/gpl-violation.html">What to do if you see
a
violation of a GNU license</a></li>
- <li><a <span
class="inserted"><ins><em>href="/licenses/license-compatibility.html">License
Compatibility
+ <li><a href="/licenses/license-compatibility.html">License
Compatibility
and Relicensing</a></li>
- <li><a</em></ins></span> href="/licenses/license-list.html">List
of Free Software Licenses</a></li>
+ <li><a href="/licenses/license-list.html">List of Free Software
Licenses</a></li>
<li><a href="/philosophy/university.html">Releasing Free
Software if
you work at a university</a></li>
<li><a href="/licenses/why-assign.html">Why the FSF gets
copyright
@@ -240,7 +264,10 @@
<p>See also the <a href="old-licenses/">old licenses
page</a>.</p>
-<h3>Unofficial Translations</h3>
+<span class="removed"><del><strong><h3>Unofficial</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="UnofficialTransl">Unofficial</em></ins></span> Translations</h3>
<p>
Legally speaking, the original (English) version of the licenses is what
@@ -263,21 +290,31 @@
<p>The standard copyright terms for GNU web pages is now the <a
href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
Commons Attribution-NoDerivs 3.0 United States License</a>. It used to
-be (and for a few pages still is): <em><span
class="highlight">Verbatim
+be (and for a few pages still <span class="removed"><del><strong>is):
<em><span class="highlight">Verbatim</strong></del></span> <span
class="inserted"><ins><em>is):</p>
+
+<blockquote><p>Verbatim</em></ins></span>
copying and distribution of this entire article are permitted worldwide,
without royalty, in any medium, provided this notice is
-preserved</span>.</em> Please note the following commentary about
this
+<span class="removed"><del><strong>preserved</span>.</em>
Please</strong></del></span>
+<span class="inserted"><ins><em>preserved.</p></blockquote>
+
+<p>Please</em></ins></span> note the following commentary about this
“verbatim license” by Eben Moglen:</p>
-<p>
+<span class="removed"><del><strong><p></strong></del></span>
+
+<span class="inserted"><ins><em><blockquote><p></em></ins></span>
“Our intention in using the phrase ‘verbatim copying in
any medium’ 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”.
+printed URL in non-HTML media) is <span
class="removed"><del><strong>required”.
</p>
-<h3>List of Free Software Licenses</h3>
+<h3>List</strong></del></span> <span
class="inserted"><ins><em>required.”
+</p></blockquote>
+
+<h3 id="FSLicenses">List</em></ins></span> of Free Software
Licenses</h3>
<ul>
<li>
@@ -404,7 +441,9 @@
GPL, so that you can copy code into another program covered by the GPL.
</p>
-<h3>Licenses for Other Types of Works</h3>
+<span class="removed"><del><strong><h3>Licenses</strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="OtherWorks">Licenses</em></ins></span> for Other Types of
Works</h3>
<p>
We believe that published software and documentation should be
@@ -473,7 +512,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, <span
class="removed"><del><strong>2015</strong></del></span> <span
class="inserted"><ins><em>2015, 2016</em></ins></span> Free Software
Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2016 Free Software Foundation,
Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -483,7 +522,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/02/12 10:09:29 $
+$Date: 2016/07/03 13:28:56 $
<!-- timestamp end -->
</p>
</div>
Index: po/licenses.pl-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.pl-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/licenses.pl-diff.html 12 Feb 2016 10:09:53 -0000 1.2
+++ po/licenses.pl-diff.html 3 Jul 2016 13:28:56 -0000 1.3
@@ -18,6 +18,26 @@
<!--#include virtual="/server/banner.html" -->
<h2>Licenses</h2>
+<span class="inserted"><ins><em><div class="summary">
+<h3 class="no-display">Table of Contents</h3>
+<ul>
+ <li><a href="#Evaluation">Evaluating
Licenses</a></li>
+ <li><a href="#CommonResources">Common Resources for our Software
Licenses</a></li>
+ <li><a href="#GPL">The GNU General Public
License</a></li>
+ <li><a href="#LGPL">The GNU Lesser General Public
License</a></li>
+ <li><a href="#AGPL">The GNU Affero General Public
License</a></li>
+ <li><a href="#FDL">The GNU Free Documentation
License</a></li>
+ <li><a href="#Exceptions">Exceptions to GNU
Licenses</a></li>
+ <li><a href="#LicenseURLs">License URLs</a></li>
+ <li><a href="#UnofficialTransl">Unofficial
Translations</a></li>
+ <li><a href="#VerbatimCopying">Verbatim Copying and
Distribution</a></li>
+ <li><a href="#FSLicenses">List of Free Software
Licenses</a></li>
+ <li><a href="#WhatIsCopyleft">What Is
Copyleft?</a></li>
+ <li><a href="#OtherWorks">Licenses for Other Types of
Works</a></li>
+</ul>
+<hr class="no-display" />
+</div></em></ins></span>
+
<p>
Published software should be <a href="/philosophy/free-sw.html">free
software</a>. To make it free software, you need to release it
@@ -48,9 +68,11 @@
our <a href="/licenses/recommended-copylefts.html">recommended
copyleft licenses</a>.</p>
-<p>We also have a page that discusses <a <span
class="removed"><del><strong>href="/philosophy/bsd.html">the</strong></del></span>
<span
class="inserted"><ins><em>href="/licenses/bsd.html">the</em></ins></span>
BSD License Problem</a>.</p>
+<p>We also have a page that discusses <a
href="/licenses/bsd.html">the BSD License Problem</a>.</p>
+
+<span class="removed"><del><strong><h3>Evaluating</strong></del></span>
-<h3>Evaluating Licenses</h3>
+<span class="inserted"><ins><em><h3
id="Evaluation">Evaluating</em></ins></span> Licenses</h3>
<p>If you come across a license not mentioned in our
<a href="/licenses/license-list.html">license list</a>, you can
ask us
@@ -62,7 +84,9 @@
difficult philosophical problems, so we can't promise to decide
quickly.</p>
-<h3>Common Resources for our Software Licenses</h3>
+<span class="removed"><del><strong><h3>Common</strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="CommonResources">Common</em></ins></span> Resources for our Software
Licenses</h3>
<p>We have a number of resources to help people understand and use our
various licenses:</p>
@@ -75,9 +99,9 @@
own software</a></li>
<li><a href="/licenses/gpl-violation.html">What to do if you see
a
violation of a GNU license</a></li>
- <li><a <span
class="inserted"><ins><em>href="/licenses/license-compatibility.html">License
Compatibility
+ <li><a href="/licenses/license-compatibility.html">License
Compatibility
and Relicensing</a></li>
- <li><a</em></ins></span> href="/licenses/license-list.html">List
of Free Software Licenses</a></li>
+ <li><a href="/licenses/license-list.html">List of Free Software
Licenses</a></li>
<li><a href="/philosophy/university.html">Releasing Free
Software if
you work at a university</a></li>
<li><a href="/licenses/why-assign.html">Why the FSF gets
copyright
@@ -240,7 +264,10 @@
<p>See also the <a href="old-licenses/">old licenses
page</a>.</p>
-<h3>Unofficial Translations</h3>
+<span class="removed"><del><strong><h3>Unofficial</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="UnofficialTransl">Unofficial</em></ins></span> Translations</h3>
<p>
Legally speaking, the original (English) version of the licenses is what
@@ -263,21 +290,31 @@
<p>The standard copyright terms for GNU web pages is now the <a
href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
Commons Attribution-NoDerivs 3.0 United States License</a>. It used to
-be (and for a few pages still is): <em><span
class="highlight">Verbatim
+be (and for a few pages still <span class="removed"><del><strong>is):
<em><span class="highlight">Verbatim</strong></del></span> <span
class="inserted"><ins><em>is):</p>
+
+<blockquote><p>Verbatim</em></ins></span>
copying and distribution of this entire article are permitted worldwide,
without royalty, in any medium, provided this notice is
-preserved</span>.</em> Please note the following commentary about
this
+<span class="removed"><del><strong>preserved</span>.</em>
Please</strong></del></span>
+<span class="inserted"><ins><em>preserved.</p></blockquote>
+
+<p>Please</em></ins></span> note the following commentary about this
“verbatim license” by Eben Moglen:</p>
-<p>
+<span class="removed"><del><strong><p></strong></del></span>
+
+<span class="inserted"><ins><em><blockquote><p></em></ins></span>
“Our intention in using the phrase ‘verbatim copying in
any medium’ 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”.
+printed URL in non-HTML media) is <span
class="removed"><del><strong>required”.
</p>
-<h3>List of Free Software Licenses</h3>
+<h3>List</strong></del></span> <span
class="inserted"><ins><em>required.”
+</p></blockquote>
+
+<h3 id="FSLicenses">List</em></ins></span> of Free Software
Licenses</h3>
<ul>
<li>
@@ -404,7 +441,9 @@
GPL, so that you can copy code into another program covered by the GPL.
</p>
-<h3>Licenses for Other Types of Works</h3>
+<span class="removed"><del><strong><h3>Licenses</strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="OtherWorks">Licenses</em></ins></span> for Other Types of
Works</h3>
<p>
We believe that published software and documentation should be
@@ -473,7 +512,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, <span
class="removed"><del><strong>2015</strong></del></span> <span
class="inserted"><ins><em>2015, 2016</em></ins></span> Free Software
Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2016 Free Software Foundation,
Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -483,7 +522,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/02/12 10:09:53 $
+$Date: 2016/07/03 13:28:56 $
<!-- timestamp end -->
</p>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses licenses.ca.html licenses.pl.html ...,
GNUN <=