From f6b322979b785a9711a17dcc2170228f8a756c6d Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
Date: Tue, 8 Jul 2014 09:38:48 +0100
Subject: Attempt to improve doc for assignment

---
 Doc/Zsh/grammar.yo |  6 +++++-
 Doc/Zsh/params.yo  | 10 ++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'Doc')

diff --git a/Doc/Zsh/grammar.yo b/Doc/Zsh/grammar.yo
index 719f06a97..77f0098e3 100644
--- a/Doc/Zsh/grammar.yo
+++ b/Doc/Zsh/grammar.yo
@@ -19,7 +19,11 @@ cindex(simple commands)
 cindex(commands, simple)
 A em(simple command) is a sequence of optional parameter
 assignments followed by blank-separated words,
-with optional redirections interspersed.
+with optional redirections interspersed.  For a description
+of assignment, see the beginning of
+ifnzman(noderef(Parameters))\
+ifzman(zmanref(zshparam)).
+
 The first word is the command to be executed, and the remaining
 words, if any, are arguments to the command.
 If a command name is given, the parameter assignments modify
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index 5bccdc2d0..dbac51182 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -21,14 +21,20 @@ indent(var(name)tt(=)var(value))
 
 If the integer attribute, tt(-i), is set for var(name), the var(value)
 is subject to arithmetic evaluation.  Furthermore, by replacing `tt(=)'
-with `tt(+=)', a parameter can be added or appended to.  See
+with `tt(+=)', a parameter can be added or appended to.
+
+In scalar assignment, var(value) is expanded as a single string, in
+which the elements of arrays are joined together; filename expansion is
+not performed unless the option tt(GLOB_ASSIGN) is set.  See
 noderef(Array Parameters) for additional forms of assignment.
 
 To refer to the value of a parameter, write `tt($)var(name)' or
 `tt(${)var(name)tt(})'.  See
 ifzman(em(Parameter Expansion) in zmanref(zshexpn))\
 ifnzman(noderef(Parameter Expansion))
-for complete details.
+for complete details.  This section also explains the effect
+of the difference between scalar and array assignment on parameter
+expansion.
 
 In the parameter lists that follow, the mark `<S>' indicates that the
 parameter is special.
-- 
cgit 1.4.1