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

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

[Ulrich Mueller (ulm)]

ulm         11/12/14 17:32:28

  Added:                Texinfo-manual
  Log:
  Permission notice used in some GNU manuals.

Revision  Changes    Path
1.1                  licenses/Texinfo-manual

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

Index: Texinfo-manual
===================================================================
Copyright (C) <year> 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 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.

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.

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

[Ulrich Mueller (ulm)]

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].]

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

[Ulrich Mueller (ulm)]

ulm         14/11/01 17:01:22

  Modified:             Texinfo-manual
  Log:
  Some versions say "Copying" instead of "GNU GPL" in the third paragraph.

Revision  Changes    Path
1.3                  licenses/Texinfo-manual

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

Index: Texinfo-manual
===================================================================
RCS file: /var/cvsroot/gentoo-x86/licenses/Texinfo-manual,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Texinfo-manual	29 Sep 2012 07:27:50 -0000	1.2
+++ Texinfo-manual	1 Nov 2014 17:01:22 -0000	1.3
@@ -11,10 +11,10 @@
 
 Permission is granted to copy and distribute modified versions of this
 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.
+the section entitled ["GNU General Public License"] ["Copying"] 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