bug#12212: [patch] dd's help text contains superfluous word

[Bernhard Voelker]

On 09/18/2012 02:27 PM, Jim Meyering wrote:
> Bernhard Voelker wrote:
>> Anyone catching up on Benno's patch with my addendum?
>> (I'm not sure about the second patch though.)
> 
> Hi Berny,
> I was waiting for a complete patch ;-)

Hi Jim,

actually, me too ;-)
I've never written a patch in other contributors name yet.
Here's a try.

Have a nice day,
Berny


>From d2e4c4a276c096b46598c71fe8b6f63eb89adbe5 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <address@hidden>
Date: Tue, 18 Sep 2012 14:50:47 +0200
Subject: [PATCH] dd: remove references to the word BLOCKS from help and texi
 docs

The renaming from BLOCKS to N was done in v8.15-38-g140eca1,
and a documentation for N was added again in v8.17-26-g4f2e9d5
without noticing that. Now, finally remove the word BLOCKS
from the documentation.

* src/dd.c (usage): Remove the word BLOCKS.
* doc/coreutils.texi (dd invocation): Likewise.

Improved by: Bernhard Voelker <address@hidden>
---
 doc/coreutils.texi |    2 +-
 src/dd.c           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index cb4ad83..437ae5d 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -8413,7 +8413,7 @@ affected file descriptors, even after @command{dd} exits.
 @end table

 @cindex multipliers after numbers
-The numeric-valued strings above (@var{n}, @var{bytes} and @var{blocks})
+The numeric-valued strings above (@var{n} and @var{blocks})
 can be followed by a multiplier: @samp{b}=512, @samp{c}=1,
 @samp{w}=2, @address@hidden@var{m}, or any of the
 standard block size suffixes like @samp{k}=1024 (@pxref{Block size}).
diff --git a/src/dd.c b/src/dd.c
index 2ebbfae..de51435 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -540,7 +540,7 @@ Copy a file, converting and formatting according to the 
operands.\n\
 "), stdout);
       fputs (_("\
 \n\
-N, BLOCKS and BYTES may be followed by the following multiplicative 
suffixes:\n\
+N and BYTES may be followed by the following multiplicative suffixes:\n\
 c =1, w =2, b =512, kB =1000, K =1024, MB =1000*1000, M =1024*1024, xM =M\n\
 GB =1000*1000*1000, G =1024*1024*1024, and so on for T, P, E, Z, Y.\n\
 \n\
-- 
1.7.7