r72976 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r72975‎ | r72976 | r72977 >
Date:14:01, 14 September 2010
Author:jeroendedauw
Status:deferred
Tags:
Comment:
GPL 2 -> GPL 3 + small improvement
Modified paths:
  • /trunk/extensions/Validator/COPYING (modified) (history)
  • /trunk/extensions/Validator/includes/criteria/CriterionNotEmpty.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Validator/includes/criteria/CriterionNotEmpty.php
@@ -26,7 +26,7 @@
2727 * @see ItemParameterCriterion::validate
2828 */
2929 protected function doValidation( $value ) {
30 - return strlen( trim( $value ) ) > 0;
 30+ return trim( $value ) != '';
3131 }
3232
3333 /**
Index: trunk/extensions/Validator/COPYING
@@ -3,307 +3,648 @@
44 "COPYING", or a subdirectory thereof. For those files, the license text contained in
55 said file overrides any license information contained in directories of smaller depth.
66 Alternative licenses are typically used for software that is provided by external
7 -parties, and merely packaged with the Semantic MediaWiki release for convenience.
 7+parties, and merely packaged with this software for convenience.
88 ----
99
10 - GNU GENERAL PUBLIC LICENSE
11 - Version 2, June 1991
 10+ GNU GENERAL PUBLIC LICENSE
 11+ Version 3, 29 June 2007
1212
13 - Copyright (C) 1989, 1991 Free Software Foundation, Inc.
14 - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 13+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
1514 Everyone is permitted to copy and distribute verbatim copies
1615 of this license document, but changing it is not allowed.
1716
18 - Preamble
 17+ Preamble
1918
20 - The licenses for most software are designed to take away your
21 -freedom to share and change it. By contrast, the GNU General Public
22 -License is intended to guarantee your freedom to share and change free
23 -software--to make sure the software is free for all its users. This
24 -General Public License applies to most of the Free Software
25 -Foundation's software and to any other program whose authors commit to
26 -using it. (Some other Free Software Foundation software is covered by
27 -the GNU Library General Public License instead.) You can apply it to
 19+ The GNU General Public License is a free, copyleft license for
 20+software and other kinds of works.
 21+
 22+ The licenses for most software and other practical works are designed
 23+to take away your freedom to share and change the works. By contrast,
 24+the GNU General Public License is intended to guarantee your freedom to
 25+share and change all versions of a program--to make sure it remains free
 26+software for all its users. We, the Free Software Foundation, use the
 27+GNU General Public License for most of our software; it applies also to
 28+any other work released this way by its authors. You can apply it to
2829 your programs, too.
2930
3031 When we speak of free software, we are referring to freedom, not
3132 price. Our General Public Licenses are designed to make sure that you
3233 have the freedom to distribute copies of free software (and charge for
33 -this service if you wish), that you receive source code or can get it
34 -if you want it, that you can change the software or use pieces of it
35 -in new free programs; and that you know you can do these things.
 34+them if you wish), that you receive source code or can get it if you
 35+want it, that you can change the software or use pieces of it in new
 36+free programs, and that you know you can do these things.
3637
37 - To protect your rights, we need to make restrictions that forbid
38 -anyone to deny you these rights or to ask you to surrender the rights.
39 -These restrictions translate to certain responsibilities for you if you
40 -distribute copies of the software, or if you modify it.
 38+ To protect your rights, we need to prevent others from denying you
 39+these rights or asking you to surrender the rights. Therefore, you have
 40+certain responsibilities if you distribute copies of the software, or if
 41+you modify it: responsibilities to respect the freedom of others.
4142
4243 For example, if you distribute copies of such a program, whether
43 -gratis or for a fee, you must give the recipients all the rights that
44 -you have. You must make sure that they, too, receive or can get the
45 -source code. And you must show them these terms so they know their
46 -rights.
 44+gratis or for a fee, you must pass on to the recipients the same
 45+freedoms that you received. You must make sure that they, too, receive
 46+or can get the source code. And you must show them these terms so they
 47+know their rights.
4748
48 - We protect your rights with two steps: (1) copyright the software, and
49 -(2) offer you this license which gives you legal permission to copy,
50 -distribute and/or modify the software.
 49+ Developers that use the GNU GPL protect your rights with two steps:
 50+(1) assert copyright on the software, and (2) offer you this License
 51+giving you legal permission to copy, distribute and/or modify it.
5152
52 - Also, for each author's protection and ours, we want to make certain
53 -that everyone understands that there is no warranty for this free
54 -software. If the software is modified by someone else and passed on, we
55 -want its recipients to know that what they have is not the original, so
56 -that any problems introduced by others will not reflect on the original
57 -authors' reputations.
 53+ For the developers' and authors' protection, the GPL clearly explains
 54+that there is no warranty for this free software. For both users' and
 55+authors' sake, the GPL requires that modified versions be marked as
 56+changed, so that their problems will not be attributed erroneously to
 57+authors of previous versions.
5858
59 - Finally, any free program is threatened constantly by software
60 -patents. We wish to avoid the danger that redistributors of a free
61 -program will individually obtain patent licenses, in effect making the
62 -program proprietary. To prevent this, we have made it clear that any
63 -patent must be licensed for everyone's free use or not licensed at all.
 59+ Some devices are designed to deny users access to install or run
 60+modified versions of the software inside them, although the manufacturer
 61+can do so. This is fundamentally incompatible with the aim of
 62+protecting users' freedom to change the software. The systematic
 63+pattern of such abuse occurs in the area of products for individuals to
 64+use, which is precisely where it is most unacceptable. Therefore, we
 65+have designed this version of the GPL to prohibit the practice for those
 66+products. If such problems arise substantially in other domains, we
 67+stand ready to extend this provision to those domains in future versions
 68+of the GPL, as needed to protect the freedom of users.
6469
 70+ Finally, every program is threatened constantly by software patents.
 71+States should not allow patents to restrict development and use of
 72+software on general-purpose computers, but in those that do, we wish to
 73+avoid the special danger that patents applied to a free program could
 74+make it effectively proprietary. To prevent this, the GPL assures that
 75+patents cannot be used to render the program non-free.
 76+
6577 The precise terms and conditions for copying, distribution and
6678 modification follow.
67 -
68 - GNU GENERAL PUBLIC LICENSE
69 - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
7079
71 - 0. This License applies to any program or other work which contains
72 -a notice placed by the copyright holder saying it may be distributed
73 -under the terms of this General Public License. The "Program", below,
74 -refers to any such program or work, and a "work based on the Program"
75 -means either the Program or any derivative work under copyright law:
76 -that is to say, a work containing the Program or a portion of it,
77 -either verbatim or with modifications and/or translated into another
78 -language. (Hereinafter, translation is included without limitation in
79 -the term "modification".) Each licensee is addressed as "you".
 80+ TERMS AND CONDITIONS
8081
81 -Activities other than copying, distribution and modification are not
82 -covered by this License; they are outside its scope. The act of
83 -running the Program is not restricted, and the output from the Program
84 -is covered only if its contents constitute a work based on the
85 -Program (independent of having been made by running the Program).
86 -Whether that is true depends on what the Program does.
 82+ 0. Definitions.
8783
88 - 1. You may copy and distribute verbatim copies of the Program's
89 -source code as you receive it, in any medium, provided that you
90 -conspicuously and appropriately publish on each copy an appropriate
91 -copyright notice and disclaimer of warranty; keep intact all the
92 -notices that refer to this License and to the absence of any warranty;
93 -and give any other recipients of the Program a copy of this License
94 -along with the Program.
 84+ "This License" refers to version 3 of the GNU General Public License.
9585
96 -You may charge a fee for the physical act of transferring a copy, and
97 -you may at your option offer warranty protection in exchange for a fee.
 86+ "Copyright" also means copyright-like laws that apply to other kinds of
 87+works, such as semiconductor masks.
9888
99 - 2. You may modify your copy or copies of the Program or any portion
100 -of it, thus forming a work based on the Program, and copy and
101 -distribute such modifications or work under the terms of Section 1
102 -above, provided that you also meet all of these conditions:
 89+ "The Program" refers to any copyrightable work licensed under this
 90+License. Each licensee is addressed as "you". "Licensees" and
 91+"recipients" may be individuals or organizations.
10392
104 - a) You must cause the modified files to carry prominent notices
105 - stating that you changed the files and the date of any change.
 93+ To "modify" a work means to copy from or adapt all or part of the work
 94+in a fashion requiring copyright permission, other than the making of an
 95+exact copy. The resulting work is called a "modified version" of the
 96+earlier work or a work "based on" the earlier work.
10697
107 - b) You must cause any work that you distribute or publish, that in
108 - whole or in part contains or is derived from the Program or any
109 - part thereof, to be licensed as a whole at no charge to all third
110 - parties under the terms of this License.
 98+ A "covered work" means either the unmodified Program or a work based
 99+on the Program.
111100
112 - c) If the modified program normally reads commands interactively
113 - when run, you must cause it, when started running for such
114 - interactive use in the most ordinary way, to print or display an
115 - announcement including an appropriate copyright notice and a
116 - notice that there is no warranty (or else, saying that you provide
117 - a warranty) and that users may redistribute the program under
118 - these conditions, and telling the user how to view a copy of this
119 - License. (Exception: if the Program itself is interactive but
120 - does not normally print such an announcement, your work based on
121 - the Program is not required to print an announcement.)
122 -
123 -These requirements apply to the modified work as a whole. If
124 -identifiable sections of that work are not derived from the Program,
125 -and can be reasonably considered independent and separate works in
126 -themselves, then this License, and its terms, do not apply to those
127 -sections when you distribute them as separate works. But when you
128 -distribute the same sections as part of a whole which is a work based
129 -on the Program, the distribution of the whole must be on the terms of
130 -this License, whose permissions for other licensees extend to the
131 -entire whole, and thus to each and every part regardless of who wrote it.
 101+ To "propagate" a work means to do anything with it that, without
 102+permission, would make you directly or secondarily liable for
 103+infringement under applicable copyright law, except executing it on a
 104+computer or modifying a private copy. Propagation includes copying,
 105+distribution (with or without modification), making available to the
 106+public, and in some countries other activities as well.
132107
133 -Thus, it is not the intent of this section to claim rights or contest
134 -your rights to work written entirely by you; rather, the intent is to
135 -exercise the right to control the distribution of derivative or
136 -collective works based on the Program.
 108+ To "convey" a work means any kind of propagation that enables other
 109+parties to make or receive copies. Mere interaction with a user through
 110+a computer network, with no transfer of a copy, is not conveying.
137111
138 -In addition, mere aggregation of another work not based on the Program
139 -with the Program (or with a work based on the Program) on a volume of
140 -a storage or distribution medium does not bring the other work under
141 -the scope of this License.
 112+ An interactive user interface displays "Appropriate Legal Notices"
 113+to the extent that it includes a convenient and prominently visible
 114+feature that (1) displays an appropriate copyright notice, and (2)
 115+tells the user that there is no warranty for the work (except to the
 116+extent that warranties are provided), that licensees may convey the
 117+work under this License, and how to view a copy of this License. If
 118+the interface presents a list of user commands or options, such as a
 119+menu, a prominent item in the list meets this criterion.
142120
143 - 3. You may copy and distribute the Program (or a work based on it,
144 -under Section 2) in object code or executable form under the terms of
145 -Sections 1 and 2 above provided that you also do one of the following:
 121+ 1. Source Code.
146122
147 - a) Accompany it with the complete corresponding machine-readable
148 - source code, which must be distributed under the terms of Sections
149 - 1 and 2 above on a medium customarily used for software interchange; or,
 123+ The "source code" for a work means the preferred form of the work
 124+for making modifications to it. "Object code" means any non-source
 125+form of a work.
150126
151 - b) Accompany it with a written offer, valid for at least three
152 - years, to give any third party, for a charge no more than your
153 - cost of physically performing source distribution, a complete
154 - machine-readable copy of the corresponding source code, to be
155 - distributed under the terms of Sections 1 and 2 above on a medium
156 - customarily used for software interchange; or,
 127+ A "Standard Interface" means an interface that either is an official
 128+standard defined by a recognized standards body, or, in the case of
 129+interfaces specified for a particular programming language, one that
 130+is widely used among developers working in that language.
157131
158 - c) Accompany it with the information you received as to the offer
159 - to distribute corresponding source code. (This alternative is
160 - allowed only for noncommercial distribution and only if you
161 - received the program in object code or executable form with such
162 - an offer, in accord with Subsection b above.)
 132+ The "System Libraries" of an executable work include anything, other
 133+than the work as a whole, that (a) is included in the normal form of
 134+packaging a Major Component, but which is not part of that Major
 135+Component, and (b) serves only to enable use of the work with that
 136+Major Component, or to implement a Standard Interface for which an
 137+implementation is available to the public in source code form. A
 138+"Major Component", in this context, means a major essential component
 139+(kernel, window system, and so on) of the specific operating system
 140+(if any) on which the executable work runs, or a compiler used to
 141+produce the work, or an object code interpreter used to run it.
163142
164 -The source code for a work means the preferred form of the work for
165 -making modifications to it. For an executable work, complete source
166 -code means all the source code for all modules it contains, plus any
167 -associated interface definition files, plus the scripts used to
168 -control compilation and installation of the executable. However, as a
169 -special exception, the source code distributed need not include
170 -anything that is normally distributed (in either source or binary
171 -form) with the major components (compiler, kernel, and so on) of the
172 -operating system on which the executable runs, unless that component
173 -itself accompanies the executable.
 143+ The "Corresponding Source" for a work in object code form means all
 144+the source code needed to generate, install, and (for an executable
 145+work) run the object code and to modify the work, including scripts to
 146+control those activities. However, it does not include the work's
 147+System Libraries, or general-purpose tools or generally available free
 148+programs which are used unmodified in performing those activities but
 149+which are not part of the work. For example, Corresponding Source
 150+includes interface definition files associated with source files for
 151+the work, and the source code for shared libraries and dynamically
 152+linked subprograms that the work is specifically designed to require,
 153+such as by intimate data communication or control flow between those
 154+subprograms and other parts of the work.
174155
175 -If distribution of executable or object code is made by offering
176 -access to copy from a designated place, then offering equivalent
177 -access to copy the source code from the same place counts as
178 -distribution of the source code, even though third parties are not
179 -compelled to copy the source along with the object code.
180 -
181 - 4. You may not copy, modify, sublicense, or distribute the Program
182 -except as expressly provided under this License. Any attempt
183 -otherwise to copy, modify, sublicense or distribute the Program is
184 -void, and will automatically terminate your rights under this License.
185 -However, parties who have received copies, or rights, from you under
186 -this License will not have their licenses terminated so long as such
187 -parties remain in full compliance.
 156+ The Corresponding Source need not include anything that users
 157+can regenerate automatically from other parts of the Corresponding
 158+Source.
188159
189 - 5. You are not required to accept this License, since you have not
190 -signed it. However, nothing else grants you permission to modify or
191 -distribute the Program or its derivative works. These actions are
192 -prohibited by law if you do not accept this License. Therefore, by
193 -modifying or distributing the Program (or any work based on the
194 -Program), you indicate your acceptance of this License to do so, and
195 -all its terms and conditions for copying, distributing or modifying
196 -the Program or works based on it.
 160+ The Corresponding Source for a work in source code form is that
 161+same work.
197162
198 - 6. Each time you redistribute the Program (or any work based on the
199 -Program), the recipient automatically receives a license from the
200 -original licensor to copy, distribute or modify the Program subject to
201 -these terms and conditions. You may not impose any further
202 -restrictions on the recipients' exercise of the rights granted herein.
203 -You are not responsible for enforcing compliance by third parties to
 163+ 2. Basic Permissions.
 164+
 165+ All rights granted under this License are granted for the term of
 166+copyright on the Program, and are irrevocable provided the stated
 167+conditions are met. This License explicitly affirms your unlimited
 168+permission to run the unmodified Program. The output from running a
 169+covered work is covered by this License only if the output, given its
 170+content, constitutes a covered work. This License acknowledges your
 171+rights of fair use or other equivalent, as provided by copyright law.
 172+
 173+ You may make, run and propagate covered works that you do not
 174+convey, without conditions so long as your license otherwise remains
 175+in force. You may convey covered works to others for the sole purpose
 176+of having them make modifications exclusively for you, or provide you
 177+with facilities for running those works, provided that you comply with
 178+the terms of this License in conveying all material for which you do
 179+not control copyright. Those thus making or running the covered works
 180+for you must do so exclusively on your behalf, under your direction
 181+and control, on terms that prohibit them from making any copies of
 182+your copyrighted material outside their relationship with you.
 183+
 184+ Conveying under any other circumstances is permitted solely under
 185+the conditions stated below. Sublicensing is not allowed; section 10
 186+makes it unnecessary.
 187+
 188+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 189+
 190+ No covered work shall be deemed part of an effective technological
 191+measure under any applicable law fulfilling obligations under article
 192+11 of the WIPO copyright treaty adopted on 20 December 1996, or
 193+similar laws prohibiting or restricting circumvention of such
 194+measures.
 195+
 196+ When you convey a covered work, you waive any legal power to forbid
 197+circumvention of technological measures to the extent such circumvention
 198+is effected by exercising rights under this License with respect to
 199+the covered work, and you disclaim any intention to limit operation or
 200+modification of the work as a means of enforcing, against the work's
 201+users, your or third parties' legal rights to forbid circumvention of
 202+technological measures.
 203+
 204+ 4. Conveying Verbatim Copies.
 205+
 206+ You may convey verbatim copies of the Program's source code as you
 207+receive it, in any medium, provided that you conspicuously and
 208+appropriately publish on each copy an appropriate copyright notice;
 209+keep intact all notices stating that this License and any
 210+non-permissive terms added in accord with section 7 apply to the code;
 211+keep intact all notices of the absence of any warranty; and give all
 212+recipients a copy of this License along with the Program.
 213+
 214+ You may charge any price or no price for each copy that you convey,
 215+and you may offer support or warranty protection for a fee.
 216+
 217+ 5. Conveying Modified Source Versions.
 218+
 219+ You may convey a work based on the Program, or the modifications to
 220+produce it from the Program, in the form of source code under the
 221+terms of section 4, provided that you also meet all of these conditions:
 222+
 223+ a) The work must carry prominent notices stating that you modified
 224+ it, and giving a relevant date.
 225+
 226+ b) The work must carry prominent notices stating that it is
 227+ released under this License and any conditions added under section
 228+ 7. This requirement modifies the requirement in section 4 to
 229+ "keep intact all notices".
 230+
 231+ c) You must license the entire work, as a whole, under this
 232+ License to anyone who comes into possession of a copy. This
 233+ License will therefore apply, along with any applicable section 7
 234+ additional terms, to the whole of the work, and all its parts,
 235+ regardless of how they are packaged. This License gives no
 236+ permission to license the work in any other way, but it does not
 237+ invalidate such permission if you have separately received it.
 238+
 239+ d) If the work has interactive user interfaces, each must display
 240+ Appropriate Legal Notices; however, if the Program has interactive
 241+ interfaces that do not display Appropriate Legal Notices, your
 242+ work need not make them do so.
 243+
 244+ A compilation of a covered work with other separate and independent
 245+works, which are not by their nature extensions of the covered work,
 246+and which are not combined with it such as to form a larger program,
 247+in or on a volume of a storage or distribution medium, is called an
 248+"aggregate" if the compilation and its resulting copyright are not
 249+used to limit the access or legal rights of the compilation's users
 250+beyond what the individual works permit. Inclusion of a covered work
 251+in an aggregate does not cause this License to apply to the other
 252+parts of the aggregate.
 253+
 254+ 6. Conveying Non-Source Forms.
 255+
 256+ You may convey a covered work in object code form under the terms
 257+of sections 4 and 5, provided that you also convey the
 258+machine-readable Corresponding Source under the terms of this License,
 259+in one of these ways:
 260+
 261+ a) Convey the object code in, or embodied in, a physical product
 262+ (including a physical distribution medium), accompanied by the
 263+ Corresponding Source fixed on a durable physical medium
 264+ customarily used for software interchange.
 265+
 266+ b) Convey the object code in, or embodied in, a physical product
 267+ (including a physical distribution medium), accompanied by a
 268+ written offer, valid for at least three years and valid for as
 269+ long as you offer spare parts or customer support for that product
 270+ model, to give anyone who possesses the object code either (1) a
 271+ copy of the Corresponding Source for all the software in the
 272+ product that is covered by this License, on a durable physical
 273+ medium customarily used for software interchange, for a price no
 274+ more than your reasonable cost of physically performing this
 275+ conveying of source, or (2) access to copy the
 276+ Corresponding Source from a network server at no charge.
 277+
 278+ c) Convey individual copies of the object code with a copy of the
 279+ written offer to provide the Corresponding Source. This
 280+ alternative is allowed only occasionally and noncommercially, and
 281+ only if you received the object code with such an offer, in accord
 282+ with subsection 6b.
 283+
 284+ d) Convey the object code by offering access from a designated
 285+ place (gratis or for a charge), and offer equivalent access to the
 286+ Corresponding Source in the same way through the same place at no
 287+ further charge. You need not require recipients to copy the
 288+ Corresponding Source along with the object code. If the place to
 289+ copy the object code is a network server, the Corresponding Source
 290+ may be on a different server (operated by you or a third party)
 291+ that supports equivalent copying facilities, provided you maintain
 292+ clear directions next to the object code saying where to find the
 293+ Corresponding Source. Regardless of what server hosts the
 294+ Corresponding Source, you remain obligated to ensure that it is
 295+ available for as long as needed to satisfy these requirements.
 296+
 297+ e) Convey the object code using peer-to-peer transmission, provided
 298+ you inform other peers where the object code and Corresponding
 299+ Source of the work are being offered to the general public at no
 300+ charge under subsection 6d.
 301+
 302+ A separable portion of the object code, whose source code is excluded
 303+from the Corresponding Source as a System Library, need not be
 304+included in conveying the object code work.
 305+
 306+ A "User Product" is either (1) a "consumer product", which means any
 307+tangible personal property which is normally used for personal, family,
 308+or household purposes, or (2) anything designed or sold for incorporation
 309+into a dwelling. In determining whether a product is a consumer product,
 310+doubtful cases shall be resolved in favor of coverage. For a particular
 311+product received by a particular user, "normally used" refers to a
 312+typical or common use of that class of product, regardless of the status
 313+of the particular user or of the way in which the particular user
 314+actually uses, or expects or is expected to use, the product. A product
 315+is a consumer product regardless of whether the product has substantial
 316+commercial, industrial or non-consumer uses, unless such uses represent
 317+the only significant mode of use of the product.
 318+
 319+ "Installation Information" for a User Product means any methods,
 320+procedures, authorization keys, or other information required to install
 321+and execute modified versions of a covered work in that User Product from
 322+a modified version of its Corresponding Source. The information must
 323+suffice to ensure that the continued functioning of the modified object
 324+code is in no case prevented or interfered with solely because
 325+modification has been made.
 326+
 327+ If you convey an object code work under this section in, or with, or
 328+specifically for use in, a User Product, and the conveying occurs as
 329+part of a transaction in which the right of possession and use of the
 330+User Product is transferred to the recipient in perpetuity or for a
 331+fixed term (regardless of how the transaction is characterized), the
 332+Corresponding Source conveyed under this section must be accompanied
 333+by the Installation Information. But this requirement does not apply
 334+if neither you nor any third party retains the ability to install
 335+modified object code on the User Product (for example, the work has
 336+been installed in ROM).
 337+
 338+ The requirement to provide Installation Information does not include a
 339+requirement to continue to provide support service, warranty, or updates
 340+for a work that has been modified or installed by the recipient, or for
 341+the User Product in which it has been modified or installed. Access to a
 342+network may be denied when the modification itself materially and
 343+adversely affects the operation of the network or violates the rules and
 344+protocols for communication across the network.
 345+
 346+ Corresponding Source conveyed, and Installation Information provided,
 347+in accord with this section must be in a format that is publicly
 348+documented (and with an implementation available to the public in
 349+source code form), and must require no special password or key for
 350+unpacking, reading or copying.
 351+
 352+ 7. Additional Terms.
 353+
 354+ "Additional permissions" are terms that supplement the terms of this
 355+License by making exceptions from one or more of its conditions.
 356+Additional permissions that are applicable to the entire Program shall
 357+be treated as though they were included in this License, to the extent
 358+that they are valid under applicable law. If additional permissions
 359+apply only to part of the Program, that part may be used separately
 360+under those permissions, but the entire Program remains governed by
 361+this License without regard to the additional permissions.
 362+
 363+ When you convey a copy of a covered work, you may at your option
 364+remove any additional permissions from that copy, or from any part of
 365+it. (Additional permissions may be written to require their own
 366+removal in certain cases when you modify the work.) You may place
 367+additional permissions on material, added by you to a covered work,
 368+for which you have or can give appropriate copyright permission.
 369+
 370+ Notwithstanding any other provision of this License, for material you
 371+add to a covered work, you may (if authorized by the copyright holders of
 372+that material) supplement the terms of this License with terms:
 373+
 374+ a) Disclaiming warranty or limiting liability differently from the
 375+ terms of sections 15 and 16 of this License; or
 376+
 377+ b) Requiring preservation of specified reasonable legal notices or
 378+ author attributions in that material or in the Appropriate Legal
 379+ Notices displayed by works containing it; or
 380+
 381+ c) Prohibiting misrepresentation of the origin of that material, or
 382+ requiring that modified versions of such material be marked in
 383+ reasonable ways as different from the original version; or
 384+
 385+ d) Limiting the use for publicity purposes of names of licensors or
 386+ authors of the material; or
 387+
 388+ e) Declining to grant rights under trademark law for use of some
 389+ trade names, trademarks, or service marks; or
 390+
 391+ f) Requiring indemnification of licensors and authors of that
 392+ material by anyone who conveys the material (or modified versions of
 393+ it) with contractual assumptions of liability to the recipient, for
 394+ any liability that these contractual assumptions directly impose on
 395+ those licensors and authors.
 396+
 397+ All other non-permissive additional terms are considered "further
 398+restrictions" within the meaning of section 10. If the Program as you
 399+received it, or any part of it, contains a notice stating that it is
 400+governed by this License along with a term that is a further
 401+restriction, you may remove that term. If a license document contains
 402+a further restriction but permits relicensing or conveying under this
 403+License, you may add to a covered work material governed by the terms
 404+of that license document, provided that the further restriction does
 405+not survive such relicensing or conveying.
 406+
 407+ If you add terms to a covered work in accord with this section, you
 408+must place, in the relevant source files, a statement of the
 409+additional terms that apply to those files, or a notice indicating
 410+where to find the applicable terms.
 411+
 412+ Additional terms, permissive or non-permissive, may be stated in the
 413+form of a separately written license, or stated as exceptions;
 414+the above requirements apply either way.
 415+
 416+ 8. Termination.
 417+
 418+ You may not propagate or modify a covered work except as expressly
 419+provided under this License. Any attempt otherwise to propagate or
 420+modify it is void, and will automatically terminate your rights under
 421+this License (including any patent licenses granted under the third
 422+paragraph of section 11).
 423+
 424+ However, if you cease all violation of this License, then your
 425+license from a particular copyright holder is reinstated (a)
 426+provisionally, unless and until the copyright holder explicitly and
 427+finally terminates your license, and (b) permanently, if the copyright
 428+holder fails to notify you of the violation by some reasonable means
 429+prior to 60 days after the cessation.
 430+
 431+ Moreover, your license from a particular copyright holder is
 432+reinstated permanently if the copyright holder notifies you of the
 433+violation by some reasonable means, this is the first time you have
 434+received notice of violation of this License (for any work) from that
 435+copyright holder, and you cure the violation prior to 30 days after
 436+your receipt of the notice.
 437+
 438+ Termination of your rights under this section does not terminate the
 439+licenses of parties who have received copies or rights from you under
 440+this License. If your rights have been terminated and not permanently
 441+reinstated, you do not qualify to receive new licenses for the same
 442+material under section 10.
 443+
 444+ 9. Acceptance Not Required for Having Copies.
 445+
 446+ You are not required to accept this License in order to receive or
 447+run a copy of the Program. Ancillary propagation of a covered work
 448+occurring solely as a consequence of using peer-to-peer transmission
 449+to receive a copy likewise does not require acceptance. However,
 450+nothing other than this License grants you permission to propagate or
 451+modify any covered work. These actions infringe copyright if you do
 452+not accept this License. Therefore, by modifying or propagating a
 453+covered work, you indicate your acceptance of this License to do so.
 454+
 455+ 10. Automatic Licensing of Downstream Recipients.
 456+
 457+ Each time you convey a covered work, the recipient automatically
 458+receives a license from the original licensors, to run, modify and
 459+propagate that work, subject to this License. You are not responsible
 460+for enforcing compliance by third parties with this License.
 461+
 462+ An "entity transaction" is a transaction transferring control of an
 463+organization, or substantially all assets of one, or subdividing an
 464+organization, or merging organizations. If propagation of a covered
 465+work results from an entity transaction, each party to that
 466+transaction who receives a copy of the work also receives whatever
 467+licenses to the work the party's predecessor in interest had or could
 468+give under the previous paragraph, plus a right to possession of the
 469+Corresponding Source of the work from the predecessor in interest, if
 470+the predecessor has it or can get it with reasonable efforts.
 471+
 472+ You may not impose any further restrictions on the exercise of the
 473+rights granted or affirmed under this License. For example, you may
 474+not impose a license fee, royalty, or other charge for exercise of
 475+rights granted under this License, and you may not initiate litigation
 476+(including a cross-claim or counterclaim in a lawsuit) alleging that
 477+any patent claim is infringed by making, using, selling, offering for
 478+sale, or importing the Program or any portion of it.
 479+
 480+ 11. Patents.
 481+
 482+ A "contributor" is a copyright holder who authorizes use under this
 483+License of the Program or a work on which the Program is based. The
 484+work thus licensed is called the contributor's "contributor version".
 485+
 486+ A contributor's "essential patent claims" are all patent claims
 487+owned or controlled by the contributor, whether already acquired or
 488+hereafter acquired, that would be infringed by some manner, permitted
 489+by this License, of making, using, or selling its contributor version,
 490+but do not include claims that would be infringed only as a
 491+consequence of further modification of the contributor version. For
 492+purposes of this definition, "control" includes the right to grant
 493+patent sublicenses in a manner consistent with the requirements of
204494 this License.
205495
206 - 7. If, as a consequence of a court judgment or allegation of patent
207 -infringement or for any other reason (not limited to patent issues),
208 -conditions are imposed on you (whether by court order, agreement or
 496+ Each contributor grants you a non-exclusive, worldwide, royalty-free
 497+patent license under the contributor's essential patent claims, to
 498+make, use, sell, offer for sale, import and otherwise run, modify and
 499+propagate the contents of its contributor version.
 500+
 501+ In the following three paragraphs, a "patent license" is any express
 502+agreement or commitment, however denominated, not to enforce a patent
 503+(such as an express permission to practice a patent or covenant not to
 504+sue for patent infringement). To "grant" such a patent license to a
 505+party means to make such an agreement or commitment not to enforce a
 506+patent against the party.
 507+
 508+ If you convey a covered work, knowingly relying on a patent license,
 509+and the Corresponding Source of the work is not available for anyone
 510+to copy, free of charge and under the terms of this License, through a
 511+publicly available network server or other readily accessible means,
 512+then you must either (1) cause the Corresponding Source to be so
 513+available, or (2) arrange to deprive yourself of the benefit of the
 514+patent license for this particular work, or (3) arrange, in a manner
 515+consistent with the requirements of this License, to extend the patent
 516+license to downstream recipients. "Knowingly relying" means you have
 517+actual knowledge that, but for the patent license, your conveying the
 518+covered work in a country, or your recipient's use of the covered work
 519+in a country, would infringe one or more identifiable patents in that
 520+country that you have reason to believe are valid.
 521+
 522+ If, pursuant to or in connection with a single transaction or
 523+arrangement, you convey, or propagate by procuring conveyance of, a
 524+covered work, and grant a patent license to some of the parties
 525+receiving the covered work authorizing them to use, propagate, modify
 526+or convey a specific copy of the covered work, then the patent license
 527+you grant is automatically extended to all recipients of the covered
 528+work and works based on it.
 529+
 530+ A patent license is "discriminatory" if it does not include within
 531+the scope of its coverage, prohibits the exercise of, or is
 532+conditioned on the non-exercise of one or more of the rights that are
 533+specifically granted under this License. You may not convey a covered
 534+work if you are a party to an arrangement with a third party that is
 535+in the business of distributing software, under which you make payment
 536+to the third party based on the extent of your activity of conveying
 537+the work, and under which the third party grants, to any of the
 538+parties who would receive the covered work from you, a discriminatory
 539+patent license (a) in connection with copies of the covered work
 540+conveyed by you (or copies made from those copies), or (b) primarily
 541+for and in connection with specific products or compilations that
 542+contain the covered work, unless you entered into that arrangement,
 543+or that patent license was granted, prior to 28 March 2007.
 544+
 545+ Nothing in this License shall be construed as excluding or limiting
 546+any implied license or other defenses to infringement that may
 547+otherwise be available to you under applicable patent law.
 548+
 549+ 12. No Surrender of Others' Freedom.
 550+
 551+ If conditions are imposed on you (whether by court order, agreement or
209552 otherwise) that contradict the conditions of this License, they do not
210 -excuse you from the conditions of this License. If you cannot
211 -distribute so as to satisfy simultaneously your obligations under this
212 -License and any other pertinent obligations, then as a consequence you
213 -may not distribute the Program at all. For example, if a patent
214 -license would not permit royalty-free redistribution of the Program by
215 -all those who receive copies directly or indirectly through you, then
216 -the only way you could satisfy both it and this License would be to
217 -refrain entirely from distribution of the Program.
 553+excuse you from the conditions of this License. If you cannot convey a
 554+covered work so as to satisfy simultaneously your obligations under this
 555+License and any other pertinent obligations, then as a consequence you may
 556+not convey it at all. For example, if you agree to terms that obligate you
 557+to collect a royalty for further conveying from those to whom you convey
 558+the Program, the only way you could satisfy both those terms and this
 559+License would be to refrain entirely from conveying the Program.
218560
219 -If any portion of this section is held invalid or unenforceable under
220 -any particular circumstance, the balance of the section is intended to
221 -apply and the section as a whole is intended to apply in other
222 -circumstances.
 561+ 13. Use with the GNU Affero General Public License.
223562
224 -It is not the purpose of this section to induce you to infringe any
225 -patents or other property right claims or to contest validity of any
226 -such claims; this section has the sole purpose of protecting the
227 -integrity of the free software distribution system, which is
228 -implemented by public license practices. Many people have made
229 -generous contributions to the wide range of software distributed
230 -through that system in reliance on consistent application of that
231 -system; it is up to the author/donor to decide if he or she is willing
232 -to distribute software through any other system and a licensee cannot
233 -impose that choice.
 563+ Notwithstanding any other provision of this License, you have
 564+permission to link or combine any covered work with a work licensed
 565+under version 3 of the GNU Affero General Public License into a single
 566+combined work, and to convey the resulting work. The terms of this
 567+License will continue to apply to the part which is the covered work,
 568+but the special requirements of the GNU Affero General Public License,
 569+section 13, concerning interaction through a network will apply to the
 570+combination as such.
234571
235 -This section is intended to make thoroughly clear what is believed to
236 -be a consequence of the rest of this License.
237 -
238 - 8. If the distribution and/or use of the Program is restricted in
239 -certain countries either by patents or by copyrighted interfaces, the
240 -original copyright holder who places the Program under this License
241 -may add an explicit geographical distribution limitation excluding
242 -those countries, so that distribution is permitted only in or among
243 -countries not thus excluded. In such case, this License incorporates
244 -the limitation as if written in the body of this License.
 572+ 14. Revised Versions of this License.
245573
246 - 9. The Free Software Foundation may publish revised and/or new versions
247 -of the General Public License from time to time. Such new versions will
 574+ The Free Software Foundation may publish revised and/or new versions of
 575+the GNU General Public License from time to time. Such new versions will
248576 be similar in spirit to the present version, but may differ in detail to
249577 address new problems or concerns.
250578
251 -Each version is given a distinguishing version number. If the Program
252 -specifies a version number of this License which applies to it and "any
253 -later version", you have the option of following the terms and conditions
254 -either of that version or of any later version published by the Free
255 -Software Foundation. If the Program does not specify a version number of
256 -this License, you may choose any version ever published by the Free Software
257 -Foundation.
 579+ Each version is given a distinguishing version number. If the
 580+Program specifies that a certain numbered version of the GNU General
 581+Public License "or any later version" applies to it, you have the
 582+option of following the terms and conditions either of that numbered
 583+version or of any later version published by the Free Software
 584+Foundation. If the Program does not specify a version number of the
 585+GNU General Public License, you may choose any version ever published
 586+by the Free Software Foundation.
258587
259 - 10. If you wish to incorporate parts of the Program into other free
260 -programs whose distribution conditions are different, write to the author
261 -to ask for permission. For software which is copyrighted by the Free
262 -Software Foundation, write to the Free Software Foundation; we sometimes
263 -make exceptions for this. Our decision will be guided by the two goals
264 -of preserving the free status of all derivatives of our free software and
265 -of promoting the sharing and reuse of software generally.
 588+ If the Program specifies that a proxy can decide which future
 589+versions of the GNU General Public License can be used, that proxy's
 590+public statement of acceptance of a version permanently authorizes you
 591+to choose that version for the Program.
266592
267 - NO WARRANTY
 593+ Later license versions may give you additional or different
 594+permissions. However, no additional obligations are imposed on any
 595+author or copyright holder as a result of your choosing to follow a
 596+later version.
268597
269 - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
270 -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
271 -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
272 -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
273 -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
274 -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
275 -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
276 -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
277 -REPAIR OR CORRECTION.
 598+ 15. Disclaimer of Warranty.
278599
279 - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
280 -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
281 -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
282 -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
283 -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
284 -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
285 -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
286 -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
287 -POSSIBILITY OF SUCH DAMAGES.
 600+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 601+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 602+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 603+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 604+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 605+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 606+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 607+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
288608
289 - END OF TERMS AND CONDITIONS
290 -
291 - How to Apply These Terms to Your New Programs
 609+ 16. Limitation of Liability.
292610
 611+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 612+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 613+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 614+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 615+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 616+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 617+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 618+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 619+SUCH DAMAGES.
 620+
 621+ 17. Interpretation of Sections 15 and 16.
 622+
 623+ If the disclaimer of warranty and limitation of liability provided
 624+above cannot be given local legal effect according to their terms,
 625+reviewing courts shall apply local law that most closely approximates
 626+an absolute waiver of all civil liability in connection with the
 627+Program, unless a warranty or assumption of liability accompanies a
 628+copy of the Program in return for a fee.
 629+
 630+ END OF TERMS AND CONDITIONS
 631+
 632+ How to Apply These Terms to Your New Programs
 633+
293634 If you develop a new program, and you want it to be of the greatest
294635 possible use to the public, the best way to achieve this is to make it
295636 free software which everyone can redistribute and change under these terms.
296637
297638 To do so, attach the following notices to the program. It is safest
298639 to attach them to the start of each source file to most effectively
299 -convey the exclusion of warranty; and each file should have at least
 640+state the exclusion of warranty; and each file should have at least
300641 the "copyright" line and a pointer to where the full notice is found.
301642
302643 <one line to give the program's name and a brief idea of what it does.>
303644 Copyright (C) <year> <name of author>
304645
305 - This program is free software; you can redistribute it and/or modify
 646+ This program is free software: you can redistribute it and/or modify
306647 it under the terms of the GNU General Public License as published by
307 - the Free Software Foundation; either version 2 of the License, or
 648+ the Free Software Foundation, either version 3 of the License, or
308649 (at your option) any later version.
309650
310651 This program is distributed in the hope that it will be useful,
@@ -312,37 +653,30 @@
313654 GNU General Public License for more details.
314655
315656 You should have received a copy of the GNU General Public License
316 - along with this program; if not, write to the Free Software
317 - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 657+ along with this program. If not, see <http://www.gnu.org/licenses/>.
318658
319 -
320659 Also add information on how to contact you by electronic and paper mail.
321660
322 -If the program is interactive, make it output a short notice like this
323 -when it starts in an interactive mode:
 661+ If the program does terminal interaction, make it output a short
 662+notice like this when it starts in an interactive mode:
324663
325 - Gnomovision version 69, Copyright (C) year name of author
326 - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 664+ <program> Copyright (C) <year> <name of author>
 665+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
327666 This is free software, and you are welcome to redistribute it
328667 under certain conditions; type `show c' for details.
329668
330669 The hypothetical commands `show w' and `show c' should show the appropriate
331 -parts of the General Public License. Of course, the commands you use may
332 -be called something other than `show w' and `show c'; they could even be
333 -mouse-clicks or menu items--whatever suits your program.
 670+parts of the General Public License. Of course, your program's commands
 671+might be different; for a GUI interface, you would use an "about box".
334672
335 -You should also get your employer (if you work as a programmer) or your
336 -school, if any, to sign a "copyright disclaimer" for the program, if
337 -necessary. Here is a sample; alter the names:
 673+ You should also get your employer (if you work as a programmer) or school,
 674+if any, to sign a "copyright disclaimer" for the program, if necessary.
 675+For more information on this, and how to apply and follow the GNU GPL, see
 676+<http://www.gnu.org/licenses/>.
338677
339 - Yoyodyne, Inc., hereby disclaims all copyright interest in the program
340 - `Gnomovision' (which makes passes at compilers) written by James Hacker.
341 -
342 - <signature of Ty Coon>, 1 April 1989
343 - Ty Coon, President of Vice
344 -
345 -This General Public License does not permit incorporating your program into
346 -proprietary programs. If your program is a subroutine library, you may
347 -consider it more useful to permit linking proprietary applications with the
348 -library. If this is what you want to do, use the GNU Library General
349 -Public License instead of this License.
 678+ The GNU General Public License does not permit incorporating your program
 679+into proprietary programs. If your program is a subroutine library, you
 680+may consider it more useful to permit linking proprietary applications with
 681+the library. If this is what you want to do, use the GNU Lesser General
 682+Public License instead of this License. But first, please read
 683+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file

Status & tagging log