4 files changed, 38 insertions, 5 deletions
diff --git a/Master/texmf-dist/doc/man/man1/install-tl.1 b/Master/texmf-dist/doc/man/man1/install-tl.1
index adabdb2799e..f2897ddfce8 100644
--- a/Master/texmf-dist/doc/man/man1/install-tl.1
+++ b/Master/texmf-dist/doc/man/man1/install-tl.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "INSTALL-TL 1"
-.TH INSTALL-TL 1 "2016-04-07" "perl v5.22.1" "User Contributed Perl Documentation"
+.TH INSTALL-TL 1 "2016-04-12" "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
@@ -351,6 +351,11 @@ package, which typically yields a significant speed-up.
 This option is turned on by default, and the installation program will
 fall back to using \f(CW\*(C`wget\*(C'\fR if this is not possible.  To disable usage of
 \&\s-1LWP\s0 and persistent connections, use \f(CW\*(C`\-\-no\-persistent\-downloads\*(C'\fR.
+.IP "\fB\-\-no\-verify\-downloads\fR" 4
+.IX Item "--no-verify-downloads"
+By default, if a GnuPG \f(CW\*(C`gpg\*(C'\fR binary is found in the path, downloads are
+verified against a cryptographic signature. This option allows to
+disable it.
 .IP "\fB\-portable\fR" 4
 .IX Item "-portable"
 Install for portable use, e.g., on a \s-1USB\s0 stick.  Also selectable from
diff --git a/Master/texmf-dist/doc/man/man1/install-tl.man1.pdf b/Master/texmf-dist/doc/man/man1/install-tl.man1.pdf
index 4c45026293d..a8813b6953a 100644
--- a/Master/texmf-dist/doc/man/man1/install-tl.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/install-tl.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1
index 482f27382b9..f59519c442f 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.1
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.1
@@ -286,6 +286,15 @@ Activates user mode for this run of \f(CW\*(C`tlmgr\*(C'\fR; see \*(L"\s-1USER M
 .IP "\fB\-\-usertree\fR \fIdir\fR" 4
 .IX Item "--usertree dir"
 Uses \fIdir\fR for the tree in user mode; see \*(L"\s-1USER MODE\*(R"\s0 below.
+.IP "\fB\-\-verify\-downloads\fR" 4
+.IX Item "--verify-downloads"
+.PD 0
+.IP "\fB\-\-no\-verify\-downloads\fR" 4
+.IX Item "--no-verify-downloads"
+.PD
+Enables or disables cryptographic verification of downloaded database files.
+A working GnuPG (\f(CW\*(C`gpg\*(C'\fR) binary needs to be present in the path, otherwise
+this option has no effect. See \*(L"\s-1CRYPTOGRAPHIC VERIFICATION\*(R"\s0 below for details.
 .PP
 The standard options for TeX Live programs are also accepted:
 \&\f(CW\*(C`\-\-help/\-h/\-?\*(C'\fR, \f(CW\*(C`\-\-version\*(C'\fR, \f(CW\*(C`\-q\*(C'\fR (no informational messages), \f(CW\*(C`\-v\*(C'\fR
@@ -1210,6 +1219,24 @@ with a suffix representing the repository url, as in
 fallback information, but if you don't like them accumulating (e.g.,
 on each run \f(CW\*(C`mirror.ctan.org\*(C'\fR might resolve to a new host, resulting in
 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
+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.
+.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
+always downloaded, too, and \f(CW\*(C`tlmgr\*(C'\fR confirms whether the checksum
+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.
 .SH "USER MODE"
 .IX Header "USER MODE"
 \&\f(CW\*(C`tlmgr\*(C'\fR provides a restricted way, called ``user mode'', to manage
@@ -1308,12 +1335,13 @@ ignored.  All other lines must look like
 .PP
 where the allowed keys are \f(CW\*(C`gui\-expertmode\*(C'\fR (value 0 or 1),
 \&\f(CW\*(C`persistent\-downloads\*(C'\fR (value 0 or 1), \f(CW\*(C`auto\-remove\*(C'\fR (value 0 or 1),
+\&\f(CW\*(C`verify\-downloads\*(C'\fR (value 0 or 1),
 and \f(CW\*(C`gui\-lang\*(C'\fR (value as with the command-line option).
 .PP
-\&\f(CW\*(C`persistent\-downloads\*(C'\fR, \f(CW\*(C`gui\-lang\*(C'\fR, and \f(CW\*(C`auto\-remove\*(C'\fR correspond to
-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.
+\&\f(CW\*(C`persistent\-downloads\*(C'\fR, \f(CW\*(C`gui\-lang\*(C'\fR, \f(CW\*(C`auto\-remove\*(C'\fR, and \f(CW\*(C`verify\-downloads\*(C'\fR
+correspond to 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
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
index 1085b06b350..557bd2d6bef 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf