[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses gpl-violation.html licenses.html t...
From: |
Karl Berry |
Subject: |
www/licenses gpl-violation.html licenses.html t... |
Date: |
Mon, 28 Jul 2008 00:47:04 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Karl Berry <karl> 08/07/28 00:47:04
Modified files:
licenses : gpl-violation.html licenses.html
translations.html
Log message:
mention AGPL, #361451
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-violation.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.html?cvsroot=www&r1=1.69&r2=1.70
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.html?cvsroot=www&r1=1.179&r2=1.180
Patches:
Index: gpl-violation.html
===================================================================
RCS file: /web/www/www/licenses/gpl-violation.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gpl-violation.html 13 Jan 2008 14:14:20 -0000 1.19
+++ gpl-violation.html 28 Jul 2008 00:44:48 -0000 1.20
@@ -120,7 +120,7 @@
</p>
<p>
-Copyright © 1999, 2001, 2007 Free Software Foundation, Inc.,
+Copyright © 2008 Free Software Foundation, Inc.,
</p>
<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
<p>Verbatim copying and distribution of this entire article are
@@ -131,7 +131,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2008/01/13 14:14:20 $
+$Date: 2008/07/28 00:44:48 $
<!-- timestamp end -->
</p>
</div>
Index: licenses.html
===================================================================
RCS file: /web/www/www/licenses/licenses.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- licenses.html 19 May 2008 20:18:51 -0000 1.69
+++ licenses.html 28 Jul 2008 00:44:49 -0000 1.70
@@ -200,11 +200,11 @@
<h3>Unofficial Translations</h3>
<p>
-Legally speaking, the original (English) version of the GPL is what
-specified the actual distribution terms for GNU programs. 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.
+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:
</p>
<ul>
@@ -422,7 +422,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2008/05/19 20:18:51 $
+$Date: 2008/07/28 00:44:49 $
<!-- timestamp end -->
</p>
</div>
Index: translations.html
===================================================================
RCS file: /web/www/www/licenses/translations.html,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -b -r1.179 -r1.180
--- translations.html 25 Jul 2008 08:29:42 -0000 1.179
+++ translations.html 28 Jul 2008 00:44:49 -0000 1.180
@@ -18,14 +18,15 @@
free software community. As long as the translations are unofficial,
they can't do any harm, and we hope they help more people understand
the GPL.</p>
-<p>
-We give permission to publish translations of the GPL, GFDL, or LGPL
-into other languages, provided that you (1) label your
-translations as unofficial (see below for how to do this), to
-inform people that they do not count legally as substitutes for
-the authentic version, and (2) you agree to install changes at our
-request, if we learn from other friends of GNU that changes are
-necessary to make the translation clearer.</p>
+
+<p>We give permission to publish translations of the GNU GPL, LGPL,
+AGPL, and FDL into other languages, provided that you (1) label your
+translations as unofficial (see below for how to do this), to inform
+people that they do not count legally as substitutes for the authentic
+version, and (2) you agree to install changes at our request, if we
+learn from other friends of GNU that changes are necessary to make the
+translation clearer.</p>
+
<p>
To label your translations as unofficial, please add the
following text at the beginning,
@@ -40,11 +41,9 @@
<tt>language</tt> speakers understand the GNU GPL better.
</p></blockquote>
-<p>
-If you make a translation, please inform the GNU Translation Managers
-<a href="mailto:address@hidden"><address@hidden></a>.
-They will check to make sure that your translation follows the above
-guidelines and make a link to it from this page.</p>
+<p>Replace “GNU General Public License” and
+“GPL” with the name and abbreviation of the license you're
+translating, if it's not the GPL.</p>
<h3><a id="GPL">The GNU General Public License, version 3</a></h3>
@@ -58,9 +57,9 @@
<!-- another translation (fsl) LI A HREF= -->
<!-- http://lie-br.conectiva.com.br/licenca_gnu.html Brazilian -->
-<p>
-If you make a translation, please inform the GNU Translation Managers
-<a href="mailto:address@hidden"><address@hidden></a>.
+<p>If you make a translation (of any license), please inform the GNU
+Translation Managers <a
+href="mailto:address@hidden"><address@hidden></a>.
They will check to make sure that your translation follows the above
guidelines and make a link to it from this page.</p>
@@ -159,6 +158,12 @@
<!-- THIS MAY LEAD THEM TO BEING CONSTRUED AS 'OFFICIAL' -->
<!-- fdl.ja.html is NOT a translation of GFDL -->
+<p>
+If you make a translation, please inform the GNU Translation Managers
+<a href="mailto:address@hidden"><address@hidden></a>.
+They will check to make sure that your translation follows the above
+guidelines and make a link to it from this page.</p>
+
<p>Up-to-date translations (GFDL 1.2):</p>
<ul>
@@ -268,8 +273,7 @@
</p>
<p>
-Copyright © 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008
-Free Software Foundation, Inc.,
+Copyright © 2008 Free Software Foundation, Inc.,
</p>
<address>51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA</address>
<p>Verbatim copying and distribution of this entire article is
@@ -280,7 +284,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2008/07/25 08:29:42 $
+$Date: 2008/07/28 00:44:49 $
<!-- timestamp end -->
</p>
</div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses gpl-violation.html licenses.html t...,
Karl Berry <=