summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2010-10-13 02:24:17 +0000
committerBart Schaefer <barts@users.sourceforge.net>2010-10-13 02:24:17 +0000
commit69134f18cb27ae6a3d8de4c45a77f6da714df3f9 (patch)
tree3fca7714b5a5bd05559de453a9943ae7bf1ec974
parent7a4d9bba556080cba92e5e17a78039816df922f7 (diff)
downloadzsh-69134f18cb27ae6a3d8de4c45a77f6da714df3f9.tar.gz
zsh-69134f18cb27ae6a3d8de4c45a77f6da714df3f9.zip
unposted: fix cross-references in doc for parameter substitution rules
-rw-r--r--ChangeLog7
-rw-r--r--Doc/Zsh/expn.yo6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 80040e5a9..9c54b4d9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-12 Barton E. Schaefer <schaefer@zsh.org>
+
+ * unposted (users/15440): Doc/Zsh/expn.yo: fix cross-references
+ among parameter expansion rules.
+
2010-10-12 Peter Stephenson <pws@csr.com>
* Mikael: 28343: Completion/Unix/Command/_setfacl: didn't
@@ -13744,5 +13749,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5104 $
+* $Revision: 1.5105 $
*****************************************************
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index 96ab133cc..023842a1f 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -1168,7 +1168,7 @@ joining instead of tt($IFS).
item(tt(6.) em(Nested Subscripting))(
Any remaining subscripts (i.e. of a nested substitution) are evaluated at
this point, based on whether the value is an array or a scalar. As with
-tt(2.), multiple subscripts can appear. Note that tt(${foo[2,4][2]}) is
+tt(3.), multiple subscripts can appear. Note that tt(${foo[2,4][2]}) is
thus equivalent to tt(${${foo[2,4]}[2]}) and also to
tt("${${(@)foo[2,4]}[2]}") (the nested substitution returns an array in
both cases), but not to tt("${${foo[2,4]}[2]}") (the nested substitution
@@ -1190,8 +1190,8 @@ used to evaluate the length of the expression so far.
)
item(tt(10.) em(Forced Joining))(
If the `tt((j))' flag is present, or no `tt((j))' flag is present but
-the string is to be split as given by rules tt(8.) or tt(9.), and joining
-did not take place at step tt(4.), any words in the value are joined
+the string is to be split as given by rules tt(16.) or tt(17.), and joining
+did not take place at step tt(5.), any words in the value are joined
together using the given string or the first character of tt($IFS) if none.
Note that the `tt((F))' flag implicitly supplies a string for joining in this
manner.