4 files changed, 170 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/man/man1/install-tl.1 b/Master/texmf-dist/doc/man/man1/install-tl.1
index d061a018e30..0ef02027840 100644
--- a/Master/texmf-dist/doc/man/man1/install-tl.1
+++ b/Master/texmf-dist/doc/man/man1/install-tl.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "INSTALL-TL 1"
-.TH INSTALL-TL 1 "2017-07-29" "perl v5.26.1" "User Contributed Perl Documentation"
+.TH INSTALL-TL 1 "2018-05-30" "perl v5.26.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
@@ -227,9 +227,8 @@ simplified Chinese (zh_CN), and traditional Chinese (zh_TW).
 .IX Item "-repository url|path"
 Specify the package repository to be used as the source of the
 installation, either a local directory via \f(CW\*(C`/path/to/directory\*(C'\fR or a
-\&\f(CW\*(C`file:/\*(C'\fR url, or a network location via a \f(CW\*(C`http://\*(C'\fR, \f(CW\*(C`https://\*(C'\fR, or
-\&\f(CW\*(C`ftp://\*(C'\fR url.  (No other protocols are supported, and \f(CW\*(C`https://\*(C'\fR may
-not work on all platforms.)
+\&\f(CW\*(C`file:/\*(C'\fR url, or a network location. See \*(L"\s-1SUPPORTED URL SCHEMATA\*(R"\s0
+for details.
 .Sp
 The default is to pick a mirror automatically, using
 <http://mirror.ctan.org/systems/texlive/tlnet>; the chosen mirror is
@@ -531,11 +530,78 @@ written, the names above are always used.
 .PP
 For more details on all of the above options, consult the TeX Live
 installation manual, linked from <http://tug.org/texlive/doc>.
+.SH "SUPPORTED URL SCHEMATA"
+.IX Header "SUPPORTED URL SCHEMATA"
+The following \s-1URL\s0 schemata are supported
+.ie n .IP """http://server/path/to/tlnet""" 4
+.el .IP "\f(CWhttp://server/path/to/tlnet\fR" 4
+.IX Item "http://server/path/to/tlnet"
+Standard schema, is supported without any restrictions. If the (default)
+\&\s-1LWP\s0 method is used, this schema supports persistent connections.
+.ie n .IP """ftp://server/path/to/tlnet""" 4
+.el .IP "\f(CWftp://server/path/to/tlnet\fR" 4
+.IX Item "ftp://server/path/to/tlnet"
+If the (default) \s-1LWP\s0 method is used, this schema supports persistent connections.
+.ie n .IP """https://server/path/to/tlnet""" 4
+.el .IP "\f(CWhttps://server/path/to/tlnet\fR" 4
+.IX Item "https://server/path/to/tlnet"
+If the (default) \s-1LWP\s0 method is used, this schema supports persistent connections.
+Some versions of \f(CW\*(C`wget\*(C'\fR do not support this schema. Furthermore, even if
+\&\f(CW\*(C`wget\*(C'\fR supports https, it might check the certificate. \f(CW\*(C`curl\*(C'\fR generally 
+supports https.
+.ie n .IP """user@machine:/path/to/tlnet""" 4
+.el .IP "\f(CWuser@machine:/path/to/tlnet\fR" 4
+.IX Item "user@machine:/path/to/tlnet"
+.PD 0
+.ie n .IP """scp://user@machine/path/to/tlnet""" 4
+.el .IP "\f(CWscp://user@machine/path/to/tlnet\fR" 4
+.IX Item "scp://user@machine/path/to/tlnet"
+.ie n .IP """ssh://user@machine/path/to/tlnet""" 4
+.el .IP "\f(CWssh://user@machine/path/to/tlnet\fR" 4
+.IX Item "ssh://user@machine/path/to/tlnet"
+.PD
+These schemata use \f(CW\*(C`scp\*(C'\fR to transfer files. The use of an \f(CW\*(C`ssh\-agent\*(C'\fR
+is highly recommended.
 .SH "ENVIRONMENT VARIABLES"
 .IX Header "ENVIRONMENT VARIABLES"
 For ease in scripting and debugging, \f(CW\*(C`install\-tl\*(C'\fR will look for the
 following environment variables.  They are not of interest for normal
 user installations.
+.ie n .IP """TEXLIVE_DOWNLOADER""" 4
+.el .IP "\f(CWTEXLIVE_DOWNLOADER\fR" 4
+.IX Item "TEXLIVE_DOWNLOADER"
+.PD 0
+.ie n .IP """TL_DOWNLOAD_PROGRAM""" 4
+.el .IP "\f(CWTL_DOWNLOAD_PROGRAM\fR" 4
+.IX Item "TL_DOWNLOAD_PROGRAM"
+.ie n .IP """TL_DOWNLOAD_ARGS""" 4
+.el .IP "\f(CWTL_DOWNLOAD_ARGS\fR" 4
+.IX Item "TL_DOWNLOAD_ARGS"
+.PD
+These options allow selecting different download programs then the ones
+automatically selected by the installer. The order of selection is:
+.RS 4
+.IP "1." 8
+If the environment variable \f(CW\*(C`TEXLIVE_DOWNLOADER\*(C'\fR is
+defined, use it; abort if the specified program doesn't work.
+Possible values: \f(CW\*(C`curl\*(C'\fR, \f(CW\*(C`wget\*(C'\fR.
+.IP "2." 8
+If the environment variable \f(CW\*(C`TL_DOWNLOAD_PROGRAM\*(C'\fR is
+defined (can be any value), use it together with
+\&\f(CW\*(C`TL_DOWNLOAD_ARGS\*(C'\fR; abort if it doesn't work.
+.IP "3." 8
+If \s-1LWP\s0 is available and working, use that (by far the most
+efficient method, as it supports persistent downloads).
+.IP "4." 8
+If curl is available (from the system) and working, use that.
+.IP "5." 8
+If wget is available (either from the system or \s-1TL\s0) and working, use that.
+.RE
+.RS 4
+.Sp
+\&\s-1TL\s0 still provides \f(CW\*(C`wget\*(C'\fR binaries for some platforms, so
+some download method should always be available.
+.RE
 .ie n .IP """TEXLIVE_INSTALL_ENV_NOCHECK""" 4
 .el .IP "\f(CWTEXLIVE_INSTALL_ENV_NOCHECK\fR" 4
 .IX Item "TEXLIVE_INSTALL_ENV_NOCHECK"
@@ -592,4 +658,4 @@ This script and its documentation were written for the TeX Live
 distribution (<http://tug.org/texlive>) and both are licensed under the
 \&\s-1GNU\s0 General Public License Version 2 or later.
 .PP
-\&\f(CW$Id:\fR install-tl 44918 2017\-07\-29 23:39:45Z preining $
+\&\f(CW$Id:\fR install-tl 47874 2018\-05\-30 01:33:07Z preining $
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 49725045f14..47414a867c3 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 90a526efb5b..6c4fe099cf9 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.1
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TLMGR 1"
-.TH TLMGR 1 "2018-05-28" "perl v5.26.2" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2018-05-30" "perl v5.26.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
@@ -217,6 +217,8 @@ run; to make a permanent change, use \f(CW\*(C`option repository\*(C'\fR (see th
 .Sp
 For backward compatibility and convenience, \f(CW\*(C`\-\-location\*(C'\fR and \f(CW\*(C`\-\-repo\*(C'\fR
 are accepted as aliases for this option.
+.Sp
+See \*(L"\s-1SUPPORTED URL SCHEMATA\*(R"\s0 for details on the supported schemata.
 .IP "\fB\-\-gui\fR [\fIaction\fR]" 4
 .IX Item "--gui [action]"
 \&\f(CW\*(C`tlmgr\*(C'\fR has a graphical interface as well as the command line
@@ -2087,10 +2089,105 @@ If a value is not saved in the database the string \f(CW\*(C`(not set)\*(C'\fR i
 .PP
 If you are developing a program that uses this output, and find that
 changes would be helpful, do not hesitate to write the mailing list.
+.SH "SUPPORTED URL SCHEMATA"
+.IX Header "SUPPORTED URL SCHEMATA"
+The following \s-1URL\s0 schemata are supported
+.ie n .IP """http://server/path/to/tlnet""" 4
+.el .IP "\f(CWhttp://server/path/to/tlnet\fR" 4
+.IX Item "http://server/path/to/tlnet"
+Standard schema, is supported without any restrictions. If the (default)
+\&\s-1LWP\s0 method is used, this schema supports persistent connections.
+.ie n .IP """ftp://server/path/to/tlnet""" 4
+.el .IP "\f(CWftp://server/path/to/tlnet\fR" 4
+.IX Item "ftp://server/path/to/tlnet"
+If the (default) \s-1LWP\s0 method is used, this schema supports persistent connections.
+.ie n .IP """https://server/path/to/tlnet""" 4
+.el .IP "\f(CWhttps://server/path/to/tlnet\fR" 4
+.IX Item "https://server/path/to/tlnet"
+If the (default) \s-1LWP\s0 method is used, this schema supports persistent connections.
+Some versions of \f(CW\*(C`wget\*(C'\fR do not support this schema. Furthermore, even if
+\&\f(CW\*(C`wget\*(C'\fR supports https, it might check the certificate. \f(CW\*(C`curl\*(C'\fR generally
+supports https.
+.ie n .IP """user@machine:/path/to/tlnet""" 4
+.el .IP "\f(CWuser@machine:/path/to/tlnet\fR" 4
+.IX Item "user@machine:/path/to/tlnet"
+.PD 0
+.ie n .IP """scp://user@machine/path/to/tlnet""" 4
+.el .IP "\f(CWscp://user@machine/path/to/tlnet\fR" 4
+.IX Item "scp://user@machine/path/to/tlnet"
+.ie n .IP """ssh://user@machine/path/to/tlnet""" 4
+.el .IP "\f(CWssh://user@machine/path/to/tlnet\fR" 4
+.IX Item "ssh://user@machine/path/to/tlnet"
+.PD
+These schemata use \f(CW\*(C`scp\*(C'\fR to transfer files. The use of an \f(CW\*(C`ssh\-agent\*(C'\fR
+is highly recommended.
+.SH "ENVIRONMENT VARIABLES"
+.IX Header "ENVIRONMENT VARIABLES"
+For ease in scripting and debugging, \f(CW\*(C`install\-tl\*(C'\fR will look for the
+following environment variables.  They are not of interest for normal
+user installations.
+.ie n .IP """TEXLIVE_COMPRESSOR""" 4
+.el .IP "\f(CWTEXLIVE_COMPRESSOR\fR" 4
+.IX Item "TEXLIVE_COMPRESSOR"
+This option allows selecting a different compressor program for
+backups and intermediate rollback containers. The order of selection is:
+.RS 4
+.IP "1." 8
+If the environment variable \f(CW\*(C`TEXLIVE_COMPRESSOR\*(C'\fR is
+defined, use it; abort if it doesn't work. Possible values:
+\&\f(CW\*(C`lz4\*(C'\fR, \f(CW\*(C`gzip\*(C'\fR, \f(CW\*(C`xz\*(C'\fR.
+.IP "2." 8
+If lz4 is available (either from the system or \s-1TL\s0) and working, use that.
+.IP "3." 8
+If gzip is available (from the system) and working, use that.
+.IP "4." 8
+If xz is available (either from the system or \s-1TL\s0) and working, use that.
+.RE
+.RS 4
+.Sp
+lz4 and gzip are much faster in creating tlmgr's local backups.
+The unconditional use of xz for the tlnet containers is unaffected,
+to minimize download sizes.
+.RE
+.ie n .IP """TEXLIVE_DOWNLOADER""" 4
+.el .IP "\f(CWTEXLIVE_DOWNLOADER\fR" 4
+.IX Item "TEXLIVE_DOWNLOADER"
+.PD 0
+.ie n .IP """TL_DOWNLOAD_PROGRAM""" 4
+.el .IP "\f(CWTL_DOWNLOAD_PROGRAM\fR" 4
+.IX Item "TL_DOWNLOAD_PROGRAM"
+.ie n .IP """TL_DOWNLOAD_ARGS""" 4
+.el .IP "\f(CWTL_DOWNLOAD_ARGS\fR" 4
+.IX Item "TL_DOWNLOAD_ARGS"
+.PD
+These options allow selecting different download programs then the ones
+automatically selected by the installer. The order of selection is:
+.RS 4
+.IP "1." 8
+If the environment variable \f(CW\*(C`TEXLIVE_DOWNLOADER\*(C'\fR is
+defined, use it; abort if the specified program doesn't work.
+Possible values: \f(CW\*(C`curl\*(C'\fR, \f(CW\*(C`wget\*(C'\fR.
+.IP "2." 8
+If the environment variable \f(CW\*(C`TL_DOWNLOAD_PROGRAM\*(C'\fR is
+defined (can be any value), use it together with
+\&\f(CW\*(C`TL_DOWNLOAD_ARGS\*(C'\fR; abort if it doesn't work.
+.IP "3." 8
+If \s-1LWP\s0 is available and working, use that (by far the most
+efficient method, as it supports persistent downloads).
+.IP "4." 8
+If curl is available (from the system) and working, use that.
+.IP "5." 8
+If wget is available (either from the system or \s-1TL\s0) and working, use that.
+.RE
+.RS 4
+.Sp
+\&\s-1TL\s0 still provides \f(CW\*(C`wget\*(C'\fR binaries for some platforms, so
+some download method should always be available.
+.RE
 .SH "AUTHORS AND COPYRIGHT"
 .IX Header "AUTHORS AND COPYRIGHT"
 This script and its documentation were written for the TeX Live
 distribution (<http://tug.org/texlive>) and both are licensed under the
 \&\s-1GNU\s0 General Public License Version 2 or later.
 .PP
-\&\f(CW$Id:\fR tlmgr.pl 47855 2018\-05\-28 00:31:12Z preining $
+\&\f(CW$Id:\fR tlmgr.pl 47874 2018\-05\-30 01:33:07Z preining $
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
index a9c4425d137..8f7652a37e7 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf