(init_tlmedia): one pattern is shorter than two.

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

1 files changed, 11 insertions, 12 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 3883fee0800..940a37a8a89 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -166,7 +166,7 @@ if ($action =~ m/^_include_tlpobj$/) {
     $tlpobj->from_file($f);
     # we now have to check whether that is a .doc or .src package, so shipping
     # src or doc files from a different package.
-    # We *really* should have that package already installed ...
+    # We should have that package already installed ...
     my $pkg = $tlpobj->name;
     if ($pkg =~ m/^(.*)\.(src|doc)$/) {
       # got a .src or .doc package
@@ -2090,8 +2090,7 @@ sub check_collections {
 # uses the global $location.
 #
 sub init_tlmedia {
-  if (($location =~ m/$TeXLiveServerURL/) ||
-      ($location =~ m/^ctan$/i)) {
+  if ($location =~ m/^($TeXLiveServerURL|ctan$)/) {
     $location = give_ctan_mirror();
   }
   info("tlmgr: installation location $location\n");
@@ -2293,14 +2292,14 @@ that, see the option C<-v> below, and TeXLive::TLUtils.
 
 =item B<-pause>
 
-This option make B<tlmgr> wait for a user input before exiting.
+This option make B<tlmgr> wait for user input before exiting.
 
 =back
 
-The standard options are also accepted: C<--help/-h/-?>, C<--version>,
-C<-q> (no informational messages), C<-v> (debugging messages, can be
-repeated).  For the details about the latter, see the TeXLive::TLUtils
-documentation.
+The standard options for TeX Live programs are also accepted:
+C<--help/-h/-?>, C<--version>, C<-q> (no informational messages), C<-v>
+(debugging messages, can be repeated).  For the details about these, see
+the TeXLive::TLUtils documentation.
 
 The C<--version> option shows version information about the TeX Live
 release as well as the C<tlmgr> script itself.
@@ -2324,7 +2323,7 @@ Start the graphical user interface.
 =item B<install> [I<option>]... I<pkg>...
 
 Install each I<pkg> given on the command line. By default this installs
-all packages that the given I<pkg>s are dependent on, also.  Options:
+all packages on which the given I<pkg>s are dependent, also.  Options:
 
 =over 8
 
@@ -2348,7 +2347,7 @@ When you install a package which ships binary files the respective binary
 package will also be installed. (So for package bin-foobar also the package
 bin-foobar.i386-linux will be installed on an i386-linux system.)
 This switch supresses this behaviour, and also implies C<--no-depends>.
-Don't use it unless you are really sure what you are doing.
+Don't use it unless you are sure of what you are doing.
 
 =item B<--dry-run>
 
@@ -2739,8 +2738,8 @@ specifies the output file (defaults to the respective location in
 C<TEXMFSYSVAR>).  If B<--dest> is given to C<generate language>, its
 value will be used for the C<language.dat> output, and C<.def> will be
 appended to the value for the name of the C<language.def> output file.
-(This is just to avoid overwriting; if you really want a specific name
-for each output file, we recommend invoking C<tlmgr> twice.)
+(This is just to avoid overwriting; if you want a specific name for each
+output file, we recommend invoking C<tlmgr> twice.)
 
 =item B<--localcfg> I<local conf file>