updates for 2009

git-svn-id: svn://tug.org/texlive/trunk@15214 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 42 insertions, 51 deletions

diff --git a/Master/LICENSE.TL b/Master/LICENSE.TL
index ed3448f6cbe..137104c3760 100644
--- a/Master/LICENSE.TL
+++ b/Master/LICENSE.TL
@@ -37,8 +37,8 @@ are some general guidelines for doing this:
 package it contains, besides complying with any licensing requirements,
 you must prominently mention such changes in your modified distribution
 so that users do not take your work for ours, and know to contact you,
-not us, in case of questions or problems.  A new top-level
-README.<yourwork> file is a good place to describe the general situation.
+not us, in case of questions or problems.  A new top-level file
+README.<yourwork> is a good place to describe the general situation.
 
 - Especially (but not necessarily) if changes or additions are made, we
 recommend a clearly different title, such as "<your work> DVD, based on
@@ -46,11 +46,10 @@ TeX Live YYYY", where YYYY is the year of TeX Live you are using.  This
 credits both our work and yours.
 
 - You absolutely may *not* place your own copyright on the entire
-distribution, since it is not your work (as stated above, TeX Live is
-not created by any single person or entity).  Statements such as "all
-rights reserved" and "may not be reproduced" are especially
-reprehensible, since they are antithetical to the free software
-principles under which TeX Live is produced.
+distribution, since it is not your work.  Statements such as "all rights
+reserved" and "may not be reproduced" are especially reprehensible,
+since they are antithetical to the free software principles under which
+TeX Live is produced.
 
 - You may use any cover or media label designs that you wish.  Such
 packaging and marketing details are not covered by any TeX Live license.
@@ -67,10 +66,9 @@ Such information may be placed on the label of your media, your cover,
 and/or in accompanying text (for instance, in the acknowledgements
 section of a book).
 
-Finally, although it is again not at all a requirement, we'd like to
-invite any redistributors to make a donation to the project, whether
-cash or in-kind, for example via https://www.tug.org/donate/dev.html.
-Thanks.
+Finally, although it is again not a requirement, we'd like to invite any
+redistributors to make a donation to the project, whether cash or
+in-kind, for example via https://www.tug.org/donate/dev.html.  Thanks.
 
 
 If you have any questions or comments, *please* contact us.  In general,
@@ -90,38 +88,16 @@ 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 X Window System license, the modified BSD license,
-etc.  Furthermore, all sources must be available, including for
-documentation files.  Please see the url's below for more information.
+Public License, the modified BSD license, etc.  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
 
 ------------------------------------------------------------
-[*] Conflicts between FSF and Debian.
-
-The most notable instance of legal conflict between the FSF definition
-of "free software" and the Debian Free Software Guidelines is in regard
-to the GNU Free Documentation License when "invariant sections" (e.g.,
-Front-Cover Texts, Back-Cover Texts, or Invariant Sections) are
-included.  (FSF considers it free, of course, and Debian doesn't.) 
-
-The most common instance of such a license is in documentation for
-official GNU packages -- such as GNU Texinfo, which is included in TeX
-Live.  There may be other GFDL'd files with invariant sections as well;
-we have not exhaustively checked.
-
-For TeX Live, we decided to follow the FSF, rather than Debian.  So such
-documentation *is* included in the original TeX Live distribution.  (In
-repackagings of TL according to Debian rules, it is removed.)  We surely
-wish these two major organizations in the free software world could
-cooperate on a documentation license acceptable to both.
-
-If other specific conflicts are brought to our attention, we will note
-them here.
-
-------------------------------------------------------------
 TeX Live mailing list: texlive@tug.org
 TeX Live home page: http://www.tug.org/tex-live/
 
diff --git a/Master/readme-html.dir/readme.en.html b/Master/readme-html.dir/readme.en.html
index a8e73a5881a..654932dea64 100644
--- a/Master/readme-html.dir/readme.en.html
+++ b/Master/readme-html.dir/readme.en.html
@@ -5,7 +5,7 @@
 <h2>Welcome to TeX Live</h2>
 
 <p>The <strong>TeX Live</strong> software distribution offers a complete
-TeX system for a variety of Unix, Macintosh, Windows and other
+TeX system for a variety of GNU and Unix, Macintosh, Windows and other
 platforms. It encompasses programs for editing, typesetting, previewing
 and printing of TeX documents in many different languages, and a large
 collection of TeX macros and font libraries.
@@ -26,12 +26,12 @@ description of the top-level directories, and more.
 
 <p>English versions of the Guide are in the full distribution (for
 example, on the DVD) in the <a
-href="../texmf-doc/doc/english">texmf-doc/doc/english/</a> hierarchy, in
+href="../texmf/doc/texlive/texlive-en">texmf/doc/texlive/</a> hierarchy, in
 both <a
-href="../texmf-doc/doc/english/texlive-en/texlive-en.html">html</a> and
-<a href="../texmf-doc/doc/english/texlive-en/texlive-en.pdf">pdf</a>
+href="../texmf/doc/texlive/texlive-en/texlive-en.html">html</a> and
+<a href="../texmf/doc/texlive/texlive-en/texlive-en.pdf">pdf</a>
 formats. Translations to other languages are also available under <a
-href="../texmf-doc/doc/">texmf-doc/doc/*</a>.
+href="../texmf/doc/texlive/">texmf/doc/texlive</a>.
 
 <p>We also provide a list of <a href="../doc.html">links to the
 available PDF and HTML documentation</a> for the included packages and
@@ -48,19 +48,34 @@ see the <i>Release history</i> section at the end of the documentation.
 
 <h3>Installation</h3>
 
-<p>The installation script is now named <tt>install-tl</tt> (that's
-<tt>install-tl.bat</tt> on Windows), and it has both GUI (default on
-Windows) and text (default on everything else) operation modes.  You can
-force one or the other with the options <tt>-gui</tt> and
-<tt>-no-gui</tt>, respectively.
+<p>The installation script is named <tt>install-tl</tt>
+(<tt>install-tl.bat</tt> on Windows), and it has three operation modes:
 
-<p>Post-installation package updates and other configurations are now
+<dl>
+<dt><b>wizard</b></dt> (default on Windows) which asks a bare minimum of questions
+and installs everything.  Can be specified explicitly with 
+<tt>install-tl&nbsp;--gui=wizard</tt>.<p>
+
+<dt><b>text</b></dt> (default on everything else) which has full customizatio
+options.  Can be specified explicitly with
+<tt>install-tl&nbsp;--gui=text</tt>.<p>
+
+<dt><b>perltk</b></dt> which is a GUI for text; especially useful for knowledgeable
+Windows users who don't want the defaults.  Can be specified explicitly with
+<tt>install-tl&nbsp;--gui=text</tt>, or by running
+<tt>install-tl-advanced.bat</tt> on Windows.
+
+</dl>
+
+<p>Post-installation package updates and other configurations are
 performed with the <tt>tlmgr</tt> (TeX Live Package Manager) script,
 which likewise has both GUI and text modes.
 
-<p>You can give the command-line option <tt>--help</tt> to both
-<tt>install-tl</tt> and <tt>tlmgr</tt> for an overview.  See the
-documentation links above for (much) more information.
+<p>You can give the command-line option <tt>--help</tt> to both <a
+href="http://tug.org/texlive/install-tl.html">install-tl</a> and <a
+href="http://tug.org/texlive/tlmgr.html">tlmgr</a> for detailed
+information on both programs.  See the documentation links above for
+(much) more information.
 
 
 <h3>Links</h3>