recognize and die on rsync urls; other doc and text tweaks

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

1 files changed, 58 insertions, 47 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 6c429cef8b1..4f9db7d3f07 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -205,8 +205,8 @@ GetOptions(
            "in-place"                    => \$opt_in_place,
            "gui:s"                       => \$opt_gui,
            "lang=s"                      => \$::opt_lang,
-           "location|url|repository|repo=s" => \$opt_location,
-           "no-cls",                      # $::opt_no_cls in install-menu-text-pl
+           "location|url|repository|repos|repo=s" => \$opt_location,
+           "no-cls",                    # $::opt_no_cls in install-menu-text-pl
            "no-gui"                      => \$opt_no_gui,
            "non-admin"                   => \$opt_nonadmin,
            "portable"                    => \$opt_portable,
@@ -396,6 +396,10 @@ if ($opt_location) {
   my $tmp = $opt_location;
   if ($tmp =~ m!^(http|ftp)://!i) {
     push @media_available, "NET#$tmp";
+
+  } elsif ($tmp =~ m!^(rsync|)://!i) {
+    tldie ("$0: sorry, rsync unsupported; use an http or ftp url here.\n"); 
+
   } else {
     # remove leading file:/+ part
     $tmp =~ s!^file://*!/!i;
@@ -1370,6 +1374,9 @@ see the information and examples for the -repository option at
 http://tug.org/texlive/doc/install-tl.html
 (or in the output of install-tl --help).
 
+You can also rerun the installer with -select-repository
+to choose a mirror from a menu.
+
 END_EXPLICIT_MIRROR
       } else {
         # hurray, that worked out
@@ -2072,6 +2079,10 @@ L<http://tug.org/texlive/doc>.
 
 =head1 OPTIONS
 
+As usual, all options can be specified in any order, and with either a
+leading C<-> or C<-->.  An argument value can be separated from its
+option by either a space or C<=>.
+
 =over 4
 
 =item B<-gui> [[=]I<module>]
@@ -2174,19 +2185,22 @@ choose a good host for you.
 
 =item B<-all-options>
 
-Normally options not regarding the current platform are not shown.
-Giving this cmd line option allows to configure settings in the
-final tlpdb that do not have any immediate effect.
+Normally options not relevant to the current platform are not shown
+(i.e., when running on Unix, Windows-specific options are omitted).
+Giving this command line option allows configuring settings in the
+final C<texlive.tlpdb> that do not have any immediate effect.
 
 =item B<-custom-bin> I<path>
 
-If you have built your own binaries for your system (probably because
+If you have built your own set of TeX Live binaries (perhaps because
 your platform was not supported by TeX Live out of the box), this option
-allows you to give the I<path> to a directory where the binaries for the
-current system are present. The installation will continue as usual, but
-at 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 post-install actions.
+allows you to specify the I<path> to a directory where the binaries for
+the current system are present.  The installation will continue as
+usual, but at the end all files from I<path> are copied over to
+C<bin/custom/> under your installation directory and this C<bin/custom/>
+directory is what will be added to the path for the post-install
+actions.  (By the way, for information on building TeX Live, see
+L<http://tug.org/texlive/build.html>).
 
 =item B<-debug-translation>
 
@@ -2194,10 +2208,26 @@ 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<--help>, B<-help>, B<-?>
+=item B<-force-platform> I<platform>
+
+Instead of auto-detecting the current platform, use I<platform>.
+Binaries for this platform must be present and they must actually be
+runnable, or installation will fail.  C<-force-arch> is a synonym.
+
+=item B<-help>, B<--help>, B<-?>
 
 Display this help and exit.
 
+=item B<-in-place>
+
+This is a quick-and-dirty installation option in case you already have
+an rsync or svn checkout of TeX Live.  It will use the checkout as-is
+and will just do the necessary post-install.  Be warned that the file
+C<tlpkg/texlive.tlpdb> may be rewritten, that removal has to be done
+manually, and that the only realistic way to maintain this installation
+is to redo it from time to time.  This option is not available via the
+installer interfaces.  USE AT YOUR OWN RISK.
+
 =item B<-logfile> I<file>
 
 Write both all messages (informational, debugging, warnings) to I<file>,
@@ -2208,12 +2238,6 @@ in the root of the writable installation tree,
 for example, C</usr/local/texlive/YYYY/install-tl.log> for the I<YYYY>
 release.
 
-=item B<-force-platform> I<platform>
-
-Instead of auto-detecting the current platform, use I<platform>.
-Binaries for this platform must be present and they must actually be
-runnable, or installation will fail.  C<-force-arch> is a synonym.
-
 =item B<-no-cls>
 
 (only for text mode installer) do not clear the screen when entering
@@ -2227,11 +2251,11 @@ For Windows only: configure for the current user, not for all users.
 
 =item B<--no-persistent-downloads>
 
-For net installs, activating this option makes the installer try to set up a
-persistent connection using the Net::LWP Perl module.
-This opens only one connection between your computer and the server
-per session and reuses it, instead of initiating a new download for
-each package.
+For network installs, activating this option makes the installer try to
+set up a persistent connection using the C<Net::LWP> Perl module.  This
+opens only one connection between your computer and the server per
+session and reuses it, instead of initiating a new download for each
+package, which typically yields a significant speed-up.
 
 This option is turned on by default, and the installation program will
 fall back to using C<wget> if this is not possible.  To disable usage of
@@ -2239,18 +2263,8 @@ LWP and persistent connections, use C<--no-persistent-downloads>.
 
 =item B<-portable>
 
-Install for portable use on e.g. a USB stick. Also selectable from
-within the perltk- and text installers.
-
-=item B<-in-place>
-
-This is a quick-and-dirty installation option in case you already
-have an rsync- or svn checkout of TeX Live. It will use the checkout
-as-is and will just do the necessary post-install. Be warned that
-the file tlpkg/texlive.tlpdb may be rewritten, that removal has
-to be done manually, and that the only realistic way to maintain
-this installation is to redo it from time to time. This option is
-not available via the installer interface. USE AT YOUR OWN RISK.
+Install for portable use, e.g., on a USB stick.  Also selectable from
+within the perltk and text installers.
 
 =item B<-print-platform>
 
@@ -2275,10 +2289,10 @@ empty file, which will take all the defaults.
 Normally a profile has to specify the value C<1> for each collection to
 be installed, even if the scheme is specified.  This follows from the
 logic of the installer in that you can first select a scheme and then
-change the collections being installed.  But there is one exception to
-this, for convenience: If the profile contains a variable for
-C<selected_scheme> and I<no> collection variables are defined in the
-profile at all, then the collections which the specified scheme requires
+change the collections being installed.  But for convenience there is an
+exception to this within profiles: If the profile contains a variable
+for C<selected_scheme> and I<no> collection variables at all are defined
+in the profile, then the collections which the specified scheme requires
 are installed.
 
 Thus, a line C<selected_scheme scheme-medium> together with the
@@ -2302,19 +2316,16 @@ menu list.
 
 =item B<-v>
 
-Include debugging messages; repeat for maximum debugging, as in C<-v
--v>.  (Further repeats are accepted but ignored.)
+Include verbose debugging messages; repeat for maximum debugging, as in
+C<-v -v>.  (Further repeats are accepted but ignored.)
 
-=item B<--version>, B<-version>
+=item B<-version>, B<--version>
 
-Output version information and exit.
-If C<-v> has been given the revisions of the used modules are reported, too.
+Output version information and exit.  If C<-v> has also been given the
+revisions of the used modules are reported, too.
 
 =back
 
-As usual, all options can be specified with either C<-> or C<-->, and
-arguments can be separated from their options by either a space or C<=>.
-
 
 =head1 ENVIRONMENT VARIABLES