doc tweaks for --self, --no-depends-at-all, etc.

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

1 files changed, 41 insertions, 45 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 4922870ee28..8fbbb59674a 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -3794,11 +3794,12 @@ that all dependencies of this package are fulfilled.)
 
 =item B<--no-depends-at-all>
 
-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 sure of what you are doing.
+When you install a package which ships binary files the respective
+binary package will also be installed.  That is, for a package C<foo>,
+the package C<foo.i386-linux> will also be installed on an C<i386-linux>
+system.  This switch suppresses this behavior, and also implies
+C<--no-depends>.  Don't use it unless you are sure of what you are
+doing.
 
 =item B<--dry-run>
 
@@ -3824,41 +3825,40 @@ must be specified.  Options:
 
 =item B<--all>
 
-Update all installed packages except for tlmgr itself.
-
-In case that updates to tlmgr itself are present this will not work
-unless also the option B<--force> or B<--self> is given.
+Update all installed packages except for tlmgr itself.  Thus, if updates
+to tlmgr itself are present, this will simply give an error, unless also
+the option B<--force> or B<--self> is given.  (See below.)
 
 Besides updating the installed packages, during the update of a
-collection the contained packages are syncronized to the status
-of the new version of the collection. That means that if a package
-has been removed on the server (and thus has also been removed from 
-the respective collection), tlmgr will remove the package also on
-the local installation. This is called B<auto-remove> and is announced
-as such when using the option B<--list>. The auto-removal can be 
-suppressed using the option B<--no-auto-remove>.
-
-On the other hand, if a package has been added to an installed
-collection, it will be added to the local installation. This is called
+collection the contained packages are synchronized to the status of the
+new version of the collection. That means that if a package has been
+removed on the server (and thus has also been removed from the
+respective collection), tlmgr will remove the package also on the local
+installation. This is called B<auto-remove> and is announced as such
+when using the option B<--list>. This auto-removal can be suppressed
+using the option B<--no-auto-remove>.
+
+Analogously, if a package has been added to an installed collection on
+the server, it will be added to the local installation. This is called
 B<auto-install> and is announced as such when using the option
-B<--list>. The auto-installation can be suppressed using the option
+B<--list>. This auto-installation can be suppressed using the option
 B<--no-auto-install>.
 
-An exception to the collection dependency checks (including
-auto-installation of packages as mentionned above) are those that have
-been forcibly removed (see the action B<remove> for details). To
-include, or better reinstall, those forcibly removed package use
+An exception to the collection dependency checks (including the
+auto-installation of packages just mentioned) are those that have been
+forcibly removed by you (see the B<remove> action). To include, or more
+precisely reinstall, those forcibly removed package use
 B<--reinstall-forcibly-removed>.
 
 =item B<--self>
 
-Update tlmgr itself (that is, the infrastructure packages) if updates 
-are present. On Windows this includes updates to the perl interpreter 
-shipped by TeX Live.
+Update 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 B<--all> or a list of packages
-then tlmgr will be updated first and, if this update succeeds, it will
-be restarted to complete the rest of the updates.
+then tlmgr will be updated first and, if this update the new version
+will be restarted to complete the rest of the updates.
 
 =item B<--list>
 
@@ -3872,9 +3872,10 @@ written to the terminal.  This is a more detailed report than C<--list>.
 
 =item B<--force>
 
-Force update of packages even if updates to tlmgr itself are present.
-Updates to tlmgr are not performed unless B<--self> option is also given.
-(C<--list> is still performed regardless of this option.)
+Force update of normal packages even if updates to tlmgr itself are
+present.  Updates to tlmgr are not performed unless B<--self> option is
+also given.  Not recommended.  (C<--list> is still performed regardless
+of this option.)
 
 =item B<--no-auto-remove>
 
@@ -3936,16 +3937,11 @@ The C<restore> action explains how to restore from a backup.
 
 If you call for updating a package normally all depending packages
 will also be checked for updates and updated if necessary. This switch
-supresses this behaviour.
+suppresses this behavior.
 
 =item B<--no-depends-at-all>
 
-By default, when you update a package which ships binary files the
-respective binary package will also be updated.  That is, for an update
-of a package C<foo>, the package C<foobar.i386-linux> will also be
-updated if the i386-linux platform is installed.  This option suppresses
-this behaviour, and implies C<--no-depends>.  Don't use it unless you
-are sure of what you are doing.
+See above under B<install> (and beware).
 
 =back
 
@@ -4027,8 +4023,8 @@ Specify the directory where the backups are to be found.
 =head2 remove [I<option>]... I<pkg>...
 
 Remove each I<pkg> specified.  Removing a collection removes all package
-dependencies, but not collection dependencies, in that collection
-(unless C<--no-depends> is specified).  However, when removing a
+dependencies (unless C<--no-depends> is specified), but not any
+collection dependencies of that collection.  However, when removing a
 package, dependencies are never removed.  Options:
 
 =over 4
@@ -4039,7 +4035,7 @@ Do not remove dependent packages.
 
 =item B<--no-depends-at-all>
 
-See above under B<action> (and beware).
+See above under B<install> (and beware).
 
 =item B<--force>
 
@@ -4047,9 +4043,9 @@ By default, removal of a package or collection that is a dependency of
 another collection or scheme is not allowed.  With this option, the
 package will be removed unconditionally.  Use with care.
 
-A package that has been removed using the B<--force> switch because
-it is still listed in an installed collection or scheme will not be
-update and mentioned as B<forcibly removed> in the output of
+A package that has been removed using the B<--force> option because it
+is still listed in an installed collection or scheme will not be
+updated, and will be mentioned as B<forcibly removed> in the output of
 B<tlmgr update --list>.
 
 =item B<--dry-run>