From: Daiki Ueno Date: Thu, 12 Jun 2014 08:56:23 +0000 (+0900) Subject: doc: Update licenses from GNU X-Git-Tag: v0.19.2~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6355bb825176878a77f4419636743c2f47a0ada7;p=thirdparty%2Fgettext.git doc: Update licenses from GNU * gpl.texi, lgpl.texi, fdl.texi: Update from GNU. * gettext.texi (GNU GPL, GNU LGPL, GNU LGPL): Define nodes here, instead of in those license documents. --- diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index cb8f4d385..1d7afeb5f 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,9 @@ +2014-06-12 Daiki Ueno + + * gpl.texi, lgpl.texi, fdl.texi: Update from GNU. + * gettext.texi (GNU GPL, GNU LGPL, GNU LGPL): Define nodes here, + instead of in those license documents. + 2014-06-10 Daiki Ueno * gettext 0.19.1 released. diff --git a/gettext-tools/doc/fdl.texi b/gettext-tools/doc/fdl.texi index 8b2986a4c..6c91624a6 100644 --- a/gettext-tools/doc/fdl.texi +++ b/gettext-tools/doc/fdl.texi @@ -1,12 +1,12 @@ -@node GNU FDL -@appendixsec GNU Free Documentation License -@cindex FDL, GNU Free Documentation License -@cindex License, GNU FDL +@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 Street, Fifth Floor, Boston, MA 02110-1301, USA +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -93,15 +93,15 @@ of text. A copy that is not ``Transparent'' is called ``Opaque''. Examples of suitable formats for Transparent copies include plain @sc{ascii} without markup, Texinfo input format, La@TeX{} input -format, SGML or XML using a publicly available -DTD, and standard-conforming simple HTML, -PostScript or PDF designed for human modification. Examples -of transparent image formats include PNG, XCF and -JPG. Opaque formats include proprietary formats that can be -read and edited only by proprietary word processors, SGML or -XML for which the DTD and/or processing tools are -not generally available, and the machine-generated HTML, -PostScript or PDF produced by some word processors for +format, @acronym{SGML} or @acronym{XML} using a publicly available +@acronym{DTD}, and standard-conforming simple @acronym{HTML}, +PostScript or @acronym{PDF} designed for human modification. Examples +of transparent image formats include @acronym{PNG}, @acronym{XCF} and +@acronym{JPG}. Opaque formats include proprietary formats that can be +read and edited only by proprietary word processors, @acronym{SGML} or +@acronym{XML} for which the @acronym{DTD} and/or processing tools are +not generally available, and the machine-generated @acronym{HTML}, +PostScript or @acronym{PDF} produced by some word processors for output purposes only. The ``Title Page'' means, for a printed book, the title page itself, @@ -407,7 +407,7 @@ as a draft) by the Free Software Foundation. @end enumerate @page -@unnumberedsubsec ADDENDUM: How to use this License for your documents +@heading ADDENDUM: How to use this License for your documents To use this License in a document you have written, include a copy of the License in the document and put the following copyright and @@ -426,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 @@ -448,4 +448,3 @@ to permit their use in free software. @c Local Variables: @c ispell-local-pdict: "ispell-dict" @c End: - diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 8041f1b18..507c62265 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -12369,10 +12369,22 @@ A copy of the license is included in @ref{GNU GPL}. @end menu @page +@node GNU GPL +@appendixsec GNU GENERAL PUBLIC LICENSE +@cindex GPL, GNU General Public License +@cindex License, GNU GPL @include gpl.texi @page +@node GNU LGPL +@appendixsec GNU LESSER GENERAL PUBLIC LICENSE +@cindex LGPL, GNU Lesser General Public License +@cindex License, GNU LGPL @include lgpl.texi @page +@node GNU FDL +@appendixsec GNU Free Documentation License +@cindex FDL, GNU Free Documentation License +@cindex License, GNU FDL @include fdl.texi @node Program Index, Option Index, Licenses, Top diff --git a/gettext-tools/doc/gpl.texi b/gettext-tools/doc/gpl.texi index 6224f67f5..38aa91822 100644 --- a/gettext-tools/doc/gpl.texi +++ b/gettext-tools/doc/gpl.texi @@ -1,10 +1,8 @@ -@node GNU GPL -@appendixsec GNU GENERAL PUBLIC LICENSE -@cindex GPL, GNU General Public License -@cindex License, GNU GPL +@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. @@ -14,7 +12,7 @@ Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @end display -@unnumberedsubsec Preamble +@heading Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -23,7 +21,7 @@ software---to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -64,13 +62,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. -@iftex -@unnumberedsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end iftex -@ifinfo -@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -@end ifinfo +@heading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @enumerate 0 @item @@ -330,7 +322,7 @@ POSSIBILITY OF SUCH DAMAGES. @end ifinfo @page -@unnumberedsubsec Appendix: How to Apply These Terms to Your New Programs +@heading Appendix: How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -366,7 +358,7 @@ If the program is interactive, make it output a short notice like this when it starts in an interactive mode: @smallexample -Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author} +Gnomovision version 69, Copyright (C) @var{year} @var{name of author} Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -393,5 +385,5 @@ Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/gettext-tools/doc/lgpl.texi b/gettext-tools/doc/lgpl.texi index a29c95917..ab03d6cc3 100644 --- a/gettext-tools/doc/lgpl.texi +++ b/gettext-tools/doc/lgpl.texi @@ -1,12 +1,12 @@ -@node GNU LGPL -@appendixsec GNU LESSER GENERAL PUBLIC LICENSE -@cindex LGPL, GNU Lesser General Public License -@cindex License, GNU LGPL +@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 St -- Fifth Floor, Boston, MA 02110-1301, USA +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -16,7 +16,7 @@ as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] @end display -@unnumberedsubsec Preamble +@subheading Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -118,15 +118,7 @@ modification follow. Pay close attention to the difference between a former contains code derived from the library, whereas the latter must be combined with the library in order to run. -@iftex -@unnumberedsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end iftex -@ifinfo -@center GNU LESSER GENERAL PUBLIC LICENSE - -@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -@end ifinfo +@subheading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @enumerate 0 @item @@ -478,13 +470,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. -@iftex -@heading NO WARRANTY -@end iftex -@ifinfo -@center NO WARRANTY - -@end ifinfo +@center @b{NO WARRANTY} @item BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO @@ -510,16 +496,10 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @end enumerate -@iftex -@heading END OF TERMS AND CONDITIONS -@end iftex -@ifinfo -@center END OF TERMS AND CONDITIONS - -@end ifinfo +@subheading END OF TERMS AND CONDITIONS @page -@unnumberedsubsec How to Apply These Terms to Your New Libraries +@subheading How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that