Merge branch 'cu/doc-api-parse-options' into jch

The documentation for the parse-options API has been corrected to
restore a missing word.

* cu/doc-api-parse-options:
  api-parse-options.adoc: restore a dropped word

Documentation/technical/api-parse-options.adoc

@@ -127,8 +127,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,
-	the parser early.  That's why parse_options() errors out if
-	both options are set.
+	stopping the parser early.  That's why parse_options() errors
+	out if both options are set.
 	Note that non-option arguments are always kept, even without
 	this flag.