summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-04-05 22:43:08 +0000
committerKarl Berry <karl@freefriends.org>2019-04-05 22:43:08 +0000
commit317e397de1292f6565520e1ec532b2a7ad7bb009 (patch)
tree12c4156d18e49c461ce529cea80d4a1b9a62d9d4
parentcdeb40993c38d8ac74ff316d5b73c33b4dd5f9dc (diff)
doc
git-svn-id: svn://tug.org/texlive/trunk@50796 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl28
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl12
2 files changed, 21 insertions, 19 deletions
diff --git a/Master/install-tl b/Master/install-tl
index c11f28c028c..abe4ca265f7 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -2710,10 +2710,10 @@ C<-no-gui> option.
=item C<tcl>
-The tcl user interface (default on Mac OS and Windows). It starts
-out with a small number of configuration options, roughly equivalent
+The Tcl/Tk user interface (default on Macs and Windows). It starts
+with a small number of configuration options, roughly equivalent
to what the wizard option below offers, but a button C<Advanced>
-takes you to a screen with roughly the same options as the perltk
+takes you to a screen with roughly the same options as the C<perltk>
interface.
=item C<wizard>
@@ -2738,20 +2738,20 @@ available, installation continues in text mode, except on Windows,
where all gui options except C<text> are diverted to the default
C<tcl> GUI.
-The C<tcl> GUI requires Tcl/Tk. This is part of Mac OS and is often
-already installed on Linux. For Windows, TeX Live provides a Tcl/Tk
+The C<tcl> GUI requires Tcl/Tk. This is standard on Macs and is often
+already installed on GNU/Linux. For Windows, TeX Live provides a Tcl/Tk
runtime.
=item B<-no-gui>
-Use the text mode installer (default except on Windows and Mac OS).
+Use the text mode installer (default except on Windows and Macs).
=for comment Keep language list in sync with tlmgr.
=item B<-lang> I<llcode>
By default, the GUI tries to deduce your language from the
-environment. The tcl GUI uses the language detection built into
+environment. The Tcl GUI uses the language detection built into
Tcl/Tk; the Perl/Tk GUIs use the C<LC_MESSAGES> environment
variable. If that fails you can select a different language by
giving this option with a language code (based on ISO 639-1).
@@ -2782,12 +2782,12 @@ will be adjusted accordingly.
=item B<-select-repository>
-This option allows you to choose a particular mirror from the
-current list of active CTAN mirrors. This option is supported in the
-text, wizard and perltk installer modes, and will also offer to
-install from local media if available, or from a repository
-specified on the command line. It's useful when the (default)
-automatic redirection does not choose a good host for you.
+This option allows you to choose a particular mirror from the current
+list of active CTAN mirrors. This option is supported in the C<text>,
+C<wizard> and C<perltk> installer modes, and will also offer to install
+from local media if available, or from a repository specified on the
+command line. It's useful when the (default) automatic redirection does
+not choose a good host for you.
=item B<-all-options>
@@ -2814,7 +2814,7 @@ building TeX Live, see L<https://tug.org/texlive/build.html>.
=item B<-debug-translation>
-In the Perl/Tk GUI modes, this options reports any missing, or more
+In the Perl/Tk GUI modes, this option reports any missing, or more
likely untranslated, messages to standard error. Helpful for
translators to see what remains to be done.
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index fcd92f3c224..eed8e75f1a3 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -2520,7 +2520,7 @@ sub auto_remove_install_force_packages {
#
# for some packages (texworks, psview, ...) we only have w32 packages
# in the repository, but it is possible that alternative repositories
- # ship binaries for some platforms (like texworks for linux on tlcontrib)
+ # ship binaries for some platforms (like texworks for GNU/Linux on tlcontrib)
# currently updating from tlnet will remove these alternative .ARCH
# packages because they are not listed anywhere locally, so they
# are considered as disappearing.
@@ -9292,11 +9292,13 @@ L<https://search.cpan.org/search?query=perl%2Ftk>. For Unix-based
systems Perl/Tk (as well as Perl of course) has to be installed
outside of TL. L<https://tug.org/texlive/distro.html#perltk> has a
list of invocations for some distros. For Windows the necessary
-modules are no longer shipped within TeX Live.
+modules are no longer shipped within TeX Live, so you'll have to have an
+external Perl available that includes them.
-We are talking here about the GUI built into tlmgr itself, not about
-the other tlmgr GUIs: tlshell, tlcockpit (Java-based) and, for Mac
-OS only, TeX Live Utility. These are invoked as separate programs.
+We are talking here about the GUI built into tlmgr itself, not about the
+other tlmgr GUIs, which are: tlshell (Tcl/Tk-based), tlcockpit
+(Java-based) and, only on Macs, TeX Live Utility. These are invoked as
+separate programs.
The GUI mode of tlmgr is started with the invocation C<tlmgr gui>;
assuming Tk is loadable, the graphical user interface will be shown.