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

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

2 files changed, 16 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1
index bbd86359942..44d27d23ef2 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-16" "perl v5.22.1" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2016-04-21" "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,11 +1221,11 @@ 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 (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.
+If a working GnuPG binary (\f(CW\*(C`gpg\*(C'\fR) is found (see below for the search
+method), by default verification of downloaded files is performed. This
+can be suppressed 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
+(described in another section below).
 .PP
 Verification is performed as follows: For each \f(CW\*(C`texlive.tlpdb\*(C'\fR loaded
 for a repository, the respective checksum \f(CW\*(C`texlive.tlpdb.sha512\*(C'\fR is
@@ -1233,21 +1233,22 @@ always downloaded, too, and \f(CW\*(C`tlmgr\*(C'\fR confirms whether the checksu
 of the download tlpdb file agrees with the download data. This is done
 in any case.
 .PP
-If cryptographic verification is done, then a signature of the checksum
-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.
+If cryptographic verification is also requested, then a signature of the
+checksum 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.
+Further adaptation of the \f(CW\*(C`gpg\*(C'\fR invocation can be made using the two
+enviroment variables \f(CW\*(C`TL_GNUPGHOME\*(C'\fR, which is passed to \f(CW\*(C`gpg\*(C'\fR as the
+value for \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 95a8b8fee0d..52b52854a6d 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf