about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/grammar.yo2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 431c868c2..58e1ffa2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-09  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* Eric Cook: 32602: Doc/Zsh/grammar.yo: status of try + always
+	block is from the former, not the latter.
+
 2014-05-08  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* m0viefreak: 32600: Src/Zle/computil.c: fix problem with
diff --git a/Doc/Zsh/grammar.yo b/Doc/Zsh/grammar.yo
index b452e4cc9..dde67ebcb 100644
--- a/Doc/Zsh/grammar.yo
+++ b/Doc/Zsh/grammar.yo
@@ -312,7 +312,7 @@ during the tt(try-list) is not useful (unless this forms part of an
 enclosing tt(always) block).
 
 Regardless of tt(TRY_BLOCK_ERROR), after the end of tt(always-list) the
-normal shell status tt($?) is the value returned from tt(always-list).
+normal shell status tt($?) is the value returned from tt(try-list).
 This will be non-zero if there was an error, even if tt(TRY_BLOCK_ERROR)
 was set to zero.