about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-03-26 15:21:39 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-03-26 15:21:39 +0000
commit7df454402cbcdb6cccb082c97207eed5e3896583 (patch)
tree61b4d5c81dd7a19ac1233d5e048d0fbc71c7d4cc
parentaa529d0032ed64867fd27431a9c27c999891bbc3 (diff)
downloadzsh-7df454402cbcdb6cccb082c97207eed5e3896583.tar.gz
zsh-7df454402cbcdb6cccb082c97207eed5e3896583.tar.xz
zsh-7df454402cbcdb6cccb082c97207eed5e3896583.zip
26797: yet more changes to posix_aliases information
-rw-r--r--ChangeLog4
-rw-r--r--Doc/Zsh/options.yo11
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b7cc750c5..fb730662d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-03-26  Peter Stephenson  <pws@csr.com>
 
+	* 26797: Doc/Zsh/options.yo: further minor changes.
+
 	* 26795: Doc/Zsh/options.yo: further warning in POSIX_ALIASES.
 
 2009-03-25  Peter Stephenson  <pws@csr.com>
@@ -11497,5 +11499,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4639 $
+* $Revision: 1.4640 $
 *****************************************************
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index cdce05aad..6b3ba34e8 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -1721,12 +1721,13 @@ ifzman(the section RESERVED WORDS in zmanref(zshmisc)).
 
 Alias expansion takes place while text is being read; hence when this
 option is set it does not take effect until the end of any function or
-other piece of shell code evaluated as one unit.  Note this may
+other piece of shell code parsed as one unit.  Note this may
 cause differences from other shells even when the option is in
-effect.  For example, when running a command with `tt(zsh -c)' the
-entire command argument is parsed in one go, so aliases defined within
-the argument are not available even in later lines.  If in doubt, avoid use
-of aliases in non-interactive code.
+effect.  For example, when running a command with `tt(zsh -c)',
+or even `tt(zsh -o posixaliases -c)', the entire command argument is parsed
+as one unit, so aliases defined within the argument are not available even
+in later lines.  If in doubt, avoid use of aliases in non-interactive
+code.
 )
 pindex(POSIX_BUILTINS)
 pindex(NO_POSIX_BUILTINS)