summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/install-tl9
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl24
2 files changed, 14 insertions, 19 deletions
diff --git a/Master/install-tl b/Master/install-tl
index aa7c6c344aa..2f26fae262c 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1,8 +1,7 @@
#!/usr/bin/env perl
-
# $Id$
#
-# Copyright 2007 2008 Reinhard Kotucha, Norbert Preining
+# Copyright 2007, 2008 Reinhard Kotucha, Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -206,7 +205,7 @@ if ($#ARGV >= 0) {
if ($ARGV[0] =~ m/^gui$/i) {
$opt_gui = 1;
} else {
- die "No arguments to install-tl allowed. Try install-tl --help!";
+ die "$0: Extra arguments `@ARGV'; try --help if you need it.\n";
}
}
@@ -1284,10 +1283,6 @@ Print the detected arch-os combination and exit.
Starts the installer for portable use. See below for details.
-=item B<-d>, B<-dd>, B<-ddd>
-
-Debugging levels.
-
=item B<-q>, B<-qq>
B<-q> disables output to the terminal, while B<-qq> also disables output
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index c3951943205..35c51d7268a 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1511,20 +1511,20 @@ Do not ask for confirmation, remove immediately.
=item B<generate updmap>
-B<WARNING:> This action overwrites any user changes made in
-the respective files, by regenerating them from scratch.
+B<WARNING:> This action overwrites any manual changes made in
+the respective files: it recreates them from scratch.
This is especially questionable with updmap, because the result will be
-to disable all maps which have been manually installed (via C<updmap-sys
---enable>), e.g., for proprietary or local fonts. Be sure that's what
-you want to do.
-
-This action regenerates any of the three config files C<language.dat>,
-C<fmtutil.cnf>, and C<updmap.cfg> from the information present in the
-local TLPDB. If the files C<language-local.dat>, C<fmtutil-local.cnf>,
-or C<updmap-local.cfg> are present under C<TEXMFLOCAL> in the respective
-directories, their contents will be simply merged into the final files,
-with no error checking of any kind.
+to disable all maps which have been manually installed via C<updmap-sys
+--enable>, e.g., for proprietary or local fonts. Only the changes in
+the C<--localcfg> file mentioned below are incorporated.
+
+In more detail, this action regenerates any of the three config files
+C<language.dat>, C<fmtutil.cnf>, and C<updmap.cfg> from the information
+present in the local TLPDB. If the files C<language-local.dat>,
+C<fmtutil-local.cnf>, or C<updmap-local.cfg> are present under
+C<TEXMFLOCAL> in the respective directories, their contents will be
+simply merged into the final files, with no error checking of any kind.
Options: