4 files changed, 30 insertions, 33 deletions
diff --git a/Master/install-tl b/Master/install-tl
index a66a755d9c7..1ca4c2aa88f 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1850,15 +1850,6 @@ will be adjusted accordingly.
 For backward compatibility and convenience, C<--location> and C<--repo>
 are accepted as aliases for this option.
 
-=item B<-persistent-downloads>
-
-Try to set up a persistent connection using Net::LWP if
-you are installing from the network. This will keep the connection
-between your computer and the server open for the whole session and
-reuse this connection.
-
-This option should reduce the probability to have connection problems.
-
 =item B<-no-cls>
 
 (only for text mode installer) do not clear the screen when entering
@@ -1931,10 +1922,19 @@ the end all files from I<path> are copied over to C<bin/custom> in your
 installation folder and this directory will be added to the path for
 the postinstall actions.
 
+=item B<--persistent-downloads>
+
+For net installs, try to set up a persistent connection using the
+Net::LWP Perl module.  This reuses a connection between your computer
+and the server for the session, instead of initiating a new download for
+each package.  We hope this option will reduce the probability of
+connection problems.
+
 =item B<-debug-translation>
 
-This switch will make install-tl report any missing or probably
-untranslated messages in the GUI installers to STDERR.
+In GUI mode, this switch makes C<tlmgr> report any missing, or more
+likely untranslated, messages to standard error.  Helpful for
+translators to see what remains to be done.
 
 =item B<-q>
 
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 7a12456bfda..9bdf80b7305 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -4243,14 +4243,6 @@ L<option> action).
 For backward compatibility and convenience, C<--location> and C<--repo>
 are accepted as aliases for this option.
 
-=item B<-persistent-downloads>
-
-Try to set up a persistent connection using Net::LWP if
-you are installing from the network. This will keep the connection
-between your computer and the server open for the whole session and
-reuse this connection.
-
-This option should reduce the probability to have connection problems.
 
 =item B<--gui> [I<action>]
 
@@ -4294,9 +4286,17 @@ that, see the option C<-v> below, and TeXLive::TLUtils.
 This option makes B<tlmgr> wait for user input before exiting.  Useful on
 Windows to avoid command windows disappearing.
 
+=item B<--persistent-downloads>
+
+For net installs, try to set up a persistent connection using the
+Net::LWP Perl module.  This reuses a connection between your computer
+and the server for the session, instead of initiating a new download for
+each package.  We hope this option will reduce the probability of
+connection problems.
+
 =item B<--debug-translation>
 
-This switch makes C<tlmgr> report, in GUI mode, any missing, or more
+In GUI mode, this switch makes C<tlmgr> report any missing, or more
 likely untranslated, messages to standard error.  Helpful for
 translators to see what remains to be done.
 
diff --git a/Master/tlpkg/TeXLive/TLDownload.pm b/Master/tlpkg/TeXLive/TLDownload.pm
index 55ea323d0f3..e22e0eb6e0c 100644
--- a/Master/tlpkg/TeXLive/TLDownload.pm
+++ b/Master/tlpkg/TeXLive/TLDownload.pm
@@ -4,8 +4,6 @@
 #
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
-#
-
 
 package TeXLive::TLDownload;
 
@@ -35,7 +33,7 @@ if ($@) {
   require LWP::UserAgent;
   require HTTP::Status;
   $net_lib_avail = 1;
-  debug("LWP available!\n");
+  ddebug("LWP available, doing persistent downloads.\n");
 }
 
 
@@ -101,15 +99,15 @@ C<TeXLive::TLDownload> -- TeX Live Download abstraction module
 
 =head1 DESCRIPTION
 
-The C<TeXLive::TLDownload> is a simple wrapper around the LWP modules 
-that allows for persistent connections and different protocols.
-At loading time it checks for the existence of the LWP module(s),
-and sets C<$TeXLive::TLDownload::net_lib_avail> accordingly.
+The C<TeXLive::TLDownload> is a wrapper around the LWP modules that
+allows for persistent connections and different protocols.  At load
+time it checks for the existence of the LWP module(s), and sets
+C<$TeXLive::TLDownload::net_lib_avail> accordingly.
 
 =head2 Using proxies
 
 Please see C<LWP::UserAgent> for details, in a nut shell one can
-specify proxies by setting C<I<protocol>_proxy> variable.
+specify proxies by setting C<I<protocol>_proxy> variables.
 
 =head1 SEE ALSO
 
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 6dc3022ece9..7e87a5c6f9f 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2998,17 +2998,16 @@ sub conv_to_w32_path {
 
 =item C<setup_persistent_downloads()>
 
-Setup the system to use persistent connections using LWP/TLDownload.
+Set up to use persistent connections using LWP/TLDownload.
 
 =cut
 
 sub setup_persistent_downloads
 {
-  if (!$TeXLive::TLDownload::net_lib_avail) {
-    tlwarn("Cannot set up persistent connections, LWP is missing.\n");
-    return 0;
+  if ($TeXLive::TLDownload::net_lib_avail) {
+    return ($::tldownload_server = TeXLive::TLDownload->new);
   }
-  return ($::tldownload_server = TeXLive::TLDownload->new);
+  return 0;
 }
 
 =item C<give_ctan_mirror()>