From: Zooko O'Whielacronx Date: Fri, 19 Aug 2011 05:30:59 +0000 (-0700) Subject: docs: reflow the added text at the top of COPYING.GPL to fill-column 77 X-Git-Tag: pre-393~6 X-Git-Url: https://git.rkrishnan.org/uri?a=commitdiff_plain;h=f8386647f61f0d31209ab5a7933393ce0acd8a1e;p=tahoe-lafs%2Ftahoe-lafs.git docs: reflow the added text at the top of COPYING.GPL to fill-column 77 --- diff --git a/COPYING.GPL b/COPYING.GPL index e7ba12bd..030f7820 100644 --- a/COPYING.GPL +++ b/COPYING.GPL @@ -1,51 +1,46 @@ -This work also comes with the added permission that you may combine it -with a work licensed under the OpenSSL license (any version) and +This work also comes with the added permission that you may combine it with a +work licensed under the OpenSSL license (any version) and distribute the +resulting combined work, as long as you follow the requirements of the +licences of this work in regard to all of the the resulting combined work +aside from the work licensed under the OpenSSL license. + +This work also comes with the added permission that you may combine it with a +work licensed under the Eclipse Public Licence (any version) and distribute +the resulting combined work, as long as you follow the requirements of the +licences of this work in regard to all of the the resulting combined work +aside from the work licensed under the Eclipse Public Licence. + +This work also comes with the added permission that you may combine it with a +work licensed under the Q Public Licence (any version) and distribute the +resulting combined work, as long as you follow the requirements of the +licences of this work in regard to all of the the resulting combined work +aside from the work licensed under the Q Public Licence. + +This work also comes with the added permission that you may combine it with a +work licensed under the Apache Licence (any version) and distribute the +resulting combined work, as long as you follow the requirements of the +licences of this work in regard to all of the the resulting combined work +aside from the work licensed under the Apache Licence. + +This work also comes with the added permission that you may combine it with a +work licensed under the GNU Lesser General Public License (any version) and distribute the resulting combined work, as long as you follow the requirements of the licences of this work in regard to all of the the -resulting combined work aside from the work licensed under the OpenSSL -license. +resulting combined work aside from the work licensed under the GNU Lesser +General Public License. -This work also comes with the added permission that you may combine it -with a work licensed under the Eclipse Public Licence (any version) -and distribute the resulting combined work, as long as you follow the -requirements of the licences of this work in regard to all of the the -resulting combined work aside from the work licensed under the Eclipse -Public Licence. - -This work also comes with the added permission that you may combine it -with a work licensed under the Q Public Licence (any version) and -distribute the resulting combined work, as long as you follow the -requirements of the licences of this work in regard to all of the the -resulting combined work aside from the work licensed under the Q -Public Licence. +This work also comes with the added permission that you may combine it with a +work licensed under the Zope Public License (any version) and distribute the +resulting combined work, as long as you follow the requirements of the +licences of this work in regard to all of the the resulting combined work +aside from the work licensed under the Zope Public License. -This work also comes with the added permission that you may combine it -with a work licensed under the Apache Licence (any version) and -distribute the resulting combined work, as long as you follow the -requirements of the licences of this work in regard to all of the the -resulting combined work aside from the work licensed under the Apache -Licence. - -This work also comes with the added permission that you may combine it -with a work licensed under the GNU Lesser General Public License (any -version) and distribute the resulting combined work, as long as you -follow the requirements of the licences of this work in regard to all -of the the resulting combined work aside from the work licensed under -the GNU Lesser General Public License. - -This work also comes with the added permission that you may combine it -with a work licensed under the Zope Public License (any version) and +This work also comes with the added permission that you may combine it with a +work licensed under the Python Software Foundation License (any version) and distribute the resulting combined work, as long as you follow the requirements of the licences of this work in regard to all of the the -resulting combined work aside from the work licensed under the Zope -Public License. - -This work also comes with the added permission that you may combine it -with a work licensed under the Python Software Foundation License (any -version) and distribute the resulting combined work, as long as you -follow the requirements of the licences of this work in regard to all -of the the resulting combined work aside from the work licensed under -the Python Software Foundation License. +resulting combined work aside from the work licensed under the Python +Software Foundation License. GNU GENERAL PUBLIC LICENSE