diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Doc/Zsh/contrib.yo | 2 | ||||
| -rw-r--r-- | Doc/Zsh/expn.yo | 2 | ||||
| -rw-r--r-- | Functions/Chpwd/cdr | 2 | ||||
| -rw-r--r-- | Src/builtin.c | 2 | ||||
| -rw-r--r-- | Src/prompt.c | 2 |
6 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 69b892566..7e6a794b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-03-04 Frank Terbeck <ft@bewatermyfriend.org> + + * 28853: Doc/Zsh/contrib.yo, Doc/Zsh/expn.yo, Functions/Chpwd/cdr, + Src/builtin.c, Src/prompt.c: Fix typo: preceed -> precede + 2011-03-02 Barton E. Schaefer <schaefer@zsh.org> * 28805: Doc/Zsh/builtins.yo, Doc/Zsh/mod_sched.yo: move stray @@ -1272,7 +1277,7 @@ * users/15011: Completion/Unix/Type/_path_files, Doc/Zsh/compsys.yo: add path-completion style to allow - completion of preceeding directories in files to be be turned + completion of preceding directories in files to be be turned off. 2010-04-13 Peter Stephenson <pws@csr.com> @@ -14287,5 +14292,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5213 $ +* $Revision: 1.5214 $ ***************************************************** diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index 926c7b3c4..c5808fbeb 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -355,7 +355,7 @@ subsect(Use) All direct user interaction is via the tt(cdr) function. The argument to cdr is a number var(N) corresponding to the var(N)th most -recently changed-to directory. 1 is the immediately preceeding directory; +recently changed-to directory. 1 is the immediately preceding directory; the current directory is remembered but is not offered as a destination. Note that if you have multiple windows open 1 may refer to a directory changed to in another window; you can avoid this by having per-terminal diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo index d246c3c23..9c4491386 100644 --- a/Doc/Zsh/expn.yo +++ b/Doc/Zsh/expn.yo @@ -381,7 +381,7 @@ Each part of a command argument that takes the form `tt(<LPAR())var(list)tt(RPAR())', `tt(>LPAR())var(list)tt(RPAR())' or `tt(=LPAR())var(list)tt(RPAR())' -is subject to process substitution. The expression may be preceeded +is subject to process substitution. The expression may be preceded or followed by other strings except that, to prevent clashes with commonly occurring strings and patterns, the last form must occur at the start of a command argument, and the forms diff --git a/Functions/Chpwd/cdr b/Functions/Chpwd/cdr index 3025a9d5c..4f399106b 100644 --- a/Functions/Chpwd/cdr +++ b/Functions/Chpwd/cdr @@ -15,7 +15,7 @@ # changing directory permanently, see below. # # The argument to cdr is a number corresponding to the Nth most recently -# changed-to directory starting at 1 for the immediately preceeding +# changed-to directory starting at 1 for the immediately preceding # directory (the current directory is remembered but is not offered as a # destination). You can use directory arguments if you set the # recent-dirs-default style, see below; however, it should be noted diff --git a/Src/builtin.c b/Src/builtin.c index 6dbfa75ca..cda5e68cb 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -4713,7 +4713,7 @@ zexit(int val, int from_where) */ in_exit = -1; /* - * We want to do all remaining processing regardless of preceeding + * We want to do all remaining processing regardless of preceding * errors. */ errflag = 0; diff --git a/Src/prompt.c b/Src/prompt.c index a91ac541f..715f4b503 100644 --- a/Src/prompt.c +++ b/Src/prompt.c @@ -1205,7 +1205,7 @@ prompttrunc(int arg, int truncchar, int doprint, int endchar, if (truncatleft) { /* * To truncate at the left, selectively copy - * maxwidth bytes from the main prompt, preceeded + * maxwidth bytes from the main prompt, preceded * by the truncation string in full. * * We're overwriting the string containing the |