excise -man in favor of -help

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

8 files changed, 33 insertions, 52 deletions

diff --git a/Master/tlpkg/bin/create-package-list b/Master/tlpkg/bin/create-package-list
index 8a61847528f..4c7b8efbcd4 100755
--- a/Master/tlpkg/bin/create-package-list
+++ b/Master/tlpkg/bin/create-package-list
@@ -20,12 +20,11 @@ use Getopt::Long;
 use Pod::Usage;
 
 our $opt_debug = 0;
-my $man = 0;
 my $help = 0;
 
-GetOptions("debug!", 'help|?' => \$help, man => \$man ) or pod2usage(2);
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
+GetOptions("debug!", 'help|?' => \$help ) or pod2usage(1);
+
+pod2usage(-exitstatus => 0, -verbose => 2) if $help;
 die "$0: missing tlpdb argument; try --help if you need it.\n" if ($#ARGV<0);
 
 die "cannot read tlpdb file $ARGV[0]." if (! -r "$ARGV[0]");
@@ -46,7 +45,7 @@ create-package-list [OPTION]... texlive.tlpdb
 
 =head1 OPTIONS
 
-The standard options C<-help>, C<-debug>, and C<-man> are accepted.
+The standard options C<-help> and C<-debug> are accepted.
 See the tlpfiles documentation for details.
 
 =head1 DESCRIPTION
diff --git a/Master/tlpkg/bin/tlpdb2list b/Master/tlpkg/bin/tlpdb2list
index 2904b534103..1d4082bf994 100755
--- a/Master/tlpkg/bin/tlpdb2list
+++ b/Master/tlpkg/bin/tlpdb2list
@@ -22,14 +22,12 @@ use File::Path;
 
 my $opt_outputdir = "new-list";
 our $opt_debug = 0;
-my $man = 0;
 my $help = 0;
 
 GetOptions("outputdir=s" => \$opt_outputdir,
-           "debug!", "help|?" => \$help, "man" => \$man) or pod2usage(2);
+           "debug!", "help|?" => \$help) or pod2usage(1);
 		
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
+pod2usage(-exitstatus => 0, -verbose => 2) if $help;
 pod2usage(1) if ($#ARGV<0);
 
 if (! -d $opt_outputdir) {
@@ -61,7 +59,7 @@ C<./new-list>.
 
 =back
 
-The standard options C<-help>, C<-debug>, and C<-man> are also accepted.
+The standard options C<-help> and C<-debug> are also accepted.
 See the tlpfiles documentation for details.
 
 =head1 DESCRIPTION
diff --git a/Master/tlpkg/bin/tlpdb2updmap b/Master/tlpkg/bin/tlpdb2updmap
index 2bb3a76ada3..fd545309ca7 100755
--- a/Master/tlpkg/bin/tlpdb2updmap
+++ b/Master/tlpkg/bin/tlpdb2updmap
@@ -26,13 +26,11 @@ our $NEW_UPDMAP_CFG;
 
 our $mydir;
 our $opt_debug = 0;
-my $man = 0;
 my $help = 0;
 
-GetOptions("debug!", "help|?" => \$help, "man" => \$man) or pod2usage(2);
+GetOptions("debug!", "help|?" => \$help) or pod2usage(1);
 
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
+pod2usage(-exitstatus => 0, -verbose => 2) if $help;
 
 exit (&main ());
 
@@ -124,7 +122,7 @@ tlpdb2updmap [OPTION]...
 
 =head1 OPTIONS
 
-The standard options C<-help>, C<-debug>, and C<-man> are accepted.
+The standard options C<-help> and C<-debug> are accepted.
 See the tlpfiles documentation for details.
 
 =head1 DESCRIPTION
diff --git a/Master/tlpkg/bin/tlpfiles b/Master/tlpkg/bin/tlpfiles
index 0c8f3dccf87..4ec71bb2ade 100755
--- a/Master/tlpkg/bin/tlpfiles
+++ b/Master/tlpkg/bin/tlpfiles
@@ -26,14 +26,12 @@ our %DB_BY_FILE;  # used privately below.
 
 our @opt_pkgof = ();
 our $opt_debug = 0;
-my $man = 0;
 my $help = 0;
 
 GetOptions("pkgof=s" => \@opt_pkgof,
-           "debug!", "help|?" => \$help, "man" => \$man) or pod2usage(2);
+           "debug!", "help|?" => \$help) or pod2usage(1);
 
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
+pod2usage(-exitstatus => 0, -verbose => 2) if $help;
 exit (&main ());
 
 
@@ -144,10 +142,7 @@ Output the TeX Live package(s) in which each <file> is contained.
 Give debug messages from the TeX Live modules.
 
 =item B<-help>
-Print a brief help message and exit.
-
-=item B<-man>
-Print this documentation as a formatted manual page and exit.
+Print this documentation and exit.
 
 =back
 
diff --git a/Master/tlpkg/bin/tlprm b/Master/tlpkg/bin/tlprm
index 121935b5766..cb8bd04336f 100755
--- a/Master/tlpkg/bin/tlprm
+++ b/Master/tlpkg/bin/tlprm
@@ -26,14 +26,12 @@ use Cwd 'abs_path';
 
 our $opt_debug = 0;
 my $opt_svn = 1;
-my $man = 0;
 my $help = 0;
 
 GetOptions("svn!",
-           "debug!", "help|?" => \$help, "man" => \$man) or pod2usage(2);
+           "debug!", "help|?" => \$help) or pod2usage(1);
 
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
+pod2usage(-exitstatus => 0, -verbose => 2) if $help;
 
 exit (&main ());
 
@@ -187,7 +185,7 @@ the default mode of operation.
 
 =back
 
-The standard options C<-help>, C<-debug>, and C<-man> are also accepted.
+The standard options C<-help> and C<-debug> are also accepted.
 See the tlpfiles documentation for details.
 
 =head1 DESCRIPTION
diff --git a/Master/tlpkg/bin/tlpsrc2tlpdb b/Master/tlpkg/bin/tlpsrc2tlpdb
index 4a87dd76765..b43e567b5db 100755
--- a/Master/tlpkg/bin/tlpsrc2tlpdb
+++ b/Master/tlpkg/bin/tlpsrc2tlpdb
@@ -26,17 +26,15 @@ my $opt_all = 0;
 my $opt_catalogue = "";
 chomp (my $opt_master = `cd $::mydir/../.. && pwd`);
 our $opt_debug = 0;
-my $man = 0;
 my $help = 0;
 
 GetOptions(
     "all!" => \$opt_all,
     "master=s" => \$opt_master,	# location of the TL tree
     "catalogue=s" => \$opt_catalogue, # location of the TeX Catalogue
-    "debug!", "help|?" => \$help, "man" => \$man) or pod2usage(2);
+    "debug!", "help|?" => \$help) or pod2usage(1);
 
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
+pod2usage(-exitstatus => 0, -verbose => 2) if $help;
 
 exit (&main ());
 
@@ -136,7 +134,7 @@ 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.
+The standard options C<-help> and C<-debug> are also accepted.
 See the tlpfiles documentation for details.
 
 =head1 DESCRIPTION
diff --git a/Master/tlpkg/bin/tlpsrc2tlpobj b/Master/tlpkg/bin/tlpsrc2tlpobj
index 0c03bb6672d..26e9380fd2d 100755
--- a/Master/tlpkg/bin/tlpsrc2tlpobj
+++ b/Master/tlpkg/bin/tlpsrc2tlpobj
@@ -25,19 +25,16 @@ use File::Path;
 my $opt_master = "/src/TeX/texlive-svn/Master";
 my $opt_outputdir = "./tlpobj";
 our $opt_debug = 0;
-my $man = 0;
 my $help = 0;
 my $opt_catalogue = "";
 
-GetOptions("debug!",	# debug mode
-		"master=s" => \$opt_master,	# location of the tree
-		"catalogue=s" => \$opt_catalogue, # location of the TeX Catalogue
-		"outputdir=s" => \$opt_outputdir,
-		'help|?' => \$help, man => \$man
-	) or pod2usage(2);
+GetOptions(
+    "master=s" => \$opt_master,	# location of the tree
+    "catalogue=s" => \$opt_catalogue, # location of the TeX Catalogue
+    "outputdir=s" => \$opt_outputdir,
+    "debug!", "help|?" => \$help) or pod2usage(1);
 
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
+pod2usage(-exitstatus => 0, -verbose => 2) if $help;
 
 if (! -d "$opt_master") {
 	die "Master $opt_master does not exists!";
@@ -100,7 +97,7 @@ Specifies the location where tlp files are created. Defaults to C<./tlp>.
 
 =back
 
-The standard options C<-help>, C<-debug>, and C<-man> are also accepted.
+The standard options C<-help> and C<-debug> are also accepted.
 See the tlpfiles documentation for details.
 
 =head1 DESCRIPTION
diff --git a/Master/tlpkg/bin/tlpsrc2zip b/Master/tlpkg/bin/tlpsrc2zip
index f273dd5937d..a3616eefbff 100755
--- a/Master/tlpkg/bin/tlpsrc2zip
+++ b/Master/tlpkg/bin/tlpsrc2zip
@@ -25,17 +25,15 @@ use File::Path;
 my $opt_master = "/src/TeX/texlive-svn/Master";
 my $opt_outputdir = "./zip";
 our $opt_debug = 0;
-my $man = 0;
 my $help = 0;
 
-GetOptions("debug!",	# debug mode
-		"master=s" => \$opt_master,	# location of the tree
-		"outputdir=s" => \$opt_outputdir,
-		'help|?' => \$help, man => \$man
-	) or pod2usage(2);
+GetOptions(
+    "master=s" => \$opt_master,	# location of the tree
+    "catalogue=s" => \$opt_catalogue, # location of the TeX Catalogue
+    "outputdir=s" => \$opt_outputdir,
+    "debug!", "help|?" => \$help) or pod2usage(1);
 
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
+pod2usage(-exitstatus => 0, -verbose => 2) if $help;
 
 if (! -d "$opt_master") {
 	die "Master $opt_master does not exists!";
@@ -78,7 +76,7 @@ Specifies the location where zip files are created. Defaults to C<./zip>.
 
 =back
 
-The standard options C<-help>, C<-debug>, and C<-man> are also accepted.
+The standard options C<-help> and C<-debug> are also accepted.
 See the tlpfiles documentation for details.
 
 =head1 DESCRIPTION