about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/builtins.yo4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e031a065..d51b6d12e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-19  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* Darel Henman: users/14412: Doc/Zsh/builtins.yo: fix confusions
+	in explanation of getopts option arguments.
+
 	* Holger Weiss: 27281: Doc/Zsh/expn.yo: example of global
 	history substitution was wrong.
 
@@ -12189,5 +12192,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4782 $
+* $Revision: 1.4783 $
 *****************************************************
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index b93257058..5ca4ae612 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -671,7 +671,7 @@ a `tt(PLUS())' or a `tt(-)', or the argument `tt(-)tt(-)', ends the options.
 Note that a single `tt(-)' is not considered a valid option argument.
 var(optstring) contains the letters that tt(getopts)
 recognizes.  If a letter is followed by a `tt(:)', that option
-is expected to have an argument.  The options can be
+requires an argument.  The options can be
 separated from the argument by blanks.
 
 Each time it is invoked, tt(getopts) places the option letter it finds
@@ -692,7 +692,7 @@ stored.  The option itself is still stored in var(name) in this case.
 
 A leading `tt(:)' in var(optstring) causes tt(getopts) to store the
 letter of any invalid option in tt(OPTARG), and to set var(name) to
-`tt(?)' for an unknown option and to `tt(:)' when a required option is
+`tt(?)' for an unknown option and to `tt(:)' when a required argument is
 missing.  Otherwise, tt(getopts) sets var(name) to `tt(?)' and prints
 an error message when an option is invalid.  The exit status is
 nonzero when there are no more options.