1 | 1 patch for repository zooko@dev.allmydata.org:/home/darcs/tahoe-lafs/trunk: |
---|
2 | |
---|
3 | Sun Oct 2 22:33:33 MDT 2011 zooko@zooko.com |
---|
4 | * docs: fix the rst formatting of COPYING.TGPPL.rst |
---|
5 | Now it renders correctly both on trac and with rst2html --verbose from docutils v0.8.1. |
---|
6 | |
---|
7 | New patches: |
---|
8 | |
---|
9 | [docs: fix the rst formatting of COPYING.TGPPL.rst |
---|
10 | zooko@zooko.com**20111003043333 |
---|
11 | Ignore-this: c5fbc83f4a3db81a0c95b27053c463c5 |
---|
12 | Now it renders correctly both on trac and with rst2html --verbose from docutils v0.8.1. |
---|
13 | ] { |
---|
14 | hunk ./COPYING.TGPPL.rst 1 |
---|
15 | -========================================================= |
---|
16 | - Transitive Grace Period Public Licence ("TGPPL") v. 1.0 |
---|
17 | -========================================================= |
---|
18 | - |
---|
19 | -This work also comes with the added permission that you may combine it with a |
---|
20 | +This work also comes with the added permission that you may combine it with a |
---|
21 | work licensed under the OpenSSL license (any version) and distribute the |
---|
22 | resulting combined work, as long as you follow the requirements of the |
---|
23 | licences of this work in regard to all of the resulting combined work |
---|
24 | hunk ./COPYING.TGPPL.rst 111 |
---|
25 | licences of this work in regard to all of the resulting combined work |
---|
26 | aside from the work licensed under the Open Software License. |
---|
27 | |
---|
28 | - |
---|
29 | +======================================================= |
---|
30 | +Transitive Grace Period Public Licence ("TGPPL") v. 1.0 |
---|
31 | +======================================================= |
---|
32 | |
---|
33 | This Transitive Grace Period Public Licence (the "License") applies to any |
---|
34 | original work of authorship (the "Original Work") whose owner (the |
---|
35 | hunk ./COPYING.TGPPL.rst 120 |
---|
36 | "Licensor") has placed the following licensing notice adjacent to the |
---|
37 | copyright notice for the Original Work: |
---|
38 | |
---|
39 | - Licensed under the Transitive Grace Period Public Licence version 1.0 |
---|
40 | + *Licensed under the Transitive Grace Period Public Licence version 1.0* |
---|
41 | |
---|
42 | 1. **Grant of Copyright License.** Licensor grants You a worldwide, |
---|
43 | royalty-free, non-exclusive, sublicensable license, for the duration of |
---|
44 | hunk ./COPYING.TGPPL.rst 126 |
---|
45 | the copyright, to do the following: |
---|
46 | |
---|
47 | - a. to reproduce the Original Work in copies, either alone or as part of a |
---|
48 | - collective work; |
---|
49 | + a. to reproduce the Original Work in copies, either alone or as part of a |
---|
50 | + collective work; |
---|
51 | |
---|
52 | hunk ./COPYING.TGPPL.rst 129 |
---|
53 | - b. to translate, adapt, alter, transform, modify, or arrange the Original |
---|
54 | - Work, thereby creating derivative works ("Derivative Works") based upon |
---|
55 | - the Original Work; |
---|
56 | + b. to translate, adapt, alter, transform, modify, or arrange the Original |
---|
57 | + Work, thereby creating derivative works ("Derivative Works") based upon |
---|
58 | + the Original Work; |
---|
59 | |
---|
60 | hunk ./COPYING.TGPPL.rst 133 |
---|
61 | - c. to distribute or communicate copies of the Original Work and Derivative |
---|
62 | - Works to the public, with the proviso that copies of Original Work or |
---|
63 | - Derivative Works that You distribute or communicate shall be licensed |
---|
64 | - under this Transitive Grace Period Public Licence no later than 12 |
---|
65 | - months after You distributed or communicated said copies; |
---|
66 | + c. to distribute or communicate copies of the Original Work and Derivative |
---|
67 | + Works to the public, with the proviso that copies of Original Work or |
---|
68 | + Derivative Works that You distribute or communicate shall be licensed |
---|
69 | + under this Transitive Grace Period Public Licence no later than 12 |
---|
70 | + months after You distributed or communicated said copies; |
---|
71 | |
---|
72 | hunk ./COPYING.TGPPL.rst 139 |
---|
73 | - d. to perform the Original Work publicly; and |
---|
74 | + d. to perform the Original Work publicly; and |
---|
75 | |
---|
76 | hunk ./COPYING.TGPPL.rst 141 |
---|
77 | - e. to display the Original Work publicly. |
---|
78 | + e. to display the Original Work publicly. |
---|
79 | |
---|
80 | 2. **Grant of Patent License.** Licensor grants You a worldwide, |
---|
81 | royalty-free, non-exclusive, sublicensable license, under patent claims |
---|
82 | hunk ./COPYING.TGPPL.rst 218 |
---|
83 | limitation of liability shall not apply to the extent applicable law |
---|
84 | prohibits such limitation. |
---|
85 | |
---|
86 | -8. **Acceptance and Termination.** If, at any time, You expressly assented |
---|
87 | +9. **Acceptance and Termination.** If, at any time, You expressly assented |
---|
88 | to this License, that assent indicates your clear and irrevocable |
---|
89 | acceptance of this License and all of its terms and conditions. If You |
---|
90 | distribute or communicate copies of the Original Work or a Derivative |
---|
91 | hunk ./COPYING.TGPPL.rst 234 |
---|
92 | You by this License upon your failure to honor the conditions in Section |
---|
93 | 1(c). |
---|
94 | |
---|
95 | -9. **Termination for Patent Action.** This License shall terminate |
---|
96 | +10. **Termination for Patent Action.** This License shall terminate |
---|
97 | automatically and You may no longer exercise any of the rights granted to |
---|
98 | You by this License as of the date You commence an action, including a |
---|
99 | cross-claim or counterclaim, against Licensor or any licensee alleging |
---|
100 | hunk ./COPYING.TGPPL.rst 242 |
---|
101 | shall not apply for an action alleging patent infringement by |
---|
102 | combinations of the Original Work with other software or hardware. |
---|
103 | |
---|
104 | -10. **Jurisdiction, Venue and Governing Law.** Any action or suit relating to |
---|
105 | +11. **Jurisdiction, Venue and Governing Law.** Any action or suit relating to |
---|
106 | this License may be brought only in the courts of a jurisdiction wherein |
---|
107 | the Licensor resides or in which Licensor conducts its primary business, |
---|
108 | and under the laws of that jurisdiction excluding its conflict-of-law |
---|
109 | hunk ./COPYING.TGPPL.rst 253 |
---|
110 | law in the appropriate jurisdiction. This section shall survive the |
---|
111 | termination of this License. |
---|
112 | |
---|
113 | -11. **Attorneys' Fees.** In any action to enforce the terms of this License |
---|
114 | +12. **Attorneys' Fees.** In any action to enforce the terms of this License |
---|
115 | or seeking damages relating thereto, the prevailing party shall be |
---|
116 | entitled to recover its costs and expenses, including, without |
---|
117 | limitation, reasonable attorneys' fees and costs incurred in connection |
---|
118 | hunk ./COPYING.TGPPL.rst 260 |
---|
119 | with such action, including any appeal of such action. This section shall |
---|
120 | survive the termination of this License. |
---|
121 | |
---|
122 | -12. **Miscellaneous.** If any provision of this License is held to be |
---|
123 | +13. **Miscellaneous.** If any provision of this License is held to be |
---|
124 | unenforceable, such provision shall be reformed only to the extent |
---|
125 | necessary to make it enforceable. |
---|
126 | |
---|
127 | hunk ./COPYING.TGPPL.rst 264 |
---|
128 | -13. **Definition of "You" in This License.** "You" throughout this License, |
---|
129 | +14. **Definition of "You" in This License.** "You" throughout this License, |
---|
130 | whether in upper or lower case, means an individual or a legal entity |
---|
131 | exercising rights under, and complying with all of the terms of, this |
---|
132 | License. For legal entities, "You" includes any entity that controls, is |
---|
133 | hunk ./COPYING.TGPPL.rst 274 |
---|
134 | otherwise, or (ii) ownership of fifty percent (50%) or more of the |
---|
135 | outstanding shares, or (iii) beneficial ownership of such entity. |
---|
136 | |
---|
137 | -14. **Right to Use.** You may use the Original Work in all ways not otherwise |
---|
138 | +15. **Right to Use.** You may use the Original Work in all ways not otherwise |
---|
139 | restricted or conditioned by this License or by law, and Licensor |
---|
140 | promises not to interfere with or be responsible for such uses by You. |
---|
141 | |
---|
142 | hunk ./COPYING.TGPPL.rst 278 |
---|
143 | -15. **Modification of This License.** This License is Copyright © 2007 Zooko |
---|
144 | +16. **Modification of This License.** This License is Copyright © 2007 Zooko |
---|
145 | Wilcox-O'Hearn. Permission is granted to copy, distribute, or communicate |
---|
146 | this License without modification. Nothing in this License permits You to |
---|
147 | modify this License as applied to the Original Work or to Derivative |
---|
148 | } |
---|
149 | |
---|
150 | Context: |
---|
151 | |
---|
152 | [docs/configuration.rst: add section about the types of node, and clarify when setting web.port enables web-API service. fixes #1444 |
---|
153 | zooko@zooko.com**20110926203801 |
---|
154 | Ignore-this: ab94d470c68e720101a7ff3c207a719e |
---|
155 | ] |
---|
156 | [TAG allmydata-tahoe-1.9.0a2 |
---|
157 | warner@lothar.com**20110925234811 |
---|
158 | Ignore-this: e9649c58f9c9017a7d55008938dba64f |
---|
159 | ] |
---|
160 | Patch bundle hash: |
---|
161 | abfc54974115237a1b4afc0c0323410aaaba193c |
---|