last doc fixes for now

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

6 files changed, 35 insertions, 36 deletions

diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl
index 1ab90ae47ed..b561e0e48cf 100755
--- a/Master/tlpkg/bin/ctan2tl
+++ b/Master/tlpkg/bin/ctan2tl
@@ -2,17 +2,7 @@
 # $Id$
 # Public domain.  Originally written 2005, Karl Berry.
 #
-# Initial attempt at pushing a ctan directory into TL.
-# See ./README for a bit more info.
-# 
-# Basic usage: ctan2tl TLPKGNAME
-# --place to include final `place' invocation (repository adds/removes).
-# --no-ctan if already have files in Build/tmp.raw/PKG.
-# Unlikely to work without GNU utilities.
-# 
-# This does not actually commit anything to the repository.  Without
-# --place, it doesn't even create any files in the repository outside of
-# Build/tmp.{raw,cooked}.
+# Attempt to push a package from CTAN into TL.
 
 unset CDPATH  # avoid extraneous output
 
@@ -24,6 +14,23 @@ raw=$Build/tmp.raw
 test -d $raw || mkdir $raw
 cd $raw || exit 1
 
+if test "x$1" = x--help; then
+  echo "Usage: $0 [--place] [--no-ctan] TLPKGNAME"
+  echo
+  echo "Install a package from CTAN into TeX Live."
+  echo
+  echo "--place    execute place to do repository adds/removes."
+  echo "--no-ctan  if already have files in Build/tmp.raw/PKG."
+  echo
+  echo "This does not actually commit anything to the repository.  Without"
+  echo "--place, it doesn't even touch anything in the repository outside of"
+  echo "Build/tmp.{raw,cooked}."
+  echo
+  echo "Read and understand http://tug.org/texlive/pkgupdate.html"
+  echo "before running this."
+  exit 0
+fi
+
 if test "x$1" = x--place; then
   place_chicken=
   shift
diff --git a/Master/tlpkg/bin/tlpfiles b/Master/tlpkg/bin/tlpfiles
index 5bc00fe6ce8..4a35056cad1 100755
--- a/Master/tlpkg/bin/tlpfiles
+++ b/Master/tlpkg/bin/tlpfiles
@@ -71,7 +71,10 @@ or: tlpfiles [OPTION]... -pkgof FILE...
 =over 8
 
 =item B<-pkgof> I<file>...
-Output the TeX Live packages in which each <file> is contained.
+Output the TeX Live package(s) in which each <file> is contained.
+
+=item B<-debug>
+Give debug messages from the TeX Live modules.
 
 =item B<-help>
 Print a brief help message and exit.
@@ -79,9 +82,6 @@ Print a brief help message and exit.
 =item B<-man>
 Print this documentation as a formatted manual page and exit.
 
-=item B<-debug>
-Give debug messages from the TeX Live modules.
-
 =back
 
 =head1 DESCRIPTION
diff --git a/Master/tlpkg/bin/tlprm b/Master/tlpkg/bin/tlprm
index 6604df73a0e..c1a6ebb123c 100755
--- a/Master/tlpkg/bin/tlprm
+++ b/Master/tlpkg/bin/tlprm
@@ -183,21 +183,15 @@ Set up to remove the specified TeX Live packages from the source repository.
 
 =over 8
 
-=item B<-debug>
-Give debug messages from the TeX Live modules.
-
-=item B<-help>
-Print brief help message and exit.
-
-=item B<-man>
-Print formatted manual page and exit.
-
 =item B<-svn>
 Print the Subversion commands that will do the actual removal.  This is
 the default mode of operation.
 
 =back
 
+The standard options C<-help>, C<-debug>, and C<-man> are also accepted.
+See the tlpfiles documentation for details.
+
 =head1 DESCRIPTION
 
 By default (or with the C<--svn> option), B<tlprm> merely prints
diff --git a/Master/tlpkg/bin/tlpsrc2tlpdb b/Master/tlpkg/bin/tlpsrc2tlpdb
index 59dfb10f3a3..1fb3a1f0733 100755
--- a/Master/tlpkg/bin/tlpsrc2tlpdb
+++ b/Master/tlpkg/bin/tlpsrc2tlpdb
@@ -85,20 +85,19 @@ tlpsrc2tlpdb [OPTION]... [TLPSRC]...
 
 =over 8
 
-=item B<-catalogue>
+=item B<-catalogue> I<Catalogue_dir>
 The location given by B<-catalogue> must point to a valid TeX Catalogue.
 No default value. If given, the generated tlpobj files will contain information
 gathered from the TeX Catalogue.
 
-=item B<-master>
+=item B<-master> I<Master_dir>
 The location given by B<-master> must point to a valid svn repository
-of TeX Live Master direcory. Defaults to ../.. of C<$0>.
+of TeX Live's Master direcory.  Defaults to C<../..> of C<$0>.
 
 =back
 
-The standard options
-C<-help>, C<-debug>, and C<-man> are also accepted.  See the tlpfiles
-documentation for details.
+The standard options C<-help>, C<-debug>, and C<-man> are also accepted.
+See the tlpfiles documentation for details.
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/bin/tlpsrc2tlpobj b/Master/tlpkg/bin/tlpsrc2tlpobj
index 509f8a53067..7ce29f52689 100755
--- a/Master/tlpkg/bin/tlpsrc2tlpobj
+++ b/Master/tlpkg/bin/tlpsrc2tlpobj
@@ -93,8 +93,7 @@ information gathered from the TeX Catalogue.
 
 =item B<-master> I<Master_dir>
 The location given by B<-master> must point to a valid svn repository
-of TeX Live Master direcory. Defaults to the grandparent directory of
-this script's location.
+of TeX Live's Master direcory.  Defaults to C<../..> of C<$0>.
 
 =item B<-outputdir> I<output_dir>
 Specifies the location where tlp files are created. Defaults to C<./tlp>.
diff --git a/Master/tlpkg/bin/tlpsrc2zip b/Master/tlpkg/bin/tlpsrc2zip
index 6ea4fa0e115..c6b8c6b925a 100755
--- a/Master/tlpkg/bin/tlpsrc2zip
+++ b/Master/tlpkg/bin/tlpsrc2zip
@@ -70,12 +70,12 @@ tlpsrc2zip [options] [tlpsrcfiles ...]
 
 =over 8
 
-=item B<-master>
+=item B<-master> I<Master_dir>
 The location given by B<-master> must point to a valid svn repository
-of TeX Live Master direcory. Defaults to /src/TeX/texlive-svn/Master
+of TeX Live Master direcory. Defaults to C<../..> of C<$0>.
 
-=item B<-outputdir>
-Specifies the location where zip files are created. Defaults to ./zip
+=item B<-outputdir> I<output_dir>
+Specifies the location where zip files are created. Defaults to C<./zip>.
 
 =back