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

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

2 files changed, 13 insertions, 2 deletions

diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1
index f59519c442f..bbd86359942 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-04-12" "perl v5.22.1" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2016-04-16" "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
@@ -1221,7 +1221,8 @@ on each run \f(CW\*(C`mirror.ctan.org\*(C'\fR might resolve to a new host, resul
 a different hash), it's harmless to delete them.
 .SH "CRYPTOGRAPHIC VERIFICATION"
 .IX Header "CRYPTOGRAPHIC VERIFICATION"
-If a working GnuPG binary (\f(CW\*(C`gpg\*(C'\fR) is found, by default verification of
+If a working GnuPG binary (\f(CW\*(C`gpg\*(C'\fR) is found (see below for how it is 
+searched), by default verification of
 downloaded files is performed. This can be supressed by specifying
 \&\f(CW\*(C`\-\-no\-verify\-downloads\*(C'\fR on the command line, or adding an entry
 \&\f(CW\*(C`verify\-downloads = 0\*(C'\fR to a tlmgr config file.
@@ -1237,6 +1238,16 @@ file is downloaded and the signature verified. The signature is done with
 the TeX Live Distribution \s-1GPG\s0 key 0x06BAB6BC, which in turn is signed
 by Karl Berry's key 0x9DEB46C0 and Norbert Preining's key 0x6CACA448.
 All of these keys are obtainable from the standard key servers.
+.SS "Configuration of GnuPG invocation"
+.IX Subsection "Configuration of GnuPG invocation"
+The executable used for GnuPG is searched as follows: If the environment
+variable \f(CW\*(C`TL_GNUPG\*(C'\fR is set, it is tested and used. Otherwise \f(CW\*(C`gpg\*(C'\fR is
+checked, and finally \f(CW\*(C`gpg2\*(C'\fR.
+.PP
+Further adaption of the invocation of \f(CW\*(C`gpg\*(C'\fR can be done using the 
+two enviroment variables \f(CW\*(C`TL_GNUPGHOME\*(C'\fR, which is passed to
+\&\f(CW\*(C`gpg\*(C'\fR with \f(CW\*(C`\-\-homedir\*(C'\fR, and \f(CW\*(C`TL_GNUPGARGS\*(C'\fR, which replaces the
+default arguments \f(CW\*(C`\-\-no\-secmem\-warning \-\-no\-permission\-warning\*(C'\fR.
 .SH "USER MODE"
 .IX Header "USER MODE"
 \&\f(CW\*(C`tlmgr\*(C'\fR provides a restricted way, called ``user mode'', to manage
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
index 557bd2d6bef..95a8b8fee0d 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf