FYI: Update to GPL notices
As part of the XML conversion, I noticed the GPL notices on the three
documents released under the GPL were the older form that had an FSF
street address. I updated them to the current recommended form, including
switching to all-caps for the warranty disclaimer in the recommended way
(sometimes weird things matter for legal notices, so may as well not get
creative).
I also changed the URL to the FSF license page instead of the GPL page
directly since it's quite hard to find the GPLv2 from the latter page, and
that's the license under which the manuals are technically distributed
(although the "any later version" clause is present).
Patch applied:
diff --git a/debian/copyright b/debian/copyright
index d471f3f..8a8cc90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,24 @@ Copyright: 1996, 1997, 1998, Ian Jackson and Christian Schwarz
1999, Software in the Public Interest, Inc.
1999-2012, many other Debian contributors
License: GPL-2+
+ This manual is free software; you may redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+ .
+ This is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ A copy of the GNU General Public License is available as
+ /usr/share/common-licenses/GPL in the Debian distribution or on the World
+ Wide Web at https://www.gnu.org/licenses/.
+Comment: Be aware that the GNU General Public License as applied to
+ standards documents requires distribution or availability of the SGML
+ source when a generated (such as HTML or text) version of the document is
+ distributed. This is the same as with the source code of software but is
+ sometimes surprising for text documents.
Files: copyright-format/*
Copyright: 2007-2012, many Debian contributors
@@ -68,25 +86,3 @@ License: FHS
standard into another language, under the above conditions for modified
versions, except that this permission notice may be stated in a
translation approved by the copyright holder.
-
-License: GPL-2+
- This manual is free software; you may redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any later
- version.
- .
- This is distributed in the hope that it will be useful, but without any
- warranty; without even the implied warranty of merchantability or fitness
- for a particular purpose. See the GNU General Public License for more
- details.
- .
- A copy of the GNU General Public License version 2 is available as
- /usr/share/common-licenses/GPL-2 in the Debian distribution or on the
- World Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also
- obtain it by writing to the Free Software Foundation, Inc., 51 Franklin
- St, Fifth Floor, Boston, MA 02110-1301, USA.
-Comment: Be aware that the GNU General Public License as applied to
- standards documents requires distribution or availability of the SGML
- source when a generated (such as HTML or text) version of the document is
- distributed. This is the same as with the source code of software but is
- sometimes surprising for text documents.
diff --git a/menu-policy.xml b/menu-policy.xml
index b79c32f..013e434 100644
--- a/menu-policy.xml
+++ b/menu-policy.xml
@@ -55,25 +55,22 @@
subsequent work exists.
</para>
<para>
- This manual is free software; you may redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ This manual is free software; you may redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
</para>
<para>
This is distributed in the hope that it will be useful, but
- <emphasis>without any warranty</emphasis>; without even the implied
- warranty of merchantability or fitness for a particular purpose.
- See the GNU General Public License for more details.
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
</para>
<para>
A copy of the GNU General Public License is available as
- <literal>/usr/doc/copyright/GPL</literal> in the Debian distribution
- or on the World Wide Web at <ulink
- url="https://www.gnu.org/copyleft/gpl.html";>The GNU General Public
- Licence</ulink>. You can also obtain it by writing to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301, USA.
+ <filename>/usr/share/common-licenses/GPL</filename> in the Debian
+ distribution or on the World Wide Web at <ulink
+ url="https://www.gnu.org/licenses/";>https://www.gnu.org/licenses/</ulink>.
</para>
</legalnotice>
</bookinfo>
diff --git a/perl-policy.xml b/perl-policy.xml
index 7453c62..22e9cef 100644
--- a/perl-policy.xml
+++ b/perl-policy.xml
@@ -50,7 +50,7 @@
exists.
</para>
<para>
- This manual is free software; you can redistribute it and/or
+ This manual is free software; you may redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
@@ -63,14 +63,9 @@
</para>
<para>
A copy of the GNU General Public License is available as
- <literal>/usr/share/common-licenses/GPL</literal> in the Debian
+ <filename>/usr/share/common-licenses/GPL</filename> in the Debian
distribution or on the World Wide Web at <ulink
- url="https://www.gnu.org/copyleft/gpl.html";>The GNU Public
- Licence</ulink>.
- </para>
- <para>
- You can also obtain it by writing to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ url="https://www.gnu.org/licenses/";>https://www.gnu.org/licenses/</ulink>.
</para>
</legalnotice>
</bookinfo>
diff --git a/policy.xml b/policy.xml
index 7d5a592..ba4e9a0 100644
--- a/policy.xml
+++ b/policy.xml
@@ -49,23 +49,20 @@
<para>
This manual is free software; you may redistribute it and/or
modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or
- (at your option) any later version.
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
</para>
<para>
This is distributed in the hope that it will be useful, but
- <emphasis>without any warranty</emphasis>; without even the
- implied warranty of merchantability or fitness for a particular
- purpose. See the GNU General Public License for more details.
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
</para>
<para>
A copy of the GNU General Public License is available as
<filename>/usr/share/common-licenses/GPL</filename> in the Debian
distribution or on the World Wide Web at <ulink
- url="https://www.gnu.org/copyleft/gpl.html";>the GNU General Public
- Licence</ulink>. You can also obtain it by writing to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301, USA.
+ url="https://www.gnu.org/licenses/";>https://www.gnu.org/licenses/</ulink>.
</para>
</legalnotice>
</bookinfo>
--
Russ Allbery (rra@debian.org) <http://www.eyrie.org/~eagle/>
Reply to: