diff options
author | Karl Berry <karl@freefriends.org> | 2011-01-02 19:40:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-01-02 19:40:13 +0000 |
commit | 14e63d2839a9294ddac0a976e33e8eabd87e0eba (patch) | |
tree | fe6ecfad4d045d10f8957d5c60d23fef9d7fc753 /Master | |
parent | c79ce65815b4156778a4122fa10b08ec7af14ac7 (diff) |
doc fixes
git-svn-id: svn://tug.org/texlive/trunk@20907 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 9fa7d699ed0..e1b607bc5de 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -350,19 +350,15 @@ sub main { $loadmediasrcerror = "Cannot load TeX Live database from "; - # # load the config file and set the config options - # load it BEFORE starting downloads as we seet persistent-downloads there! + # load it BEFORE starting downloads as we set persistent-downloads there! load_config_file(); - # - # set global variable if execute actions should be supressed + # set global variable if execute actions should be suppressed $::no_execute_actions = 1 if (defined($opts{'no-execute-actions'})); - # # if we are asked to use persistent connections try to start it here - # { my $do_persistent; if (defined($opts{'persistent-downloads'})) { @@ -3441,13 +3437,14 @@ sub action_generate { my $what = shift @ARGV; init_local_db(); - # we create fmtutil.cnf, language.dat, language.def in TEXMFSYSVAR - # and updmap.cfg in TEXMFSYSCONFIG. The reason is that calls to + # we create fmtutil.cnf, language.dat, language.def in TEXMFSYSVAR and + # updmap.cfg in TEXMFSYSCONFIG. The reason is that calls to # updmap-sys (as is done by the tlmgr update call when packages with - # maps are installed) will create the updmap.cfg file in TEXMFSYSCONFIG - # from the version in TEXMFSYSVAR. But after that the TEXMFSYSCONFIG - # takes precedence and the mechanism explained in updmap.cfg header - # does not work. + # maps are installed) will create the updmap.cfg file in + # TEXMFSYSCONFIG. It would start from the version in TEXMFSYSVAR, but + # after that the TEXMFSYSCONFIG takes precedence and thus the + # mechanism explained in updmap.cfg header would not work. We don't + # want that. So just use TEXMFSYSCONFIG from the start. # chomp (my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`); chomp (my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`); @@ -5712,8 +5709,8 @@ Executes one (or all) check(s) on the consistency of the installation. =item B<files> -Checks that all files listed in the TeX Live Database (C<texlive.tlpdb>) -are actually present, and lists those missing. +Checks that all files listed in the local TLPDB (C<texlive.tlpdb>) are +actually present, and lists those missing. =item B<depends> @@ -5897,7 +5894,7 @@ C<dvipdfmDownloadBase14>. The defaults for these as set in C<updmap-hdr.cfg> are usually fine. If you want to change them, you can include changed settings for any or all of these five options in your C<updmap-local.cfg> file and they will be respected by C<generate -updmap>, for example: +updmap>. For example: dvipsDownloadBase35 true @@ -5905,7 +5902,7 @@ Options: =over 4 -=item B<--dest> I<output file> +=item B<--dest> I<output_file> specifies the output file (defaults to the respective location in C<TEXMFSYSVAR> for C<language*> and C<fmtutil>, and C<TEXMFSYSCONFIG> @@ -5917,7 +5914,7 @@ and C<.dat.lua> to the name of the C<language.dat.lua> file. (This is just to avoid overwriting; if you want a specific name for each output file, we recommend invoking C<tlmgr> twice.) -=item B<--localcfg> I<local conf file> +=item B<--localcfg> I<local_conf_file> specifies the (optional) local additions (defaults to the respective location in C<TEXMFLOCAL>). @@ -5947,9 +5944,9 @@ The respective locations are as follows: web2c/updmap.cfg (and updmap-local.cfg). Final repetition: as explained above, C<tlmgr> does I<not> use -C<generate updmap> for map files. Therefore, if you want to make use of -C<updmap-local.cfg>, you need to run C<tlmgr generate updmap> yourself -after making any local changes. +C<generate updmap> for font map files. Therefore, if you want to make +use of C<updmap-local.cfg>, you must run C<tlmgr generate updmap> +yourself after making any local changes. =head1 CONFIGURATION FILE @@ -5966,9 +5963,10 @@ other lines must look like where the allowed keys are C<gui-expertmode> and C<persistent-downloads>. The values can only be 0 or 1 for those -settings. C<persistent-downloads> corresponds to the respective command -line options of C<tlmgr>. C<gui-expertmode> switches between the full -GUI and a simplified with only the important and mostly used settings. +settings. C<persistent-downloads> corresponds to the command line +option of the same name. C<gui-expertmode> switches between the full +GUI and a simplified GUI with only the important and mostly used +settings. =head1 TAXONOMIES |