From: Bruno Haible Date: Wed, 12 Apr 2006 15:02:09 +0000 (+0000) Subject: Change doc license terms. X-Git-Tag: v0.15~232 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95aa18b6eec7d7d243c0dd9b9407e3e1213de0a2;p=thirdparty%2Fgettext.git Change doc license terms. --- diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index 7d8d7048e..b26226b38 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,7 @@ +2006-04-11 Bruno Haible + + * autosprintf.texi: Change license terms to FDL | GPL. + 2006-04-01 Bruno Haible * texi2html: Add option -expandtex. Expand @ifhtml by default, not diff --git a/gettext-runtime/libasprintf/autosprintf.texi b/gettext-runtime/libasprintf/autosprintf.texi index 034d5b4e1..7e9ca5660 100644 --- a/gettext-runtime/libasprintf/autosprintf.texi +++ b/gettext-runtime/libasprintf/autosprintf.texi @@ -23,28 +23,27 @@ @ifinfo This file provides documentation for GNU @code{autosprintf} library. +@copying Copyright (C) 2002-2003 Free Software Foundation, Inc. -Permission is granted to make and distribute verbatim copies of -this manual provided the copyright notice and this permission notice -are preserved on all copies. - -@ignore -Permission is granted to process this file through TeX and print the -results, provided the printed document carries copying permission -notice identical to this one except for the removal of this paragraph -(this paragraph not being relevant to the printed manual). - -@end ignore -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided that the entire -resulting derived work is distributed under the terms of a permission -notice identical to this one. - -Permission is granted to copy and distribute translations of this manual -into another language, under the above conditions for modified versions, -except that this permission notice may be stated in a translation approved -by the Foundation. +This manual is free documentation. It is dually licensed under the +GNU FDL and the GNU GPL. This means that you can redistribute this +manual under either of these two licenses, at your choice. + +This manual is covered by the GNU FDL. Permission is granted to copy, +distribute and/or modify this document under the terms of the +GNU Free Documentation License (FDL), either version 1.2 of the +License, or (at your option) any later version published by the +Free Software Foundation (FSF); with no Invariant Sections, with no +Front-Cover Text, and with no Back-Cover Texts. +A copy of the license is at @url{http://www.gnu.org/licenses/fdl.html}. + +This manual is covered by the GNU GPL. You can redistribute it and/or +modify it under the terms of the GNU General Public License (GPL), either +version 2 of the License, or (at your option) any later version published +by the Free Software Foundation (FSF). +A copy of the license is at @url{http://www.gnu.org/licenses/gpl.html}. +@end copying @end ifinfo @titlepage @@ -54,21 +53,26 @@ by the Foundation. @page @vskip 0pt plus 1filll -Copyright @copyright{} 2002-2003 Free Software Foundation, Inc. - -Permission is granted to make and distribute verbatim copies of -this manual provided the copyright notice and this permission notice -are preserved on all copies. - -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided that the entire -resulting derived work is distributed under the terms of a permission -notice identical to this one. +@c @insertcopying +Copyright (C) 2002-2003 Free Software Foundation, Inc. -Permission is granted to copy and distribute translations of this manual -into another language, under the above conditions for modified versions, -except that this permission notice may be stated in a translation approved -by the Foundation. +This manual is free documentation. It is dually licensed under the +GNU FDL and the GNU GPL. This means that you can redistribute this +manual under either of these two licenses, at your choice. + +This manual is covered by the GNU FDL. Permission is granted to copy, +distribute and/or modify this document under the terms of the +GNU Free Documentation License (FDL), either version 1.2 of the +License, or (at your option) any later version published by the +Free Software Foundation (FSF); with no Invariant Sections, with no +Front-Cover Text, and with no Back-Cover Texts. +A copy of the license is at @url{http://www.gnu.org/licenses/fdl.html}. + +This manual is covered by the GNU GPL. You can redistribute it and/or +modify it under the terms of the GNU General Public License (GPL), either +version 2 of the License, or (at your option) any later version published +by the Free Software Foundation (FSF). +A copy of the license is at @url{http://www.gnu.org/licenses/gpl.html}. @end titlepage @ifinfo