summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-06-05 15:38:08 +0000
committerKarl Berry <karl@freefriends.org>2011-06-05 15:38:08 +0000
commit84da5f35efc41c8083afb30fe35da60a1e7c2e74 (patch)
tree78461c2b3bc84855e074f141d9f8d726df190d38
parent7119bd52ab07be8c76bca9da6e3d2a552ad89328 (diff)
remove reference to footnote since I removed the
footnote earlier (noticed by mpg); other small wording changes. git-svn-id: svn://tug.org/texlive/trunk@22793 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/LICENSE.TL21
1 files changed, 11 insertions, 10 deletions
diff --git a/Master/LICENSE.TL b/Master/LICENSE.TL
index 137104c3760..051512e8406 100644
--- a/Master/LICENSE.TL
+++ b/Master/LICENSE.TL
@@ -6,12 +6,12 @@ To the best of our knowledge, all software in the TeX Live distribution
is freely redistributable (libre, that is, not necessarily gratis),
within the Free Software Foundation's definition and the Debian Free
Software Guidelines. Where the two conflict, we generally follow the
-FSF (see [*] below). If you find any non-free files included, please
-contact us (references given at the end).
+FSF. If you find any non-free files included, please contact us
+(references given at the end).
That said, TeX Live has neither a single copyright holder nor a single
license covering its entire contents, since it is a collection of many
-disparate packages. Therefore, you may copy, modify, and/or
+independent packages. Therefore, you may copy, modify, and/or
redistribute software from TeX Live only if you comply with the
requirements placed thereon by the owners of the respective packages.
@@ -58,9 +58,9 @@ packaging and marketing details are not covered by any TeX Live license.
a) Acknowledging that TeX Live is developed as a joint effort by all TeX
user groups, and encouraging the user/reader to join their user group
- of choice, as listed on the web page http://www.tug.org/usergroups.html.
+ of choice, as listed on the web page http://tug.org/usergroups.html.
-b) Referencing the TeX Live home page: http://www.tug.org/texlive/
+b) Referencing the TeX Live home page: http://tug.org/texlive/
Such information may be placed on the label of your media, your cover,
and/or in accompanying text (for instance, in the acknowledgements
@@ -88,18 +88,19 @@ LICENSING FOR NEW PACKAGES:
Finally, we are often asked what license to use for new work. To be
considered for inclusion on TeX Live, a package must use a free software
license, such as the LaTeX Project Public License, the GNU General
-Public License, the modified BSD license, etc. Furthermore, all sources
-must be available, including for documentation files. Please see
+Public License, the modified BSD license, etc. (Please use an existing
+license instead of making up your own.) Furthermore, all sources must
+be available, including for documentation files. Please see
http://tug.org/texlive/pkgcontrib.html for more information, and other
considerations.
Thanks for your interest in TeX.
-- Karl Berry, editor, for the TeX Live team
+- Karl Berry, for the TeX Live project
------------------------------------------------------------
-TeX Live mailing list: texlive@tug.org
-TeX Live home page: http://www.tug.org/tex-live/
+TeX Live mailing list: http://lists.tug.org/tex-live
+TeX Live home page: http://tug.org/tex-live/
The FSF's free software definition: http://www.gnu.org/philosophy/free-sw.html
Debian Free Software Guidelines: http://www.debian.org/intro/free