about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Doc/Zsh/expn.yo6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5118cace6..79e6c0102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-19  Peter Stephenson  <pws@csr.com>
+
+	* unposted: Doc/Zsh/expn.yo: further splitting clarifications.
+
 2012-10-18  Peter Stephenson  <pws@csr.com>
 
 	* 30740: Doc/Zsh/expn.yo: add example of process substitution
@@ -277,5 +281,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5747 $
+* $Revision: 1.5748 $
 *****************************************************
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index 9d6b5c3b5..da68b4ff7 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -1347,7 +1347,7 @@ 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(11.), and joining
+the string is to be split as given by rule tt(11.), 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
@@ -1387,7 +1387,9 @@ item(tt(17.) em(Lexical word splitting))(
 If the 'tt((z))' flag or one of the forms of the 'tt((Z))' flag is
 present, the word is split as if it were a shell command line, so that
 quotation marks and other metacharacters are used to decide what
-constitutes a word.
+constitutes a word.  Note this form of splitting is entirely distinct
+from that described by rule tt(11.): it does not use tt($IFS), and
+does not cause forced joining.
 )
 item(tt(18.) em(Uniqueness))(
 If the result is an array and the `tt((u))' flag was present, duplicate