about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Doc/Zsh/contrib.yo4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f8fdf8da..728b80503 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-27  Frank Terbeck  <ft@bewatermyfriend.org>
+
+	* 34419: Doc/Zsh/contrib.yo: vcs_info documentation: Fix wording
+
 2015-01-27  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* Daniel Shahaf: 34412: Completion/Unix/Command/_chown: complete
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index 120efa20f..4f6c437c9 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -1422,8 +1422,8 @@ This hook is used when tt(vcs_info)'s quilt functionality is active in "addon"
 mode (quilt used on top of a real version control system). It is activated
 right before any quilt specific action is taken.
 
-Setting the `tt(ret)' variable in this hook to a non-zero value avoids the
-quilt specific to be run at all.
+Setting the `tt(ret)' variable in this hook to a non-zero value avoids any
+quilt specific actions from being run at all.
 )
 item(tt(set-patch-format))(
 This hook is used to control some of the possible expansions in