2 files changed, 11 insertions, 66 deletions
diff --git a/Master/texmf-dist/doc/man/man1/install-tl.1 b/Master/texmf-dist/doc/man/man1/install-tl.1
index 0ef02027840..99de00e29c7 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 "2018-05-30" "perl v5.26.2" "User Contributed Perl Documentation"
+.TH INSTALL-TL 1 "2018-06-01" "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,8 +227,7 @@ 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. See \*(L"\s-1SUPPORTED URL SCHEMATA\*(R"\s0
-for details.
+\&\f(CW\*(C`file:/\*(C'\fR url, or a network location.
 .Sp
 The default is to pick a mirror automatically, using
 <http://mirror.ctan.org/systems/texlive/tlnet>; the chosen mirror is
@@ -237,7 +236,7 @@ as an abbreviation for this.  See <http://ctan.org> for more about \s-1CTAN\s0
 and its mirrors.
 .Sp
 If the repository is on the network, trailing \f(CW\*(C`/\*(C'\fR characters and/or
-trailing \f(CW\*(C`/tlpkg\*(C'\fR and \f(CW\*(C`/archive\*(C'\fR components are ignored.  For example,
+trailing \f(CW\*(C`/tlpkg\*(C'\fR and/or \f(CW\*(C`/archive\*(C'\fR components are ignored.  For example,
 you could choose a particular \s-1CTAN\s0 mirror with something like this:
 .Sp
 .Vb 1
@@ -296,9 +295,9 @@ For more information on custom binaries, see
 building TeX Live, see <http://tug.org/texlive/build.html>.
 .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
-likely untranslated, messages to standard error.  Helpful for
-translators to see what remains to be done.
+In \s-1GUI\s0 mode, this options reports any missing, or more likely
+untranslated, messages to standard error. Helpful for translators to see
+what remains to be done.
 .IP "\fB\-force\-platform\fR \fIplatform\fR" 4
 .IX Item "-force-platform platform"
 Instead of auto-detecting the current platform, use \fIplatform\fR.
@@ -530,42 +529,10 @@ 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
+For ease in scripting and debugging, \f(CW\*(C`install\-tl\*(C'\fR looks 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
@@ -578,30 +545,8 @@ user installations.
 .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
+These override the normal choice of a download program; see the \f(CW\*(C`tlmgr\*(C'\fR
+documentation, e.g., <http://tug.org/texlive/doc/tlmgr.html#xxx>
 .ie n .IP """TEXLIVE_INSTALL_ENV_NOCHECK""" 4
 .el .IP "\f(CWTEXLIVE_INSTALL_ENV_NOCHECK\fR" 4
 .IX Item "TEXLIVE_INSTALL_ENV_NOCHECK"
@@ -616,7 +561,7 @@ Omit creating the ConTeXt cache.  This is useful for redistributors.
 .el .IP "\f(CWTEXLIVE_INSTALL_NO_WELCOME\fR" 4
 .IX Item "TEXLIVE_INSTALL_NO_WELCOME"
 Omit printing the welcome message after successful installation, e.g.,
-for testing.
+when testing.
 .ie n .IP """TEXLIVE_INSTALL_PREFIX""" 4
 .el .IP "\f(CWTEXLIVE_INSTALL_PREFIX\fR" 4
 .IX Item "TEXLIVE_INSTALL_PREFIX"
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 47414a867c3..66a4a131f63 100644
--- a/Master/texmf-dist/doc/man/man1/install-tl.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/install-tl.man1.pdf