Mercurial > hg > octave-nkf > gnulib-hg
changeset 4250:731eedae8bd6
COPYING.DOC, fdl.texi: Sync with latest FSF version.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Thu, 13 Mar 2003 19:39:47 +0000 |
parents | b35160ecbc71 |
children | 3e9d34851e81 |
files | doc/COPYING.DOC doc/ChangeLog doc/fdl.texi |
diffstat | 3 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/COPYING.DOC +++ b/doc/COPYING.DOC @@ -304,7 +304,7 @@ 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 @@ 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
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2003-03-13 Paul Eggert <eggert@twinsun.com> + + * COPYING.DOC, fdl.texi: Sync with latest FSF version. + 2003-01-02 <karl@gnu.org> * COPYING.DOC: belatedly updated to 1.2.
--- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -344,7 +344,7 @@ 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 @@ 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 @@ 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