summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--Doc/Zsh/builtins.yo2
-rw-r--r--Doc/Zsh/compsys.yo3
-rw-r--r--Doc/Zsh/contrib.yo2
-rw-r--r--Doc/Zsh/expn.yo6
-rw-r--r--Doc/Zsh/options.yo8
-rw-r--r--Doc/Zsh/params.yo4
7 files changed, 25 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 622c19ade..dc5f74aa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-06 Peter Stephenson <pws@csr.com>
+
+ * 26517: Doc/Zsh/builtins.yo, Doc/Zsh/compsys.yo,
+ Doc/Zsh/contrib.yo, Doc/Zsh/expn.yo, Doc/Zsh/options.yo,
+ Doc/Zsh/params.yo: prompt expansion section in Unix manual
+ is actually named EXPANSION OF PROMPT SEQUENCES.
+
2009-02-05 Peter Stephenson <pws@csr.com>
* unposted: fix number in foregoing.
@@ -11083,5 +11090,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4549 $
+* $Revision: 1.4550 $
*****************************************************
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index 6d1547de6..d2f555a9d 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -897,7 +897,7 @@ Print the arguments to the input of the coprocess.
)
item(tt(-P))(
Perform prompt expansion (see
-ifzman(zmanref(zshmisc))\
+ifzman(EXPANSION OF PROMPT SEQUENCES IN zmanref(zshmisc))\
ifnzman(noderef(Prompt Expansion))\
).
)
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index be78b0aa2..3bd5f008a 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -1545,7 +1545,8 @@ string to display above matches in completion lists. The sequence
what these matches are. This string may also contain the following
sequences to specify output attributes,
ifnzman(noderef(Prompt Expansion))\
-ifzman(as described in the section PROMPT EXPANSION in zmanref(zshmisc)):
+ifzman(as described in the section EXPANSION OF PROMPT SEQUENCES in
+zmanref(zshmisc)):
`tt(%B)', `tt(%S)', `tt(%U)', `tt(%F)', `tt(%K)' and their lower case
counterparts, as well as `tt(%{)...tt(%})'. `tt(%F)', `tt(%K)' and
`tt(%{)...tt(%})' take arguments in the same form as prompt
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index 826fb2070..ad8246f12 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -2770,7 +2770,7 @@ The tt(nslookup) function looks up this style in the context
`tt(:nslookup)' to set the prompt and the right-side prompt, respectively.
The usual expansions for the tt(PS1) and tt(RPS1) parameters may be used
(see
-ifzman(zmanref(zshmisc))\
+ifzman(EXPANSION OF PROMPT SEQUENCES in zmanref(zshmisc))\
ifnzman(noderef(Prompt Expansion))\
).
)
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index 1468a3a36..446933e43 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -64,7 +64,7 @@ most recent command is always retained in any case. Each saved command in
the history list is called a history em(event) and is assigned a number,
beginning with 1 (one) when the shell starts up. The history number that
you may see in your prompt (see
-ifzman(Prompt Expansion in zmanref(zshmisc))\
+ifzman(EXPANSION OF PROMPT SEQUENCES in zmanref(zshmisc))\
ifnzman(noderef(Prompt Expansion))\
) is the number that is to be assigned to the em(next) command.
@@ -708,7 +708,9 @@ If the tt(MULTIBYTE) option is set and the number is greater than 127
)
item(tt(%))(
Expand all tt(%) escapes in the resulting words in the same way as in
-prompts (see noderef(Prompt Expansion)). If this flag is given twice,
+prompts (see
+ifzman(EXPANSION OF PROMPT SEQUENCES in zmanref(zshmisc))\
+ifnzman(noderef(Prompt Expansion))). If this flag is given twice,
full prompt expansion is done on the resulting words, depending on the
setting of the tt(PROMPT_PERCENT), tt(PROMPT_SUBST) and tt(PROMPT_BANG)
options.
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index d8c0bb315..0db095727 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -977,7 +977,9 @@ pindex(PROMPT_BANG)
cindex(prompt, ! expansion)
item(tt(PROMPT_BANG) <K>)(
If set, `tt(!)' is treated specially in prompt expansion.
-See noderef(Prompt Expansion).
+See
+ifzman(EXPANSION OF PROMPT SEQUENCES in zmanref(zshmisc))\
+ifnzman(noderef(Prompt Expansion)).
)
pindex(PROMPT_CR)
cindex(prompt, with CR)
@@ -1006,7 +1008,9 @@ pindex(PROMPT_PERCENT)
cindex(prompt, % expansion)
item(tt(PROMPT_PERCENT) <C> <Z>)(
If set, `tt(%)' is treated specially in prompt expansion.
-See noderef(Prompt Expansion).
+See
+ifzman(EXPANSION OF PROMPT SEQUENCES in zmanref(zshmisc))\
+ifnzman(noderef(Prompt Expansion)).
)
pindex(PROMPT_SUBST)
cindex(prompt, parameter expansion)
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index 79db4c613..3da63fa78 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -1031,7 +1031,9 @@ vindex(PS1)
item(tt(PS1) <S>)(
The primary prompt string, printed before a command is read.
the default is `tt(%m%# )'. It undergoes a special form of expansion
-before being displayed; see noderef(Prompt Expansion).
+before being displayed; see
+ifzman(EXPANSION OF PROMPT SEQUENCES in zmanref(zshmisc))\
+ifnzman(noderef(Prompt Expansion)).
)
vindex(PS2)
item(tt(PS2) <S>)(