install-tl gui changes for 2019

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

3 files changed, 48 insertions, 64 deletions

diff --git a/Master/readme-html.dir/readme.en.html b/Master/readme-html.dir/readme.en.html
index af738dab34a..c7b44c7aa81 100644
--- a/Master/readme-html.dir/readme.en.html
+++ b/Master/readme-html.dir/readme.en.html
@@ -41,7 +41,7 @@ programs.
 
 <p>If you are installing from the Internet, the above links won't work.
 In that case, you can view the <a
-href="http://tug.org/texlive/doc.html">TeX Live documentation on the
+href="https://tug.org/texlive/doc.html">TeX Live documentation on the
 Internet</a>.
 
 <p>For a list of the most important changes in this year's release,
@@ -51,32 +51,26 @@ see the <i>Release history</i> section at the end of the documentation.
 <h3>Installation</h3>
 
 <p>The installation script is named <tt>install-tl</tt>
-(<tt>install-tl-windows.bat</tt> on Windows), and it has three operation
+(<tt>install-tl-windows.bat</tt> on Windows), and it has two operation
 modes:
 
 <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>-gui</b></dt> (default on Windows and Macs) which does a simple
+installation by default, using a graphical interface, but allows for
+advanced options if desired.<p>  
 
-<dt><b>text</b></dt> (default on everything else) which has full customization
-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=perltk</tt>, or by
-running <tt>install-tl-advanced.bat</tt> on Windows.
+<dt><b>-no-gui</b></dt> (default on everything else) which provides for
+all available options, using a simplistic text interface.<p>
 
 </dl>
 
 <p>Post-installation package updates and other configurations are
-performed with the <tt>tlmgr</tt> (TeX Live Package Manager) script,
+performed with the <tt>tlmgr</tt> (TeX Live Package Manager) program,
 which likewise has both GUI and text modes.
 
 <p>You can give the command-line option <tt>--help</tt> to both <a
-href="http://tug.org/texlive/doc/install-tl.html">install-tl</a> and <a
-href="http://tug.org/texlive/tlmgr.html">tlmgr</a> for detailed
+href="https://tug.org/texlive/doc/install-tl.html">install-tl</a> and <a
+href="https://tug.org/texlive/tlmgr.html">tlmgr</a> for detailed
 information on both programs.  See the documentation links above for
 (much) more information.
 
@@ -87,15 +81,15 @@ information on both programs.  See the documentation links above for
 included in TeX Live:
 
 <p><ul>
-<li><a href="http://tug.org/begin.html">http://tug.org/begin.html</a>
+<li><a href="https://tug.org/begin.html">tug.org/begin.html</a>
     - if you are new to TeX and/or want introductory material.
-<li><a href="http://tug.org/interest.html">http://tug.org/interest.html</a>
+<li><a href="https://tug.org/interest.html">tug.org/interest.html</a>
     - general list of TeX web resources, including documentation,
       systems, packages, fonts, and more.
-<li><a href="http://tug.org/ctan.html">http://tug.org/ctan.html</a>
+<li><a href="https://tug.org/ctan.html">tug.org/ctan.html</a>
     - one entry point into the Comprehensive TeX Archive Network (CTAN),
       which is an online repository of all things TeX.
-<li><a href="http://tug.org/usergroups.html">http://tug.org/usergroups.html</a>
+<li><a href="https://tug.org/usergroups.html">tug.org/usergroups.html</a>
     - list of TeX user groups around the world, with contact
       information.  We strongly encourage you to join the user group of
       your choice, to support TeX Live and other TeX activities.
@@ -103,5 +97,5 @@ included in TeX Live:
 
 <h4>Happy TeXing!</h4>
 
-<hr><small><a href="http://tug.org/texlive/">TeX Live home page.</a></small>
+<hr><small><a href="https://tug.org/texlive/">TeX Live home page.</a></small>
 </body></html>
diff --git a/Master/readme-txt.dir/README.EN b/Master/readme-txt.dir/README.EN
index 843bb9a97b0..9dea277ac9b 100644
--- a/Master/readme-txt.dir/README.EN
+++ b/Master/readme-txt.dir/README.EN
@@ -1,14 +1,13 @@
-
 Welcome to TeX Live
 
    The TeX Live software distribution offers a complete 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.
+   of TeX documents in many different languages, and a large collection of
+   TeX macros and font libraries.
 
-   The distribution includes extensive general documentation about TeX,
-   as well as the documentation for the included software packages.
+   The distribution includes extensive general documentation about TeX, as
+   well as the documentation for the included software packages.
 
    For licensing information, please see the top-level [1]LICENSE.TL and
    [2]LICENSE.CTAN text files.
@@ -30,9 +29,8 @@ Welcome to TeX Live
    We also provide a list of [8]links to the available PDF and HTML
    documentation for the included packages and programs.
 
-   If you are installing from the Internet, the above links won't work.
-   In that case, you can view the [9]TeX Live documentation on the
-   Internet.
+   If you are installing from the Internet, the above links won't work. In
+   that case, you can view the [9]TeX Live documentation on the Internet.
 
    For a list of the most important changes in this year's release, see
    the Release history section at the end of the documentation.
@@ -40,23 +38,17 @@ Welcome to TeX Live
   Installation
 
    The installation script is named install-tl (install-tl-windows.bat on
-   Windows), and it has three operation modes:
-
-   wizard (default on Windows) which asks a bare minimum of questions and
-          installs everything. Can be specified explicitly with
-          install-tl --gui=wizard.
+   Windows), and it has two operation modes:
 
-   text (default on everything else) which has full customization
-          options. Can be specified explicitly with
-          install-tl --gui=text.
+   -gui (default on Windows and Macs) which does a simple installation by
+          default, using a graphical interface, but allows for advanced
+          options if desired.
 
-   perltk which is a GUI for text; especially useful for knowledgeable
-          Windows users who don't want the defaults. Can be specified
-          explicitly with install-tl --gui=perltk, or by running
-          install-tl-advanced.bat on Windows.
+   -no-gui (default on everything else) which provides for all available
+          options, using a simplistic text interface.
 
    Post-installation package updates and other configurations are
-   performed with the tlmgr (TeX Live Package Manager) script, which
+   performed with the tlmgr (TeX Live Package Manager) program, which
    likewise has both GUI and text modes.
 
    You can give the command-line option --help to both [10]install-tl and
@@ -68,21 +60,20 @@ Welcome to TeX Live
    Finally, a few related web pages, for your reference. These are not
    included in TeX Live:
 
-     * [12]http://tug.org/begin.html - if you are new to TeX and/or want
+     * [12]tug.org/begin.html - if you are new to TeX and/or want
        introductory material.
-     * [13]http://tug.org/interest.html - general list of TeX web
-       resources, including documentation, systems, packages, fonts, and
-       more.
-     * [14]http://tug.org/ctan.html - one entry point into the
-       Comprehensive TeX Archive Network (CTAN), which is an online
-       repository of all things TeX.
-     * [15]http://tug.org/usergroups.html - list of TeX user groups
-       around the world, with contact information. We strongly encourage
-       you to join the user group of your choice, to support TeX Live and
-       other TeX activities.
+     * [13]tug.org/interest.html - general list of TeX web resources,
+       including documentation, systems, packages, fonts, and more.
+     * [14]tug.org/ctan.html - one entry point into the Comprehensive TeX
+       Archive Network (CTAN), which is an online repository of all things
+       TeX.
+     * [15]tug.org/usergroups.html - list of TeX user groups around the
+       world, with contact information. We strongly encourage you to join
+       the user group of your choice, to support TeX Live and other TeX
+       activities.
 
     Happy TeXing!
-     _________________________________________________________________
+     __________________________________________________________________
 
    [16]TeX Live home page.
 
@@ -96,11 +87,11 @@ References
    6. file:../texmf-dist/doc/texlive/texlive-en/texlive-en.pdf
    7. file:../texmf-dist/doc/texlive/
    8. file:../doc.html
-   9. http://tug.org/texlive/doc.html
-  10. http://tug.org/texlive/doc/install-tl.html
-  11. http://tug.org/texlive/tlmgr.html
-  12. http://tug.org/begin.html
-  13. http://tug.org/interest.html
-  14. http://tug.org/ctan.html
-  15. http://tug.org/usergroups.html
-  16. http://tug.org/texlive/
+   9. https://tug.org/texlive/doc.html
+  10. https://tug.org/texlive/doc/install-tl.html
+  11. https://tug.org/texlive/tlmgr.html
+  12. https://tug.org/begin.html
+  13. https://tug.org/interest.html
+  14. https://tug.org/ctan.html
+  15. https://tug.org/usergroups.html
+  16. https://tug.org/texlive/
diff --git a/Master/tlpkg/bin/htmltext b/Master/tlpkg/bin/htmltext
index 99daca0ab37..b0391dab156 100755
--- a/Master/tlpkg/bin/htmltext
+++ b/Master/tlpkg/bin/htmltext
@@ -19,6 +19,5 @@ for url in "$@"; do
   # Since the reference list is useful, we fix it up by hand instead of
   # using -nolist.
   lynx -dump -nocolor -hiddenlinks=ignore "$url" \
-  | sed -e 's,file://localhost/home/texlive/karl/Master/,file:../,' \
-        -e 's,file://localhost/home/texlive/karl/,file:../../,'
+  | sed -e 's,file://localhost/tmp/,file:../,'
 done