summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-31 23:25:42 +0000
committerKarl Berry <karl@freefriends.org>2016-03-31 23:25:42 +0000
commit54de6a824e6d8b0b8f4d8c6b349f93f1c3ab984b (patch)
treea83145d8178074f7a9fc344f5b4a6569f797d6e5 /Master
parent34c1f6f7ba18c399071c8e7a305dbaf5ed63b603 (diff)
doc tweaks
git-svn-id: svn://tug.org/texlive/trunk@40203 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl41
1 files changed, 21 insertions, 20 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 54f8e778daa..f16680b64ca 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -7559,24 +7559,24 @@ creates configuration files in user tree
=head1 CONFIGURATION FILE FOR TLMGR
-There are two configuration files for C<tlmgr>: One is system wide
-in C<TEXMFSYSCONFIG/tlmgr/config>, and one user-specific in
-C<TEXMFCONFIG/tlmgr/config> (which is in the default setup
-C<~/.texliveYYYY/texmf-config/tlmgr/config> replacing
-C<YYYY> with the year of your TeX Live installation).
+There are two configuration files for C<tlmgr>: One is system-wide in
+C<TEXMFSYSCONFIG/tlmgr/config>, and the other is user-specific in
+C<TEXMFCONFIG/tlmgr/config> (in the default setup, that is
+C<~/.texliveYYYY/texmf-config/tlmgr/config>, where C<YYYY> is the
+release year of your TeX Live installation).
A small subset of the command line options can be set in these
-configuration file. In addition, the system-wide can contain a directive
-to restrict the number of allowed actions.
+configuration files. In addition, the system-wide file can contain a
+directive to restrict the number of allowed actions.
-In these config files, empty lines and lines starting with # are ignored. All
-other lines must look like
+In these config files, empty lines and lines starting with # are
+ignored. All other lines must look like
key = value
where the allowed keys are C<gui-expertmode> (value 0 or 1),
C<persistent-downloads> (value 0 or 1), C<auto-remove> (value 0 or 1),
-and C<gui-lang> (value like in the command line option).
+and C<gui-lang> (value as with the command-line option).
C<persistent-downloads>, C<gui-lang>, and C<auto-remove> correspond to
the respective command line options of the same name. C<gui-expertmode>
@@ -7584,11 +7584,12 @@ switches between the full GUI and a simplified GUI with only the
important and mostly used settings.
In addition, the system-wide config file can contain the key
-C<allowed-actions>. The value is a comma separated list of actions that
-are allowed to be executed when C<tlmgr> is called in system mode (that is
-without C<--usermode>). This allows distributors to include the C<tlmgr>
-in the packaging but allow only for a very restricted set of actions not
-to interfere with package managers.
+C<allowed-actions>. The value is a comma-separated list of actions that
+are allowed to be executed when C<tlmgr> is called in system mode (that
+is, without C<--usermode>). This allows distributors to include the
+C<tlmgr> in their packaging, but allow only a restricted set of actions
+that do not interfere with the distro package managers. (For native TeX
+Live installations, it doesn't make sense to set this.)
=head1 MULTIPLE REPOSITORIES
@@ -7602,11 +7603,11 @@ The simplest and most reliable method is to temporarily set the
installation source to any repository (with the C<-repository> or
C<option repository> command line options), and perform your operations.
-When you are using multiple repositories over a sustained time, however,
-explicitly switching between them becomes inconvenient. Thus, it's
-possible to tell C<tlmgr> about additional repositories you want to use.
-The basic command is C<tlmgr repository add>. The rest of this section
-explains further.
+When you are using multiple repositories over a sustained length of
+time, however, explicitly switching between them becomes inconvenient.
+Thus, it's possible to tell C<tlmgr> about additional repositories you
+want to use. The basic command is C<tlmgr repository add>. The rest of
+this section explains further.
When using multiple repositories, one of them has to be set as the main
repository, which distributes most of the installed packages. When you