diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Doc/Zsh/builtins.yo | 2 | ||||
| -rw-r--r-- | Doc/Zsh/expn.yo | 4 | ||||
| -rw-r--r-- | Doc/Zsh/options.yo | 6 | ||||
| -rw-r--r-- | Doc/Zsh/prompt.yo | 19 |
5 files changed, 21 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index 878258130..08958f2aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-12-06 Peter Stephenson <pws@csr.com> + * Mikael: 28487: Doc/Zsh/builtins.yo, Doc/Zsh/expn.yo, + Doc/Zsh/options.yo, Doc/Zsh/prompt.yo: fix docs to refer to + current directory rather than $PWD. + * 28486: Src/Zle/compcore.c: $compstate[parameter] needed untokenizing. @@ -13906,5 +13910,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5142 $ +* $Revision: 1.5143 $ ***************************************************** diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo index 02071fbeb..3be4a8b21 100644 --- a/Doc/Zsh/builtins.yo +++ b/Doc/Zsh/builtins.yo @@ -169,7 +169,7 @@ item(tt(cd) [ tt(-qsLP) ] {tt(PLUS())|tt(-)}var(n))( Change the current directory. In the first form, change the current directory to var(arg), or to the value of tt($HOME) if var(arg) is not specified. If var(arg) is `tt(-)', change to the -value of tt($OLDPWD), the previous directory. +previous directory. Otherwise, if var(arg) begins with a slash, attempt to change to the directory given by var(arg). diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo index bae3736a9..aadc72dfc 100644 --- a/Doc/Zsh/expn.yo +++ b/Doc/Zsh/expn.yo @@ -1472,8 +1472,8 @@ described here. If so, then the `tt(~)' and the checked portion are replaced with the appropriate substitute value. A `tt(~)' by itself is replaced by the value of tt($HOME). -A `tt(~)' followed by a `tt(PLUS())' or a `tt(-)' is replaced by the value of -tt($PWD) or tt($OLDPWD), respectively. +A `tt(~)' followed by a `tt(PLUS())' or a `tt(-)' is replaced by current +or previous working directory, respectively. A `tt(~)' followed by a number is replaced by the directory at that position in the directory stack. diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index 467c92723..eb5ce37cb 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -93,9 +93,9 @@ item(tt(CHASE_DOTS))( When changing to a directory containing a path segment `tt(..)' which would otherwise be treated as canceling the previous segment in the path (in other words, `tt(foo/..)' would be removed from the path, or if `tt(..)' is -the first part of the path, the last part of tt($PWD) would be deleted), -instead resolve the path to the physical directory. This option is -overridden by tt(CHASE_LINKS). +the first part of the path, the last part of the current working directory +would be removed), instead resolve the path to the physical directory. +This option is overridden by tt(CHASE_LINKS). For example, suppose tt(/foo/bar) is a link to the directory tt(/alt/rod). Without this option set, `tt(cd /foo/bar/..)' changes to tt(/foo); with it diff --git a/Doc/Zsh/prompt.yo b/Doc/Zsh/prompt.yo index e55338e5f..8d7979546 100644 --- a/Doc/Zsh/prompt.yo +++ b/Doc/Zsh/prompt.yo @@ -93,16 +93,17 @@ continuation lines and tt(PS4) for debugging with the tt(XTRACE) option; in the latter case it will also work non-interactively. ) xitem(tt(%d)) -item(tt(%/))( -Present working directory (tt($PWD)). If an integer follows the `tt(%)', -it specifies a number of trailing components of tt($PWD) to show; zero -means the whole path. A negative integer specifies leading components, -i.e. tt(%-1d) specifies the first component. +item(tt(/))( +Current working directory. If an integer follows the `tt(%)', +it specifies a number of trailing components of the current working +directory to show; zero means the whole path. A negative integer +specifies leading components, i.e. tt(%-1d) specifies the first component. ) item(tt(%~))( -As tt(%d) and tt(%/), but if tt($PWD) has a named directory as its prefix, -that part is replaced by a `tt(~)' followed by the name of the directory. -If it starts with tt($HOME), that part is replaced by a `tt(~)'. +As tt(%d) and tt(%/), but if the current working directory has a named +directory as its prefix, that part is replaced by a `tt(~)' followed by +the name of the directory. If it starts with tt($HOME), that part is +replaced by a `tt(~)'. ) xitem(tt(%h)) item(tt(%!))( @@ -139,7 +140,7 @@ names are not shown, instead the file where they were defined. xitem(tt(%c)) xitem(tt(%.)) item(tt(%C))( -Trailing component of tt($PWD). +Trailing component of the current working directory. An integer may follow the `tt(%)' to get more than one component. Unless `tt(%C)' is used, tilde contraction is performed first. These are deprecated as tt(%c) and tt(%C) are equivalent to tt(%1~) and tt(%1/), |