From: Paul Eggert Date: Thu, 13 Mar 2003 19:39:47 +0000 (+0000) Subject: COPYING.DOC, fdl.texi: Sync with latest FSF version. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b36e63b835aaf8d40fe96671b7e43b23fe647e24;p=pspp COPYING.DOC, fdl.texi: Sync with latest FSF version. --- diff --git a/doc/COPYING.DOC b/doc/COPYING.DOC index 32a6b2fe84..d1e3b79e0e 100644 --- a/doc/COPYING.DOC +++ b/doc/COPYING.DOC @@ -304,7 +304,7 @@ and independent documents or works, in or on a volume of a storage or distribution medium, is called an "aggregate" if the copyright resulting from the compilation is not used to limit the legal rights of the compilation's users beyond what the individual works permit. -When the Document is included an aggregate, this License does not +When the Document is included in an aggregate, this License does not apply to the other works in the aggregate which are not themselves derivative works of the Document. @@ -326,7 +326,7 @@ permission from their copyright holders, but you may include translations of some or all Invariant Sections in addition to the original versions of these Invariant Sections. You may include a translation of this License, and all the license notices in the -Document, and any Warrany Disclaimers, provided that you also include +Document, and any Warranty Disclaimers, provided that you also include the original English version of this License and the original versions of those notices and disclaimers. In case of a disagreement between the translation and the original version of this License or a notice diff --git a/doc/ChangeLog b/doc/ChangeLog index 172d3add79..848b4ca3a3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2003-03-13 Paul Eggert + + * COPYING.DOC, fdl.texi: Sync with latest FSF version. + 2003-01-02 * COPYING.DOC: belatedly updated to 1.2. diff --git a/doc/fdl.texi b/doc/fdl.texi index 89a012da9a..e02da1459e 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -344,7 +344,7 @@ and independent documents or works, in or on a volume of a storage or distribution medium, is called an ``aggregate'' if the copyright resulting from the compilation is not used to limit the legal rights of the compilation's users beyond what the individual works permit. -When the Document is included an aggregate, this License does not +When the Document is included in an aggregate, this License does not apply to the other works in the aggregate which are not themselves derivative works of the Document. @@ -366,7 +366,7 @@ permission from their copyright holders, but you may include translations of some or all Invariant Sections in addition to the original versions of these Invariant Sections. You may include a translation of this License, and all the license notices in the -Document, and any Warrany Disclaimers, provided that you also include +Document, and any Warranty Disclaimers, provided that you also include the original English version of this License and the original versions of those notices and disclaimers. In case of a disagreement between the translation and the original version of this License or a notice @@ -420,9 +420,9 @@ license notices just after the title page: Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; - with no Invariant Sections, no Front-Cover Texts, and no Back-Cover - Texts. A copy of the license is included in the section entitled - ``GNU Free Documentation License''. + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled ``GNU + Free Documentation License''. @end group @end smallexample