Merge changes between r18907 and r19077 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@19078 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 6 insertions, 6 deletions

diff --git a/libc/manual/argp.texi b/libc/manual/argp.texi
index b37232306..097c5c6a7 100644
--- a/libc/manual/argp.texi
+++ b/libc/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