From 2d772c5c9a3e0cdb9833333bba326da1265813c0 Mon Sep 17 00:00:00 2001 From: okuji Date: Wed, 1 Nov 2000 12:38:23 +0000 Subject: [PATCH] update help2man to 1.23. --- ChangeLog | 4 ++++ docs/grub-install.8 | 4 ++-- docs/grub-md5-crypt.8 | 4 ++-- docs/grub.8 | 4 ++-- docs/help2man | 40 +++++++++++++++++++++++----------------- docs/mbchk.1 | 4 ++-- 6 files changed, 35 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 883c5e7c3..726ba3b61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-11-01 OKUJI Yoshinori + + * docs/help2man: Copied from help2man-1.23. + 2000-10-29 OKUJI Yoshinori * stage2/asm.S [STAGE1_5]: Don't include setjmp.S or apm.S. diff --git a/docs/grub-install.8 b/docs/grub-install.8 index 8c30a6d92..c28cee1f3 100644 --- a/docs/grub-install.8 +++ b/docs/grub-install.8 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH GRUB-INSTALL "8" "October 2000" "grub-install (GNU GRUB 0.5.97)" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. +.TH GRUB-INSTALL "8" "November 2000" "grub-install (GNU GRUB 0.5.97)" FSF .SH NAME grub-install \- install GRUB on your drive .SH SYNOPSIS diff --git a/docs/grub-md5-crypt.8 b/docs/grub-md5-crypt.8 index 23805fea6..9f58bb671 100644 --- a/docs/grub-md5-crypt.8 +++ b/docs/grub-md5-crypt.8 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH GRUB-MD5-CRYPT "8" "October 2000" "grub-md5-crypt (GNU GRUB )" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. +.TH GRUB-MD5-CRYPT "8" "November 2000" "grub-md5-crypt (GNU GRUB )" FSF .SH NAME grub-md5-crypt \- Encrypt a password in MD5 format .SH SYNOPSIS diff --git a/docs/grub.8 b/docs/grub.8 index 8efd59668..4e4fb9714 100644 --- a/docs/grub.8 +++ b/docs/grub.8 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH GRUB "8" "October 2000" "grub (GNU GRUB 0.5.97)" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. +.TH GRUB "8" "November 2000" "grub (GNU GRUB 0.5.97)" FSF .SH NAME grub \- the grub shell .SH SYNOPSIS diff --git a/docs/help2man b/docs/help2man index b8c97b1d8..506fcb853 100644 --- a/docs/help2man +++ b/docs/help2man @@ -1,7 +1,7 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w # Generate a short man page from --help and --version output. -# Copyright © 1997, 98, 99 Free Software Foundation, Inc. +# Copyright © 1997, 1998, 1999, 2000 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 @@ -27,11 +27,11 @@ use Text::Tabs qw(expand); use POSIX qw(strftime setlocale LC_TIME); my $this_program = 'help2man'; -my $this_version = '1.020'; +my $this_version = '1.23'; my $version_info = <. EOT my $section = 1; @@ -267,9 +269,11 @@ s/^\n+//; s/\n*$/\n/; s/\n\n+/\n\n/g; -# Temporarily exchange leading dots and backslashes for tokens. +# Temporarily exchange leading dots, apostrophes and backslashes for +# tokens. s/^\./\x80/mg; -s/\\/\x81/g; +s/^'/\x81/mg; +s/\\/\x82/g; # Start a new paragraph (if required) for these. s/([^\n])\n(Report +bugs|Email +bug +reports +to|Written +by)/$1\n\n$2/g; @@ -364,7 +368,7 @@ while (length) { $matched .= $& if %append; $indent = length ($4 || "$1$3"); - $content = ".TP\n\x82$2\n\x82$5\n"; + $content = ".TP\n\x83$2\n\x83$5\n"; unless ($4) { # Indent may be different on second line. @@ -376,7 +380,7 @@ while (length) elsif (s/^ {1,10}([+-]\S.*)\n//) { $matched .= $& if %append; - $content = ".HP\n\x82$1\n"; + $content = ".HP\n\x83$1\n"; $indent = 80; # not continued } @@ -385,7 +389,7 @@ while (length) { $matched .= $& if %append; $indent = length $1; - $content = ".TP\n\x82$2\n\x82$3\n"; + $content = ".TP\n\x83$2\n\x83$3\n"; } # Indented paragraph. @@ -393,7 +397,7 @@ while (length) { $matched .= $& if %append; $indent = length $1; - $content = ".IP\n\x82$2\n"; + $content = ".IP\n\x83$2\n"; } # Left justified paragraph. @@ -409,7 +413,7 @@ while (length) while (s/^ {$indent}(\S.*)\n//) { $matched .= $& if %append; - $content .= "\x82$1\n" + $content .= "\x83$1\n" } # Move to next paragraph. @@ -417,9 +421,10 @@ while (length) for ($content) { - # Leading dot protection. - s/\x82\./\x80/g; - s/\x82//g; + # Leading dot and apostrophe protection. + s/\x83\./\x80/g; + s/\x83'/\x81/g; + s/\x83//g; # Convert options. s/(^| )(-[][\w=-]+)/$1 . convert_option $2/mge; @@ -483,9 +488,10 @@ for (@pre, (grep ! /^($filter)$/o, @include), @post) for ($include{$_}) { - # Replace leading dot an backslash tokens. + # Replace leading dot, apostrophe and backslash tokens. s/\x80/\\&./g; - s/\x81/\\e/g; + s/\x81/\\&'/g; + s/\x82/\\e/g; print; } } diff --git a/docs/mbchk.1 b/docs/mbchk.1 index d1f20b58f..60b3093d9 100644 --- a/docs/mbchk.1 +++ b/docs/mbchk.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH MBCHK "1" "October 2000" "mbchk (GNU GRUB 0.5.97)" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. +.TH MBCHK "1" "November 2000" "mbchk (GNU GRUB 0.5.97)" FSF .SH NAME mbchk \- check the format of a Multiboot kernel .SH SYNOPSIS