summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenno Schulenberg <bensberg@justemail.net>2012-09-18 14:58:42 +0200
committerJim Meyering <meyering@redhat.com>2012-09-18 17:14:05 +0200
commit627412847ef8972e84d4ed957fe1bed4f018bd2c (patch)
tree8f002454c762d9fc55e1462ca925457f0fa09222
parentb2635cb1efe650ea7f2f8ec14179fe3d390bc6db (diff)
downloadcoreutils-627412847ef8972e84d4ed957fe1bed4f018bd2c.tar.xz
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 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 <mail@bernhard-voelker.de>
-rw-r--r--doc/coreutils.texi2
-rw-r--r--src/dd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index cb4ad838d..c0abd7fa1 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{bytes})
can be followed by a multiplier: @samp{b}=512, @samp{c}=1,
@samp{w}=2, @samp{x@var{m}}=@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 2ebbfae86..de514355e 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\