/home/texlive/karl/Master/tlpkg/bin/tl-update-auto

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

2 files changed, 20 insertions, 17 deletions

diff --git a/Master/texmf/doc/man/man1/tlmgr.1 b/Master/texmf/doc/man/man1/tlmgr.1
index a1118b5e79c..fe16f12e74f 100644
--- a/Master/texmf/doc/man/man1/tlmgr.1
+++ b/Master/texmf/doc/man/man1/tlmgr.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TLMGR 1"
-.TH TLMGR 1 "2012-04-17" "perl v5.14.2" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2012-04-18" "perl v5.14.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -872,9 +872,16 @@ descriptions.  See \*(L"\s-1TAXONOMIES\s0\*(R" below.
 .IP "\fB\-\-all\fR" 4
 .IX Item "--all"
 Search for package names, descriptions, and taxonomies, but not files.
-.SS "show [\fIoptions\fP] \fIpkg\fP..."
-.IX Subsection "show [options] pkg..."
-Display information about \fIpkg\fR: the name, category, short and long
+.SS "info [\fIoptions\fP] [collections|schemes|\fIpkg\fP...]"
+.IX Subsection "info [options] [collections|schemes|pkg...]"
+With no argument, lists all packages available at the package
+repository, prefixing those already installed with \f(CW\*(C`i\*(C'\fR.
+.PP
+With the single word \f(CW\*(C`collections\*(C'\fR or \f(CW\*(C`schemes\*(C'\fR as the argument, lists
+the request type instead of all packages.
+.PP
+With anything else as arguments, 
+display information about \fIpkg\fR: the name, category, short and long
 description, installation status, and TeX Live revision number.
 Searches in the remote installation source for the package if it is not
 locally installed.
@@ -885,6 +892,9 @@ package version, approximations only, due to timing skew of the updates
 of the difference pieces.  The \f(CW\*(C`revision\*(C'\fR value, by contrast, comes
 directly from \s-1TL\s0 and is reliable.
 .PP
+The former actions \fBshow\fR and \fBlist\fR are merged into this action,
+but are still supported for backward compatibility.
+.PP
 Options:
 .IP "\fB\-\-list\fR" 4
 .IX Item "--list"
@@ -892,6 +902,12 @@ If the option \f(CW\*(C`\-\-list\*(C'\fR is given with a package, the list of co
 files is also shown, including those for platform-specific dependencies.
 When given with schemes and collections, \f(CW\*(C`\-\-list\*(C'\fR outputs their
 dependencies in a similar way.
+.IP "\fB\-\-only\-installed\fR" 4
+.IX Item "--only-installed"
+If this options is given,  the installation source will
+not be used; only locally installed packages, collections, or schemes
+are listed.
+(Does not work for listing of packages for now)
 .IP "\fB\-\-taxonomy\fR" 4
 .IX Item "--taxonomy"
 .PD 0
@@ -905,19 +921,6 @@ dependencies in a similar way.
 In addition to the normal data displayed, also display information for
 given packages from the corresponding taxonomy (or all of them).  See
 \&\*(L"\s-1TAXONOMIES\s0\*(R" below for details.
-.SS "list [\-\-only\-installed] [collections|schemes|\fIpkg\fP...]"
-.IX Subsection "list [--only-installed] [collections|schemes|pkg...]"
-With no argument, lists all packages available at the package
-repository, prefixing those already installed with \f(CW\*(C`i\*(C'\fR.
-.PP
-With the single word \f(CW\*(C`collections\*(C'\fR or \f(CW\*(C`schemes\*(C'\fR as the argument, lists
-the request type.
-.PP
-With anything else as arguments, operates as the \f(CW\*(C`show\*(C'\fR action.
-.PP
-If the option \f(CW\*(C`\-\-only\-installed\*(C'\fR is given, the installation source will
-not be used; only locally installed packages, collections, or schemes
-are listed.
 .SS "dump-tlpdb [\-\-local|\-\-remote]"
 .IX Subsection "dump-tlpdb [--local|--remote]"
 Dump complete local or remote \s-1TLPDB\s0 to standard output, as-is.  The
diff --git a/Master/texmf/doc/man/man1/tlmgr.man1.pdf b/Master/texmf/doc/man/man1/tlmgr.man1.pdf
index 178a2b75dfa..2ca8810ad33 100644
--- a/Master/texmf/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf/doc/man/man1/tlmgr.man1.pdf