summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-01-16 16:27:50 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-01-16 16:27:50 +0000
commita2c89eb701e5ec3ffca33f25673a9600a9735930 (patch)
treea98ee0f44498ca745fceee52a56208b5e724af1a
parentd7d6a72673504a956de67e47f5e525e85cf6cd81 (diff)
downloadzsh-a2c89eb701e5ec3ffca33f25673a9600a9735930.tar.gz
zsh-a2c89eb701e5ec3ffca33f25673a9600a9735930.tar.xz
zsh-a2c89eb701e5ec3ffca33f25673a9600a9735930.zip
Frank: 27599: fix formatting documentation for VCS_Info.
-rw-r--r--ChangeLog7
-rw-r--r--Doc/Zsh/contrib.yo4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e2f1c36e..35600b5e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-16  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* Frank: 27599: Doc/Zsh/contrib.yo: fix formatting documentation
+	for VCS_Info.
+
 2010-01-13  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* Mikael: 27597: Completion/Zsh/Command/_zstyle: accepting
@@ -12580,5 +12585,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4861 $
+* $Revision: 1.4862 $
 *****************************************************
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index b7dd4a709..4ca85fc66 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -615,8 +615,8 @@ enditem()
 The default values for these styles in all contexts are:
 
 startsitem()
-sitem(tt(formats))(" (%s)-[%b|%a]-")
-sitem(tt(actionformats))(" (%s)-[%b]-")
+sitem(tt(formats))(" (%s)-[%b]-")
+sitem(tt(actionformats))(" (%s)-[%b|%a]-")
 sitem(tt(branchformat))("%b:%r" (for bzr, svn, svk and hg))
 sitem(tt(nvcsformats))("")
 sitem(tt(stgitformat))(" %p (%c)")