Re: wrong option name in shuf

[Jim Meyering]

Mikael Magnusson <address@hidden> wrote:
...
> How's this? Feel free to reword everything or not attribute it to me
> or whatever. I presume the changes are small enough to not require
> copyright reassignment and all that.

Thank you!
Applied and pushed.

>>From 45e46e7dc573d4afcbd38ec628e779a0a8a0d4ea Mon Sep 17 00:00:00 2001
> From: Mikael Magnusson <address@hidden>
> Date: Sun, 27 Jul 2008 17:31:18 +0200
> Subject: [PATCH] shuf: correctly document --head-count.
>
> * src/shuf.c (usage): Correct --help output.
> * doc/coreutils.texi: Correct option listing.
> * NEWS: Mention correction.
> ---
>  NEWS               |    3 +++
>  doc/coreutils.texi |    6 +++---
>  src/shuf.c         |    2 +-
>  3 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/NEWS b/NEWS
> index 3be1ad4..4a660d9 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -40,6 +40,9 @@ GNU coreutils NEWS                                    -*- 
> outline -*-
>    od no longer suffers from platform bugs in printf(3).  This is
>    probably most noticeable when using 'od -tfL' to print long doubles.
>
> +  shuf --head-count is now correctly documented. The documentation previously
> +  claimed it was called --head-lines.
> +
>  ** Improvements
>
>    Improved support for access control lists (ACLs): On MacOS X, Solaris 
> 7..10,
> diff --git a/doc/coreutils.texi b/doc/coreutils.texi
> index 8eb8ac9..76b22e4 100644
> --- a/doc/coreutils.texi
> +++ b/doc/coreutils.texi
> @@ -4176,11 +4176,11 @@ operation modes:
>  @table @samp
>
>  @item -n @var{lines}
> address@hidden address@hidden
> address@hidden address@hidden
>  @opindex -n
> address@hidden --head-lines
> address@hidden --head-count
>  @cindex head of output
> -Output at most @var{lines} lines.  By default, all input lines are
> +Output at most @var{count} lines.  By default, all input lines are
>  output.
>
>  @item -o @var{output-file}
> diff --git a/src/shuf.c b/src/shuf.c
> index 5e07d6e..95a2e36 100644
> --- a/src/shuf.c
> +++ b/src/shuf.c
> @@ -60,7 +60,7 @@ Mandatory arguments to long options are mandatory for short 
> options too.\n\
>        fputs (_("\
>    -e, --echo                treat each ARG as an input line\n\
>    -i, --input-range=LO-HI   treat each number LO through HI as an input 
> line\n\
> -  -n, --head-lines=LINES    output at most LINES lines\n\
> +  -n, --head-count=COUNT    output at most COUNT lines\n\
>    -o, --output=FILE         write result to FILE instead of standard 
> output\n\
>        --random-source=FILE  get random bytes from FILE (default 
> /dev/urandom)\n\
>    -z, --zero-terminated     end lines with 0 byte, not newline\n\