/home/texlive/karl/Master/tlpkg/bin/tl-update-auto

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

2 files changed, 18 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1
index a3aa2cc80c4..515b3617e81 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.1
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TLMGR 1"
-.TH TLMGR 1 "2016-02-18" "perl v5.22.1" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2016-03-31" "perl v5.22.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -1283,13 +1283,17 @@ configuration files and/or \f(CW\*(C`texlive.tlpdb\*(C'\fR.
 creates configuration files in user tree
 .SH "CONFIGURATION FILE FOR TLMGR"
 .IX Header "CONFIGURATION FILE FOR TLMGR"
-A small subset of the command line options can be set in a config file
-for \f(CW\*(C`tlmgr\*(C'\fR which resides in \f(CW\*(C`TEXMFCONFIG/tlmgr/config\*(C'\fR.  By default, the
-config file is in \f(CW\*(C`~/.texliveYYYY/texmf\-config/tlmgr/config\*(C'\fR (replacing
-\&\f(CW\*(C`YYYY\*(C'\fR with the year of your TeX Live installation). This is \fInot\fR
-\&\f(CW\*(C`TEXMFSYSVAR\*(C'\fR, so that the file is specific to a single user.
+There are two configuration files for \f(CW\*(C`tlmgr\*(C'\fR: One is system wide
+in \f(CW\*(C`TEXMFSYSCONFIG/tlmgr/config\*(C'\fR, and one user-specific in
+\&\f(CW\*(C`TEXMFCONFIG/tlmgr/config\*(C'\fR (which is in the default setup
+\&\f(CW\*(C`~/.texliveYYYY/texmf\-config/tlmgr/config\*(C'\fR replacing
+\&\f(CW\*(C`YYYY\*(C'\fR with the year of your TeX Live installation).
 .PP
-In this file, empty lines and lines starting with # are ignored.  All
+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.
+.PP
+In these config files, empty lines and lines starting with # are ignored.  All
 other lines must look like
 .PP
 .Vb 1
@@ -1304,6 +1308,13 @@ and \f(CW\*(C`gui\-lang\*(C'\fR (value like in the command line option).
 the respective command line options of the same name.  \f(CW\*(C`gui\-expertmode\*(C'\fR
 switches between the full \s-1GUI\s0 and a simplified \s-1GUI\s0 with only the
 important and mostly used settings.
+.PP
+In addition, the system-wide config file can contain the key
+\&\f(CW\*(C`allowed\-actions\*(C'\fR. The value is a comma separated list of actions that
+are allowed to be executed when \f(CW\*(C`tlmgr\*(C'\fR is called in system mode (that is
+without \f(CW\*(C`\-\-usermode\*(C'\fR). This allows distributors to include the \f(CW\*(C`tlmgr\*(C'\fR
+in the packaging but allow only for a very restricted set of actions not
+to interfere with package managers.
 .SH "MULTIPLE REPOSITORIES"
 .IX Header "MULTIPLE REPOSITORIES"
 The main TeX Live repository contains a vast array of packages.
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
index 76ef8e983aa..487e2c16ccb 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf