alphabetize restore doc, other msg tweaks.

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

1 files changed, 51 insertions, 56 deletions

diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index b9fc8113832..1ccba6027d6 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -381,17 +381,12 @@ for the full story.\n";
     push @notvalidargs, $k if !$found;
   }
   if (@notvalidargs) {
-    my $msg =
-      "The following options are not supported for the action $action:\n";
+    my $msg = "The action $action does not support the following option(s):\n";
     for my $c (@notvalidargs) {
       $msg .= " $c";
     }
-    $msg .= "\n";
-    my @noperldoc = ();
-    if (win32() || ! TeXLive::TLUtils::which("perldoc")) {
-      @noperldoc = ("-noperldoc", "1");
-    }
-    pod2usage(-msg => $msg, -exitstatus => 1, -verbose => 1, @noperldoc);
+    tlwarn("$prg: $msg\n");
+    tldie("$prg: Try --help if you need it.\n");
   }
 
   #
@@ -5837,7 +5832,7 @@ sub check_for_critical_updates
       # should it not be present, any anyway, those are so fundamental
       # so they have to be there
       tlwarn("\nFundamental package $pkg not present, uh oh, goodbye");
-      die "Serious error, $pkg not found";
+      die "Should not happen, $pkg not found";
     }
     my $localrev = $tlp->revision;
     my $mtlp = $mediatlpdb->get_package($pkg);
@@ -6782,50 +6777,6 @@ Print the TeX Live identifier for the detected platform
 C<--print-arch> is a synonym.
 
 
-=head2 restore [--backupdir I<dir>] [--all | I<pkg> [I<rev>]]
-
-Restore a package from a previously-made backup.
-
-If C<--all> is given, try to restore the latest revision of all 
-package backups found in the backup directory.
-
-Otherwise, if neither I<pkg> nor I<rev> are given, list the available
-backup revisions for all packages.  With I<pkg> given but no I<rev>,
-list all available backup revisions of I<pkg>.
-
-When listing available packages tlmgr shows the revision, and in 
-parenthesis the creation time if available (in format yyyy-mm-dd hh:mm).
-
-If (and only if) both I<pkg> and a valid revision number I<rev> are
-specified, try to restore the package from the specified backup.
-
-Options:
-
-=over 4
-
-=item B<--all>
-
-Try to restore the latest revision of all package backups found in the
-backup directory. Additional non-option arguments (like I<pkg>) are not
-allowed.
-
-=item B<--backupdir> I<directory>
-
-Specify the directory where the backups are to be found. If not given it
-will be taken from the configuration setting in the TLPDB.
-
-=item B<--dry-run>
-
-Nothing is actually restored; instead, the actions to be performed are
-written to the terminal.
-
-=item B<--force>
-
-Don't ask questions.
-
-=back
-
-
 =head2 remove [I<option>]... I<pkg>...
 
 Remove each I<pkg> specified.  Removing a collection removes all package
@@ -6899,6 +6850,50 @@ otherwise, all operations will fail!
 =back
 
 
+=head2 restore [--backupdir I<dir>] [--all | I<pkg> [I<rev>]]
+
+Restore a package from a previously-made backup.
+
+If C<--all> is given, try to restore the latest revision of all 
+package backups found in the backup directory.
+
+Otherwise, if neither I<pkg> nor I<rev> are given, list the available
+backup revisions for all packages.  With I<pkg> given but no I<rev>,
+list all available backup revisions of I<pkg>.
+
+When listing available packages tlmgr shows the revision, and in 
+parenthesis the creation time if available (in format yyyy-mm-dd hh:mm).
+
+If (and only if) both I<pkg> and a valid revision number I<rev> are
+specified, try to restore the package from the specified backup.
+
+Options:
+
+=over 4
+
+=item B<--all>
+
+Try to restore the latest revision of all package backups found in the
+backup directory. Additional non-option arguments (like I<pkg>) are not
+allowed.
+
+=item B<--backupdir> I<directory>
+
+Specify the directory where the backups are to be found. If not given it
+will be taken from the configuration setting in the TLPDB.
+
+=item B<--dry-run>
+
+Nothing is actually restored; instead, the actions to be performed are
+written to the terminal.
+
+=item B<--force>
+
+Don't ask questions.
+
+=back
+
+
 =head2 search [I<option>...] I<what>
 
 =head3 search [I<option>...] --file I<what>
@@ -7191,7 +7186,7 @@ installed into a user tree.
 
 Description of changes of actions in user mode:
 
-=head2 user mode install
+=head2 User mode install
 
 In user mode, the C<install> action checks that the package and all
 dependencies are all either relocated or already installed in the system
@@ -7207,13 +7202,13 @@ collection-context> would install C<collection-basic> and other
 collections, while in user mode, I<only> the packages mentioned in
 C<collection-context> are installed.
 
-=head2 user mode backup; restore; remove; update
+=head2 User mode backup, restore, remove, update
 
 In user mode, these actions check that all packages to be acted on are
 installed in the user tree before proceeding; otherwise, they behave
 just as in normal mode.
  
-=head2 user mode generate; option; paper
+=head2 User mode generate, option, paper
 
 In user mode, these actions operate only on the user tree's
 configuration files and/or C<texlive.tlpdb>.