gnu/help2man

diff --git a/ChangeLog b/ChangeLog
index e23c388..22a905e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun  4 00:53:18 2002  Brendan O'Dea  <bod@odea.dropbear.id.au>
+
+	* help2man.PL: Expand copyright years (Paul Eggert).  Provide
+	  --info-page option (Bonzini).
+
+	* README.sh: hrm, different awk...
+
 Tue Mar 19 23:52:37 2002  Brendan O'Dea  <bod@debian.org>
 
 	* help2man.PL: Allow short and long options to be separated by
diff --git a/README b/README
index a6716aa..67147be 100644
--- a/README
+++ b/README
@@ -1,12 +1,15 @@
                         README for GNU help2man
-                              version 1.27
-                             March 19, 2002
+
+                             version 1.28
+
+                             June  4, 2002
+
 
 help2man is a script to create simple man pages from the --help and
 --version output of programs.
 
   http://www.gnu.org/software/help2man/
-  ftp://ftp.gnu.org/gnu/help2man/help2man-1.27.tar.gz
+  ftp://ftp.gnu.org/gnu/help2man/help2man-1.28.tar.gz
 
 Since most GNU documentation is now in info format, this provides a
 way to generate a placeholder man page pointing to that resource while
diff --git a/THANKS b/THANKS
index 2089e3e..c3fb846 100644
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ by reporting problems, suggesting various improvements or submitting
 actual code follows.
 
 Karl Berry			<karl@freefriends.org>
+Bonzini				<bonzini@gnu.org>
 Mo DeJong			<mdejong@cygnus.com>
 Akim Demaille			<demaille@inf.enst.fr>
 Paul Eggert			<eggert@twinsun.com>
diff --git a/help2man.PL b/help2man.PL
index 62a9675..97aabc9 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use Config;
 use Getopt::Long;
 
 my ($program, $version)
-    = (qw$Id: help2man.PL,v 1.27 2002/03/19 12:52:37 bod Exp $)[1..2];
+    = (qw$Id: help2man.PL,v 1.28 2002/06/03 14:44:49 bod Exp $)[1..2];
 
 $program =~ s/\.PL(,v)?$//;
 
@@ -59,7 +59,8 @@ eval 'exec $Config{perlpath} -wS \$0 \${1+"\$@"}'
 print OUT <<'!NO!SUBS!';
 
 # Generate a short man page from --help and --version output.
-# Copyright © 1997-2002 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -97,7 +98,7 @@ print OUT <<'!NO!SUBS!';
 my $version_info = <<EOT;
 GNU $this_program $this_version
 
-Copyright (C) 1997-2002 Free Software Foundation, Inc.
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -116,6 +117,7 @@ Usage: $this_program [OPTION]... EXECUTABLE
  -i, --include=FILE      include material from `FILE'
  -I, --opt-include=FILE  include material from `FILE' if it exists
  -o, --output=FILE       send output to `FILE'
+ -p, --info-page=TEXT    name of Texinfo manual
  -N, --no-info           suppress pointer to Texinfo manual
      --help              print this help, then exit
      --version           print version number, then exit
@@ -134,7 +136,7 @@ my $manual = '';
 my $source = '';
 my $help_option = '--help';
 my $version_option = '--version';
-my ($opt_name, @opt_include, $opt_output, $opt_no_info);
+my ($opt_name, @opt_include, $opt_output, $opt_info, $opt_no_info);
 
 my %opt_def = (
     'n|name=s'		 => \$opt_name,
@@ -144,6 +146,7 @@ my %opt_def = (
     'i|include=s'	 => sub { push @opt_include, [ pop, 1 ] },
     'I|opt-include=s'	 => sub { push @opt_include, [ pop, 0 ] },
     'o|output=s'	 => \$opt_output,
+    'p|info-page=s'	 => \$opt_info,
     'N|no-info'		 => \$opt_no_info,
     'h|help-option=s'	 => \$help_option,
     'v|version-option=s' => \$version_option,
@@ -552,6 +555,8 @@ while (length)
 # Refer to the real documentation.
 unless ($opt_no_info)
 {
+    my $info_page = $opt_info || $program;
+
     $sect = 'SEE ALSO';
     $include{$sect} ||= '';
     $include{$sect} .= ".PP\n" if $include{$sect};
@@ -564,7 +569,7 @@ and
 .B $program
 programs are properly installed at your site, the command
 .IP
-.B info $program
+.B info $info_page
 .PP
 should give you access to the complete manual.
 EOT