summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Terbeck <bewater@users.sourceforge.net>2010-03-11 12:39:38 +0000
committerFrank Terbeck <bewater@users.sourceforge.net>2010-03-11 12:39:38 +0000
commitff22b24f1b413cb0f17fa49459b65b5539b666cc (patch)
treed2712659773f2b74e66ff7c126d33136bc32f6eb
parent00e507fc0eb53fb00f34e55cd89bef4cfffa8663 (diff)
downloadzsh-ff22b24f1b413cb0f17fa49459b65b5539b666cc.tar.gz
zsh-ff22b24f1b413cb0f17fa49459b65b5539b666cc.zip
Simon Ruderich: 27779: Fix mistakes in vcs_info's documentation.
-rw-r--r--ChangeLog7
-rw-r--r--Doc/Zsh/contrib.yo10
-rw-r--r--Functions/VCS_Info/vcs_info_printsys2
3 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 900f84219..d85c25f8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-11 Frank Terbeck <ft@bewatermyfriend.org>
+
+ * Simon Ruderich: 27779: Functions/VCS_Info/vcs_info_printsys,
+ Doc/Zsh/contrib.yo: Fix mistakes in vcs_info's documentation.
+
2010-03-09 Peter Stephenson <pws@csr.com>
* unposted: Doc/Zsh/calsys.yo, Functions/Calendar/calendar,
@@ -12877,5 +12882,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4926 $
+* $Revision: 1.4927 $
*****************************************************
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index e77fc13cc..88a052203 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -389,7 +389,7 @@ svn
tla
## flavours (cannot be used in the enable or disable styles; they
## are enabled and disabled with their master [git-svn -> git])
-## they *can* be used contexts: ':vcs_info:git-svn:*'.
+## they *can* be used in contexts: ':vcs_info:git-svn:*'.
git-p4
git-svn)
@@ -476,7 +476,7 @@ kindex(branchformat)
item(tt(branchformat))(
Some backends replace var(%b) in the formats and
actionformats styles above, not only by a branch name but also by a
-revision number. This style let's you modify how that string should look
+revision number. This style lets you modify how that string should look
like.
)
kindex(nvcsformats)
@@ -491,7 +491,7 @@ kindex(stgitformat)
item(tt(stgitformat))(
The tt(git) backend replaces var(%m) in the formats and
actionformats styles with tt(stgit)-specific information for
-tt(stgit)-initialized branches. This style let's you modify how that string
+tt(stgit)-initialized branches. This style lets you modify how that string
should look like.
)
kindex(hgrevformat)
@@ -503,7 +503,7 @@ useful when var(get-revision) is true.
)
kindex(max-exports)
item(tt(max-exports))(
-Defines the maximum number if
+Defines the maximum number of
var(vcs_info_msg_*_) variables var(vcs_info) will export.
)
kindex(enable)
@@ -676,7 +676,7 @@ sitem(tt(%R))(base directory of the repository.)
sitem(tt(%r))(repository name. If tt(%R) is var(/foo/bar/repoXY), tt(%r) is
var(repoXY).)
sitem(tt(%S))(subdirectory within a repository. If tt($PWD) is
-var(/foo/bar/reposXY/beer/tasty), tt(%S) is var(beer/tasty).)
+var(/foo/bar/repoXY/beer/tasty), tt(%S) is var(beer/tasty).)
sitem(tt(%m))(A "misc" replacement. It is at the discretion of the backend
to decide what this replacement expands to. It is currently used by
the tt(hg) and tt(git) backends. The tt(hg) backend replaces tt(%m) with the
diff --git a/Functions/VCS_Info/vcs_info_printsys b/Functions/VCS_Info/vcs_info_printsys
index d457f09c5..f29061463 100644
--- a/Functions/VCS_Info/vcs_info_printsys
+++ b/Functions/VCS_Info/vcs_info_printsys
@@ -37,7 +37,7 @@ done
print -l '## flavours (cannot be used in the enable or disable styles; they' \
'## are enabled and disabled with their master [git-svn -> git])' \
- '## they *can* be used contexts: '\'':vcs_info:git-svn:*'\''.'
+ '## they *can* be used in contexts: '\'':vcs_info:git-svn:*'\''.'
for sys in ${VCS_INFO_backends} ; do
VCS_INFO_detect_${sys} --flavours