summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/date.c12
-rw-r--r--src/dd.c2
-rw-r--r--src/nl.c2
-rw-r--r--src/printf.c4
5 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d53dc1c4..f0b7712ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-02-10 Jim Meyering <jim@meyering.net>
+ Remove excess leading spaces that would make help2man misbehave.
+ * src/printf.c (usage): Remove excess spaces on 2nd line of %b desc.
+ * src/nl.c (usage): Remove excess spaces on 2nd line of pBRE desc.
+ * src/dd.c (usage): Remove excess spaces on 2nd line of sync desc.
+ * src/date.c (usage): Use two spaces after each optional flag, not one.
+ Reported by Thomas Huriaux in <http://bugs.debian.org/410407>.
+
* Makefile.maint (longopt_re): Relax the regexp, making square
brackets optional, so it matches the newly reported violations, too.
diff --git a/src/date.c b/src/date.c
index 2dec4c37f..c4e159e42 100644
--- a/src/date.c
+++ b/src/date.c
@@ -1,5 +1,5 @@
/* date - print or set the system date and time
- Copyright (C) 1989-2006 Free Software Foundation, Inc.
+ Copyright (C) 1989-2007 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
@@ -227,11 +227,11 @@ By default, date pads numeric fields with zeroes.\n\
fputs (_("\
The following optional flags may follow `%':\n\
\n\
- - (hyphen) do not pad the field\n\
- _ (underscore) pad with spaces\n\
- 0 (zero) pad with zeros\n\
- ^ use upper case if possible\n\
- # use opposite case if possible\n\
+ - (hyphen) do not pad the field\n\
+ _ (underscore) pad with spaces\n\
+ 0 (zero) pad with zeros\n\
+ ^ use upper case if possible\n\
+ # use opposite case if possible\n\
"), stdout);
fputs (_("\
\n\
diff --git a/src/dd.c b/src/dd.c
index c781da41c..d699955c5 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -452,7 +452,7 @@ Each CONV symbol may be:\n\
fputs (_("\
noerror continue after read errors\n\
sync pad every input block with NULs to ibs-size; when used\n\
- with block or unblock, pad with spaces rather than NULs\n\
+ with block or unblock, pad with spaces rather than NULs\n\
fdatasync physically write output file data before finishing\n\
fsync likewise, but also write metadata\n\
"), stdout);
diff --git a/src/nl.c b/src/nl.c
index 8d3bb5228..04c81183a 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -217,7 +217,7 @@ second character implies :. Type \\\\ for \\. STYLE is one of:\n\
t number only nonempty lines\n\
n number no lines\n\
pBRE number only lines that contain a match for the basic regular\n\
- expression, BRE\n\
+ expression, BRE\n\
\n\
FORMAT is one of:\n\
\n\
diff --git a/src/printf.c b/src/printf.c
index 43fe5baf5..6205153bd 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -1,5 +1,5 @@
/* printf - format and print data
- Copyright (C) 1990-2006 Free Software Foundation, Inc.
+ Copyright (C) 1990-2007 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
@@ -129,7 +129,7 @@ FORMAT controls the output as in C printf. Interpreted sequences are:\n\
fputs (_("\
%% a single %\n\
%b ARGUMENT as a string with `\\' escapes interpreted,\n\
- except that octal escapes are of the form \\0 or \\0NNN\n\
+ except that octal escapes are of the form \\0 or \\0NNN\n\
\n\
and all C format specifications ending with one of diouxXfeEgGcs, with\n\
ARGUMENTs converted to proper type first. Variable widths are handled.\n\