gnu/help2man

diff --git a/ChangeLog b/ChangeLog
index 9a654e9..e23c388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 19 23:52:37 2002  Brendan O'Dea  <bod@debian.org>
+
+	* help2man.PL: Allow short and long options to be separated by
+	  multiple spaces (Paul Eggert).
+
 Sat Mar  9 23:54:01 2002  Brendan O'Dea  <bod@debian.org>
 
 	* help2man.PL: version bump for doc changes
diff --git a/NEWS b/NEWS
index f459960..b19ba13 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Version 1.27		March 19, 2002
+
+ * Allow short and long options to be separated by multiple spaces
+   rather than a comma.
+
+Version 1.26		March 9, 2002
+
+ * Documentation updates giving suggested --help output.
+
 Version 1.25		December 3, 2001
 
  * New --source and --manual options to allow the page headers and
diff --git a/README b/README
index d30c32b..a6716aa 100644
--- a/README
+++ b/README
@@ -1,12 +1,12 @@
                         README for GNU help2man
-                              version 1.26
-                             March 10, 2002
+                              version 1.27
+                             March 19, 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.26.tar.gz
+  ftp://ftp.gnu.org/gnu/help2man/help2man-1.27.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 13b832b..2089e3e 100644
--- a/THANKS
+++ b/THANKS
@@ -2,9 +2,10 @@ A list of people who have contributed to the development of `help2man'
 by reporting problems, suggesting various improvements or submitting
 actual code follows.
 
-Karl Berry			<karl@cs.umb.edu>
+Karl Berry			<karl@freefriends.org>
 Mo DeJong			<mdejong@cygnus.com>
 Akim Demaille			<demaille@inf.enst.fr>
+Paul Eggert			<eggert@twinsun.com>
 Roland Huebner			<rh@pelikan.cologne.de>
 Matt Kraai			<kraai@alumni.carnegiemellon.edu>
 Jim Meyering			<meyering@ascend.com>
diff --git a/help2man.PL b/help2man.PL
index 7596229..62a9675 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.26 2002/03/09 12:54:01 bod Exp $)[1..2];
+    = (qw$Id: help2man.PL,v 1.27 2002/03/19 12:52:37 bod Exp $)[1..2];
 
 $program =~ s/\.PL(,v)?$//;
 
@@ -59,7 +59,7 @@ eval 'exec $Config{perlpath} -wS \$0 \${1+"\$@"}'
 print OUT <<'!NO!SUBS!';
 
 # Generate a short man page from --help and --version output.
-# Copyright © 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright © 1997-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 +97,7 @@ print OUT <<'!NO!SUBS!';
 my $version_info = <<EOT;
 GNU $this_program $this_version
 
-Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+Copyright (C) 1997-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.
 
@@ -467,7 +467,7 @@ while (length)
     my $content = '';
 
     # Option with description.
-    if (s/^( {1,10}([+-]\S.*?))(?:(  +)|\n( {20,}))(\S.*)\n//)
+    if (s/^( {1,10}([+-]\S.*?))(?:(  +(?!-))|\n( {20,}))(\S.*)\n//)
     {
 	$matched .= $& if %append;
 	$indent = length ($4 || "$1$3");