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

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

2 files changed, 13 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1
index edcbad30c28..537f424faac 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 "2014-05-06" "perl v5.18.2" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2014-05-10" "perl v5.18.2" "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
@@ -376,22 +376,28 @@ Options:
 .IX Item "--use-svn"
 Use the output of \f(CW\*(C`svn status\*(C'\fR instead of listing the files; for
 checking the \s-1TL\s0 development repository.
-.SS "conf [texmf|tlmgr [\fIkey\fP [\fIvalue\fP]]]"
-.IX Subsection "conf [texmf|tlmgr [key [value]]]"
+.SS "conf [texmf|tlmgr|updmap [\-\-conffile \fIfile\fP] [\-\-delete] [\fIkey\fP [\fIvalue\fP]]]"
+.IX Subsection "conf [texmf|tlmgr|updmap [--conffile file] [--delete] [key [value]]]"
 With only \f(CW\*(C`conf\*(C'\fR, show general configuration information for TeX Live,
 including active configuration files, path settings, and more.  This is
 like the \f(CW\*(C`texconfig conf\*(C'\fR call, but works on all supported platforms.
 .PP
-With either \f(CW\*(C`conf texmf\*(C'\fR or \f(CW\*(C`conf tlmgr\*(C'\fR given in addition, shows all
-key/value pairs (i.e., all settings) as saved in \f(CW\*(C`ROOT/texmf.cnf\*(C'\fR or
-the tlmgr configuration file (see below), respectively.
+With either \f(CW\*(C`conf texmf\*(C'\fR, \f(CW\*(C`conf tlmgr\*(C'\fR, or \f(CW\*(C`conf updmap\*(C'\fR given in 
+addition, shows all key/value pairs (i.e., all settings) as saved in 
+\&\f(CW\*(C`ROOT/texmf.cnf\*(C'\fR, the tlmgr configuration file (see below), or the first
+found \f(CW\*(C`updmap.cfg\*(C'\fR file (via kpsewhich), respectively.
 .PP
 If \fIkey\fR is given in addition, shows the value of only that given
-\&\fIkey\fR in the respective file.
+\&\fIkey\fR in the respective file. In case the option \fI\-\-delete\fR is given,
+the respective setting (key value pair) will be removed from the 
+configuration file (note, it is removed, not commented!).
 .PP
 If \fIvalue\fR is given in addition, \fIkey\fR is set to \fIvalue\fR in the 
 respective file.  \fINo error checking is done!\fR
 .PP
+In all cases the used config file can be selected via the option
+\&\f(CW\*(C`\-\-conffile \f(CIfile\f(CW\*(C'\fR, in case one wants to edit a different file.
+.PP
 Practical application: if the execution of (some or all) system commands
 via \f(CW\*(C`\ewrite18\*(C'\fR was left enabled during installation, you can disable
 it afterwards:
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
index 62ba573def4..e4ad7797c75 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf