about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Doc/Zsh/builtins.yo8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 009d65195..4b5a0b8df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-24  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* Daniel Hahler: 33746: Doc/Zsh/builtins.yo: read -q refers to -t.
+
 2014-11-24  Mikael Magnusson  <mikachu@gmail.com>
 
 	* 33785: Src/Modules/tcp.c: Fix leaks of desthost in ztcp.
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index edc335e8b..446312395 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -1294,10 +1294,10 @@ item(tt(-q))(
 Read only one character from the terminal and set var(name) to
 `tt(y)' if this character was `tt(y)' or `tt(Y)' and to `tt(n)' otherwise.
 With this flag set the return status is zero only if the character was
-`tt(y)' or `tt(Y)'.  This option may be used with a timeout; if
-the read times out, or encounters end of file, status 2 is returned.
-Input is read from the terminal unless one of tt(-u)
-or tt(-p) is present.  This option may also be used within zle widgets.
+`tt(y)' or `tt(Y)'.  This option may be used with a timeout (see tt(-t)); if
+the read times out, or encounters end of file, status 2 is returned.  Input is
+read from the terminal unless one of tt(-u) or tt(-p) is present.  This option
+may also be used within zle widgets.
 )
 item(tt(-k) [ var(num) ])(
 Read only one (or var(num)) characters.  All are assigned to the first