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

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

4 files changed, 46 insertions, 2 deletions

diff --git a/Master/texmf/doc/man/man1/install-tl.1 b/Master/texmf/doc/man/man1/install-tl.1
index 27a9736989f..c07a46b0c56 100644
--- a/Master/texmf/doc/man/man1/install-tl.1
+++ b/Master/texmf/doc/man/man1/install-tl.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "INSTALL-TL 1"
-.TH INSTALL-TL 1 "2010-03-14" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH INSTALL-TL 1 "2010-05-23" "perl v5.10.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
@@ -333,6 +333,12 @@ This option is turned on by default, and the installation program will
 fall back to using wget if this is not possible. If you want to disable 
 usage of \s-1LWP\s0 and persistent connections, please use
 \&\fB\-\-no\-persistent\-downloads\fR.
+.IP "\fB\-allow\-ftp\fR" 4
+.IX Item "-allow-ftp"
+By default if mirror.ctan.org is contacted only http mirrors are accepted.
+Adding this command line switch allows ftp mirrors of the \s-1CTAN\s0 nodes.
+.Sp
+If you set a ftp mirror explicitely, that one is in any case used.
 .IP "\fB\-debug\-translation\fR" 4
 .IX Item "-debug-translation"
 In \s-1GUI\s0 mode, this switch makes \f(CW\*(C`tlmgr\*(C'\fR report any missing, or more
diff --git a/Master/texmf/doc/man/man1/install-tl.man1.pdf b/Master/texmf/doc/man/man1/install-tl.man1.pdf
index 3d6458d050b..ffca143c309 100644
--- a/Master/texmf/doc/man/man1/install-tl.man1.pdf
+++ b/Master/texmf/doc/man/man1/install-tl.man1.pdf
diff --git a/Master/texmf/doc/man/man1/tlmgr.1 b/Master/texmf/doc/man/man1/tlmgr.1
index 46243c38cd2..11898312245 100644
--- a/Master/texmf/doc/man/man1/tlmgr.1
+++ b/Master/texmf/doc/man/man1/tlmgr.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TLMGR 1"
-.TH TLMGR 1 "2010-05-21" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2010-05-23" "perl v5.10.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
@@ -256,6 +256,15 @@ This option is turned on by default, and tlmgr will
 fall back to using wget if this is not possible. If you want to disable 
 usage of \s-1LWP\s0 and persistent connections, please use
 \&\fB\-\-no\-persistent\-downloads\fR.
+.IP "\fB\-allow\-ftp\fR" 4
+.IX Item "-allow-ftp"
+By default if mirror.ctan.org is contacted only http mirrors are accepted.
+Adding this command line switch allows ftp mirrors of the \s-1CTAN\s0 nodes.
+.Sp
+If you set a ftp mirror explicitely, that one is in any case used.
+.Sp
+You can permanently turn this option on in the tlmgr config file, see
+\&\*(L"\s-1CONFIGURATION\s0 \s-1FILE\s0\*(R" below for details.
 .IP "\fB\-\-debug\-translation\fR" 4
 .IX Item "--debug-translation"
 In \s-1GUI\s0 mode, this switch makes \f(CW\*(C`tlmgr\*(C'\fR report any missing, or more
@@ -960,6 +969,29 @@ equivalent of \f(CW\*(C`generate updmap\*(C'\fR for map files.  Therefore, if yo
 to make use of \f(CW\*(C`updmap\-local.cfg\*(C'\fR, you need to run \f(CW\*(C`tlmgr generate
 updmap\*(C'\fR yourself.  After that, network updates and your local changes
 should be merged.
+.SH "CONFIGURATION FILE"
+.IX Header "CONFIGURATION FILE"
+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`TEXMFVAR/tlmgr/config\*(C'\fR. Note
+that it is \fBnot\fR \f(CW\*(C`TEXMFSYSVAR\*(C'\fR so the file is specific to a single
+user. By default thus the config file is in \f(CW\*(C`~/.texlive2010/tlmgr/config\*(C'\fR.
+.PP
+Format of this file is: empty lines and lines starting with # are ignored.
+All other lines must look like
+.PP
+.Vb 1
+\&  key = value
+.Ve
+.PP
+where the allowed keys are \f(CW\*(C`gui_expertmode\*(C'\fR, \f(CW\*(C`persistent\-downloads\*(C'\fR, and
+\&\f(CW\*(C`allow\-ftp\*(C'\fR. The values can only be 0 or 1 for those settings.
+\&\f(CW\*(C`persistent\-downloads\*(C'\fR and \f(CW\*(C`allow\-ftp\*(C'\fR correspond to the respective
+command line options of \f(CW\*(C`tlmgr\*(C'\fR. \f(CW\*(C`gui_expertmode\*(C'\fR switches between
+the full \s-1GUI\s0 and a simplified with only the important and mostly used
+settings.
+.PP
+Warning: If you switch your gui expert mode settings within the \s-1GUI\s0 itself,
+all comments written in the config file will be discarded.
 .SH "GUI"
 .IX Header "GUI"
 The graphical user interface for \f(CW\*(C`tlmgr\*(C'\fR needs Perl/TK being installed.
@@ -992,6 +1024,12 @@ options), \fIPaper\fR (configuration of default paper sizes),
 \&\fIArchitectures\fR (only on Unix, configuration of the supported/installed
 architectures), as well as some toggles to turn on and off various
 options.
+.Sp
+There is also a toggle for \f(CW\*(C`Expert options\*(C'\fR which defaults to on. If
+you turn this off the next time you start the \s-1GUI\s0 a simplified screen
+will be shown that exhibits only the most important and necessary 
+functionality. This setting is saved in the configuration file of
+\&\f(CW\*(C`tlmgr\*(C'\fR, see \*(L"\s-1CONFIGURATION\s0 \s-1FILE\s0\*(R" for details.
 .IP "\fBActions\fR" 4
 .IX Item "Actions"
 Provides access to a variety of items, such as updating the filename
diff --git a/Master/texmf/doc/man/man1/tlmgr.man1.pdf b/Master/texmf/doc/man/man1/tlmgr.man1.pdf
index 99fb87cc9e5..803e236900b 100644
--- a/Master/texmf/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf/doc/man/man1/tlmgr.man1.pdf