From Graeme Hewson: Keep the list of authors in the Ethereal man page from

wrapping, and fix the title.

svn path=/trunk/; revision=11727

doc/Makefile.am

@@ -31,7 +31,7 @@ ethereal-tmp.pod: $(srcdir)/ethereal.pod $(top_srcdir)/AUTHORS-SHORT
 	$(POD2MAN)                     \
 	--center="The Ethereal Network Analyzer" \
 	--release=$(VERSION)			 \
-	ethereal-tmp.pod > ../ethereal.1
+	ethereal-tmp.pod | sed 's/ETHEREAL-TMP/ETHEREAL/' > ../ethereal.1
 
 ../ethereal.html: ethereal-tmp.pod ../config.h
 	$(POD2HTML)                    \

make-authors-short.pl

@@ -16,12 +16,13 @@ while (<>) {
 		print "$1\n";
 	} elsif (/}/) {
 		$subinfo = 0;
-		if (($nextline = <>) !~ /^[\s\r]*$/) {
+		if (($nextline = <>) !~ /^[\s]*$/) {
 			print $nextline;
 		}
 	} elsif ($subinfo == 1) {
 		next;
 	} else {
+		s/^$/ /;	# Make it a verbatim paragraph
 		print;
 	}
 }