summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-07-14 16:25:53 +0000
committerKarl Berry <karl@freefriends.org>2007-07-14 16:25:53 +0000
commit49c2796a64d430c943970a831d78a12bb493bd24 (patch)
tree38f1f326641117b5c33ce2ea00c8cf14d3413d85
parenta7a071761ef33803a69cc1c9d1dc3f540c609305 (diff)
downloadgnulib-49c2796a64d430c943970a831d78a12bb493bd24.tar.gz
add lgpl-3.0.texi; have all Texinfo licenses consistently omit any sectioning and index commands
-rw-r--r--ChangeLog5
-rw-r--r--NEWS2
-rw-r--r--doc/fdl.texi11
-rw-r--r--doc/gpl-2.0.texi7
-rw-r--r--doc/gpl-3.0.texi8
-rw-r--r--doc/lgpl-2.1.texi7
-rw-r--r--doc/lgpl-3.0.texi190
7 files changed, 213 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index dfacc1fec2..284774918b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-14 Karl Berry <karl@gnu.org>
+
+ * doc/*gpl*.texi, doc/fdl.texi: new versions, consistently
+ omitting sectioning and index commands.
+
2007-07-13 Bruno Haible <bruno@clisp.org>
New gnulib-tool option --more-symlinks.
diff --git a/NEWS b/NEWS
index 9535412cce..dd230cb505 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ User visible incompatible changes
Date Modules Changes
+2007-07-14 gpl, lgpl New Texinfo versions with no sectioning commands.
+
2007-07-10 version-etc Output now mentions GPLv3+, not GPLv2+. Use
gnulib-tool --local-dir to override this.
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 9c6d9afe3f..7b93651f1f 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -1,10 +1,9 @@
-
-@node GNU Free Documentation License
-@appendixsec GNU Free Documentation License
-
-@cindex FDL, GNU Free Documentation License
+@c The GNU Free Documentation License.
@center Version 1.2, November 2002
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.
+
@display
Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
@@ -427,7 +426,7 @@ license notices just after the title page:
@end smallexample
If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with...Texts.'' line with this:
+replace the ``with@dots{}Texts.'' line with this:
@smallexample
@group
diff --git a/doc/gpl-2.0.texi b/doc/gpl-2.0.texi
index 1a4dfcb3e3..8391c387fe 100644
--- a/doc/gpl-2.0.texi
+++ b/doc/gpl-2.0.texi
@@ -1,9 +1,8 @@
-@node Copying
-@unnumbered GNU General Public License
-@cindex GPL, GNU General Public License
+@c The GNU General Public License.
@center Version 2, June 1991
-@c This file is intended to be included in another file.
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.
@display
Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
diff --git a/doc/gpl-3.0.texi b/doc/gpl-3.0.texi
index 6e7ea63fef..1908d1f8f9 100644
--- a/doc/gpl-3.0.texi
+++ b/doc/gpl-3.0.texi
@@ -1,8 +1,8 @@
-@node Copying
-@unnumbered GNU General Public License
+@c The GNU General Public License.
@center Version 3, 29 June 2007
-@c This file is intended to be included in another file.
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.
@display
Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
@@ -19,7 +19,7 @@ software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom
-to share and change all versions of a program--to make sure it remains
+to share and change all versions of a program---to make sure it remains
free software for all its users. We, the Free Software Foundation,
use the GNU General Public License for most of our software; it
applies also to any other work released this way by its authors. You
diff --git a/doc/lgpl-2.1.texi b/doc/lgpl-2.1.texi
index f65b59f085..260c0ce089 100644
--- a/doc/lgpl-2.1.texi
+++ b/doc/lgpl-2.1.texi
@@ -1,8 +1,9 @@
-@node GNU LGPL
-@appendixsec GNU Lesser General Public License
-@cindex LGPL, GNU Lesser General Public License
+@c The GNU Lesser General Public License.
@center Version 2.1, February 1999
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.
+
@display
Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/doc/lgpl-3.0.texi b/doc/lgpl-3.0.texi
new file mode 100644
index 0000000000..21676622c5
--- /dev/null
+++ b/doc/lgpl-3.0.texi
@@ -0,0 +1,190 @@
+@c The GNU Lesser General Public License.
+@center Version 3, 29 June 2007
+
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.
+
+@display
+Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+@end display
+
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+@enumerate 0
+@item Additional Definitions.
+
+As used herein, ``this License'' refers to version 3 of the GNU Lesser
+General Public License, and the ``GNU GPL'' refers to version 3 of the GNU
+General Public License.
+
+``The Library'' refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+An ``Application'' is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+A ``Combined Work'' is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the ``Linked
+Version''.
+
+The ``Minimal Corresponding Source'' for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+The ``Corresponding Application Code'' for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+@item Exception to Section 3 of the GNU GPL.
+
+You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+@item Conveying Modified Versions.
+
+If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+@enumerate a
+@item
+under this License, provided that you make a good faith effort to
+ensure that, in the event an Application does not supply the
+function or data, the facility still operates, and performs
+whatever part of its purpose remains meaningful, or
+
+@item
+under the GNU GPL, with none of the additional permissions of
+this License applicable to that copy.
+@end enumerate
+
+@item Object Code Incorporating Material from Library Header Files.
+
+The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+@enumerate a
+@item
+Give prominent notice with each copy of the object code that the
+Library is used in it and that the Library and its use are
+covered by this License.
+@item
+Accompany the object code with a copy of the GNU GPL and this license
+document.
+@end enumerate
+
+@item Combined Works.
+
+You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+@enumerate a
+@item
+Give prominent notice with each copy of the Combined Work that
+the Library is used in it and that the Library and its use are
+covered by this License.
+@item
+Accompany the Combined Work with a copy of the GNU GPL and this license
+document.
+@item
+For a Combined Work that displays copyright notices during
+execution, include the copyright notice for the Library among
+these notices, as well as a reference directing the user to the
+copies of the GNU GPL and this license document.
+@item
+Do one of the following:
+
+@enumerate 0
+@item
+Convey the Minimal Corresponding Source under the terms of this
+License, and the Corresponding Application Code in a form
+suitable for, and under terms that permit, the user to
+recombine or relink the Application with a modified version of
+the Linked Version to produce a modified Combined Work, in the
+manner specified by section 6 of the GNU GPL for conveying
+Corresponding Source.
+@item
+Use a suitable shared library mechanism for linking with the
+Library. A suitable mechanism is one that (a) uses at run time
+a copy of the Library already present on the user's computer
+system, and (b) will operate properly with a modified version
+of the Library that is interface-compatible with the Linked
+Version.
+@end enumerate
+
+@item
+Provide Installation Information, but only if you would otherwise
+be required to provide such information under section 6 of the
+GNU GPL, and only to the extent that such information is
+necessary to install and execute a modified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option 4d0, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option 4d1, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+@end enumerate
+
+@item Combined Libraries.
+
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+@enumerate a
+@item
+Accompany the combined library with a copy of the same work based
+on the Library, uncombined with any other library facilities,
+conveyed under the terms of this License.
+@item
+Give prominent notice with the combined library that part of it
+is a work based on the Library, and explaining where to find the
+accompanying uncombined form of the same work.
+@end enumerate
+
+@item Revised Versions of the GNU Lesser General Public License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License ``or any later version''
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+@end enumerate