[gentoo-commits] gentoo-x86 commit in licenses: Texinfo-manual

["Ulrich Mueller (ulm)" <ulm@gentoo.org>]

ulm         12/09/29 07:27:50

  Modified:             Texinfo-manual
  Log:
  Change into a template.

Revision  Changes    Path
1.2                  licenses/Texinfo-manual

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/Texinfo-manual?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/Texinfo-manual?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/Texinfo-manual?r1=1.1&r2=1.2

Index: Texinfo-manual
===================================================================
RCS file: /var/cvsroot/gentoo-x86/licenses/Texinfo-manual,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Texinfo-manual	14 Dec 2011 17:32:28 -0000	1.1
+++ Texinfo-manual	29 Sep 2012 07:27:50 -0000	1.2
@@ -1,20 +1,24 @@
-Copyright (C) <year> Free Software Foundation, Inc.
+Copyright (C) <year> <copyright holder>
 
 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 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).
+[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).]
 
 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.
+manual under the conditions for verbatim copying, [provided also that
+the section entitled "GNU General Public License" is included exactly
+as in the original, and] 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.
+[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] [the
+section entitled "GNU General Public License" may be included] in a
+translation approved by the [Free Software] Foundation [instead of in
+the original English].]