doc fixes

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

1 files changed, 35 insertions, 30 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 96b018bcbf3..2dbed75cda2 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -4068,10 +4068,7 @@ sub check_on_writable {
   return 1;
 }
     
-
-
 1;
-
 __END__
 
 =head1 NAME
@@ -4269,41 +4266,45 @@ link), see the C<--exclude> option below.
 
 =item B<--self>
 
-Update C<tlmgr> itself (that is, the infrastructure packages) if updates to
-it are present. On Windows this includes updates to the private Perl
+Update C<tlmgr> itself (that is, the infrastructure packages) if updates
+to it are present. On Windows this includes updates to the private Perl
 interpreter shipped inside TeX Live.
 
-If this option is given together with C<--all> or a list of packages
-then C<tlmgr> will be updated first and, if this update the new version
-will be restarted to complete the rest of the updates.
+If this option is given together with either C<--all> or a list of
+packages, then C<tlmgr> will be updated first and, if this update
+succeeds, the new version will be restarted to complete the rest of the
+updates.
 
-In brief:
+In short:
 
   tlmgr update --self        # update infrastructure only
   tlmgr update --self --all  # update infrastructure and all packages
   tlmgr update --force --all # update all packages but *not* infrastructure
 
-=item B<--list>
+=item B<--list> [I<pkg>]
 
 Concisely list the packages which would be updated, newly installed, or
 removed, without actually changing anything. If no package is given
 acts like C<--list --all>, otherwise lists only updates to the packages
 given as arguments (and its dependencies).
 
-=item B<--exclude I<pkg>>
+=item B<--exclude> I<pkg>
 
-Exclude I<pkg> from the update process. This option can be given
-multiple times. Giving a string C<pkg> here will exclude the package
-C<pkg> itself and all packages C<pkg.something>. As an example giving
+Exclude I<pkg> from the update process.  If this option is given more
+than once, its arguments accumulate.
+
+An argument I<pkg> excludes both the package I<pkg> itself and all
+its related architecture-specific packages I<pkg.ARCH>.  For example,
 
   tlmgr update --all --exclude a2ping
 
-will not update C<a2ping> itself, nor C<a2ping.i386-linux> or
-any other arch-package C<a2ping.ARCH>.
+will not update C<a2ping>, C<a2ping.i386-linux>, or
+any other C<a2ping.>I<ARCH>package.
 
-Note that if a package is schedules for auto-installation, auto-removal,
-or reinstallation of a forcibly removed, and at the same time
-is excluded, tlmgr will warn you and stop. 
+If this option specifies a package that would otherwise be a candidate
+for auto-installation, auto-removal, or reinstallation of a forcibly
+removed package, C<tlmgr> quits with an error message.  Excludes are not
+supported in these circumstances.
 
 =item B<--dry-run>
 
@@ -4341,15 +4342,19 @@ is equivalent to
 
 =item B<--reinstall-forcibly-removed>
 
-Under normal circumstances C<tlmgr> will not install packages that it
-considers forcibly removed (that is, removed with `remove --force' or
-whose installation was prohibited by --no-auto-install during an
-earlier update). This option makes C<tlmgr> consider all these packages
-as new and re-install them. This can be used to syncronize an
-installation with the server's idea of what is available by calling
+Under normal circumstances C<tlmgr> will not install packages that have
+been forcibly removed by the user; that is, removed with C<remove
+--force>, or whose installation was prohibited by C<--no-auto-install>
+during an earlier update.
+
+This option makes C<tlmgr> ignore the forcible removals and re-install
+all such packages. This can be used to synchronize an installation with
+the server's idea of what is available by calling
 
   tlmgr update --reinstall-forcibly-removed --all
 
+This option only works in conjunction with C<--all>.
+
 =item B<--backup> and B<--backupdir> I<directory>
 
 These two options control the creation of backups of packages I<before>
@@ -4365,11 +4370,11 @@ You can set options via the C<option> action to automatically create
 backups for all packages, and/or keep only a certain number of
 backups.  Please see the C<option> action for details.
 
-C<tlmgr> unconditionally makes a temporary backup when updating
-packages, in case of download or other failure during an update.  In
-contrast, the purpose of this C<--backup> option is to allow you to save
-a persistent backup in case the actual I<content> of the update causes
-problems, e.g., introduces an incompatibility.
+C<tlmgr> always makes a temporary backup when updating packages, in case
+of download or other failure during an update.  In contrast, the purpose
+of this C<--backup> option is to allow you to save a persistent backup
+in case the actual I<content> of the update causes problems, e.g.,
+introduces an incompatibility.
 
 The C<restore> action explains how to restore from a backup.