Merge branch 'ae/anon-fetch-info'

diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 20b44ff9f32df79f64f2513f21777bf591d1c843..e30c602f476da2da632d2cd04396d168c80ab233 100644 (file)
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -96,7 +96,8 @@ Flags are the bitwise-or of:
        `PARSE_OPT_STOP_AT_NON_OPTION` is set, the second argument in
        `--unknown value` will be mistakenly interpreted as a
        non-option, not as a value belonging to the unknown option,
-       stopping the parser early.
+       the parser early.  That's why parse_options() errors out if
+       both options are set.
 
 `PARSE_OPT_NO_INTERNAL_HELP`::
        By default, parse_options() handles `-h`, `--help` and
@@ -197,7 +198,7 @@ The function must be defined in this form:
 
 The callback mechanism is as follows:
 
-* Inside `funct`, the only interesting member of the structure
+* Inside `func`, the only interesting member of the structure
   given by `opt` is the void pointer `opt->value`.
   `\*opt->value` will be the value that is saved into `var`, if you
   use `OPT_CALLBACK()`.