BZ#14218: Reword argp_parse description slightly.

diff --git a/ChangeLog b/ChangeLog
index b384ae8..d17cf3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-11  Roland McGrath  <roland@hack.frob.com>
+
+       [BZ #14218]
+       * manual/argp.texi (Argp): Reword argp_parse description slightly.
+
 2012-06-09  Thomas Schwinge  <thomas@codesourcery.com>
 
        * sysdeps/sh/sh4/fpu/bits/fenv.h (__FE_UNDEFINED): Define.

diff --git a/NEWS b/NEWS
index 4804cb2..1cb50ef 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -29,7 +29,7 @@ Version 2.16
   13963, 13967, 13968, 13970, 13973, 13979, 13983, 13986, 13996, 14012,
   14027, 14033, 14034, 14036, 14040, 14043, 14044, 14048, 14049, 14053,
   14055, 14059, 14064, 14075, 14080, 14083, 14103, 14104, 14109, 14112,
-  14122, 14123, 14134, 14153, 14183, 14188, 14199
+  14122, 14123, 14134, 14153, 14183, 14188, 14199, 14218
 
 * Support for the x32 ABI on x86-64 added.  The x32 target is selected by
   configuring glibc with:

diff --git a/manual/argp.texi b/manual/argp.texi
index b372323..097c5c6 100644 (file)
--- a/manual/argp.texi
+++ b/manual/argp.texi
@@ -38,13 +38,13 @@ needed in @code{main}.
 @deftypefun {error_t} argp_parse (const struct argp *@var{argp}, int @var{argc}, char **@var{argv}, unsigned @var{flags}, int *@var{arg_index}, void *@var{input})
 The @code{argp_parse} function parses the arguments in @var{argv}, of
 length @var{argc}, using the argp parser @var{argp}.  @xref{Argp
-Parsers}.
+Parsers}.  Passing a null pointer for @var{argp} is the same as using
+a @code{struct argp} containing all zeros.
 
-A value of zero is the same as a @code{struct argp}containing all
-zeros.  @var{flags} is a set of flag bits that modify the parsing
-behavior.  @xref{Argp Flags}.  @var{input} is passed through to the argp
-parser @var{argp}, and has meaning defined by @var{argp}.  A typical
-usage is to pass a pointer to a structure which is used for specifying
+@var{flags} is a set of flag bits that modify the parsing behavior.
+@xref{Argp Flags}.  @var{input} is passed through to the argp parser
+@var{argp}, and has meaning defined by @var{argp}.  A typical usage is
+to pass a pointer to a structure which is used for specifying
 parameters to the parser and passing back the results.
 
 Unless the @code{ARGP_NO_EXIT} or @code{ARGP_NO_HELP} flags are included