1 |
ulm 12/09/29 07:27:50 |
2 |
|
3 |
Modified: Texinfo-manual |
4 |
Log: |
5 |
Change into a template. |
6 |
|
7 |
Revision Changes Path |
8 |
1.2 licenses/Texinfo-manual |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/Texinfo-manual?rev=1.2&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/Texinfo-manual?rev=1.2&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/Texinfo-manual?r1=1.1&r2=1.2 |
13 |
|
14 |
Index: Texinfo-manual |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/licenses/Texinfo-manual,v |
17 |
retrieving revision 1.1 |
18 |
retrieving revision 1.2 |
19 |
diff -u -r1.1 -r1.2 |
20 |
--- Texinfo-manual 14 Dec 2011 17:32:28 -0000 1.1 |
21 |
+++ Texinfo-manual 29 Sep 2012 07:27:50 -0000 1.2 |
22 |
@@ -1,20 +1,24 @@ |
23 |
-Copyright (C) <year> Free Software Foundation, Inc. |
24 |
+Copyright (C) <year> <copyright holder> |
25 |
|
26 |
Permission is granted to make and distribute verbatim copies of this |
27 |
manual provided the copyright notice and this permission notice are |
28 |
preserved on all copies. |
29 |
|
30 |
-Permission is granted to process this file through TeX and print the |
31 |
-results, provided the printed document carries copying permission notice |
32 |
-identical to this one except for the removal of this paragraph (this |
33 |
-paragraph not being relevant to the printed manual). |
34 |
+[Permission is granted to process this file through TeX and print the |
35 |
+results, provided the printed document carries copying permission |
36 |
+notice identical to this one except for the removal of this paragraph |
37 |
+(this paragraph not being relevant to the printed manual).] |
38 |
|
39 |
Permission is granted to copy and distribute modified versions of this |
40 |
-manual under the conditions for verbatim copying, provided that the |
41 |
-entire resulting derived work is distributed under the terms of a |
42 |
-permission notice identical to this one. |
43 |
+manual under the conditions for verbatim copying, [provided also that |
44 |
+the section entitled "GNU General Public License" is included exactly |
45 |
+as in the original, and] provided that the entire resulting derived |
46 |
+work is distributed under the terms of a permission notice identical |
47 |
+to this one. |
48 |
|
49 |
-Permission is granted to copy and distribute translations of this manual |
50 |
-into another language, under the above conditions for modified versions, |
51 |
-except that this permission notice may be stated in a translation |
52 |
-approved by the Foundation. |
53 |
+[Permission is granted to copy and distribute translations of this |
54 |
+manual into another language, under the above conditions for modified |
55 |
+versions, except that [this permission notice may be stated] [the |
56 |
+section entitled "GNU General Public License" may be included] in a |
57 |
+translation approved by the [Free Software] Foundation [instead of in |
58 |
+the original English].] |