about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSimon Ruderich <rudi_s@users.sourceforge.net>2012-03-23 16:37:55 +0000
committerSimon Ruderich <rudi_s@users.sourceforge.net>2012-03-23 16:37:55 +0000
commitff4b48e001640914d4a2cd8281c774828c46c27c (patch)
tree1aaf0d6ee5b5c2b4cd04ed6eddbb270188e0ec26
parentd5db14e3c99f6fb11d839bea017c76276f98cb81 (diff)
downloadzsh-ff4b48e001640914d4a2cd8281c774828c46c27c.tar.gz
zsh-ff4b48e001640914d4a2cd8281c774828c46c27c.tar.xz
zsh-ff4b48e001640914d4a2cd8281c774828c46c27c.zip
30367: Doc/Zsh/contrib.yo: vcs_info, mention settings used for patch-format/nopatch-format.
-rw-r--r--ChangeLog4
-rw-r--r--Doc/Zsh/contrib.yo4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e2e97b48..069635aeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2012-03-23  Simon Ruderich  <simon@ruderich.org>
 
 	* 30366: Misc/vcs_info-examples: Fix outdated quilt examples.
+	* 30367: Doc/Zsh/contrib.yo: vcs_info, mention settings used for
+	patch-format/nopatch-format.
 
 2012-03-13  Peter Stephenson  <pws@csr.com>
 
@@ -16106,5 +16108,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5610 $
+* $Revision: 1.5611 $
 *****************************************************
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index aee0bd7f4..6316b2edd 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -999,8 +999,8 @@ endsitem()
 In tt(patch-format) and tt(nopatch-format) these replacements are done:
 
 startsitem()
-sitem(tt(%p))(The name of the top-most applied patch.)
-sitem(tt(%u))(The number of unapplied patches.)
+sitem(tt(%p))(The name of the top-most applied patch (tt(applied-string)).)
+sitem(tt(%u))(The number of unapplied patches (tt(unapplied-string)).)
 sitem(tt(%n))(The number of applied patches.)
 sitem(tt(%c))(The number of unapplied patches.)
 sitem(tt(%g))(The names of active tt(mq) guards (tt(hg) backend).)