summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-12-16 13:55:35 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-12-16 13:55:35 +0000
commit246bcd10a7aeb54094ba02f032e682b759ee4b0b (patch)
treeff0c44d891e9a0b2c1fa0cfbc6d9ccb94112b9db
parent796501f44095b9099609008c91bacbc7d01f1e7d (diff)
downloadzsh-246bcd10a7aeb54094ba02f032e682b759ee4b0b.tar.gz
zsh-246bcd10a7aeb54094ba02f032e682b759ee4b0b.zip
Mikael: 28531: typos
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Base/Utility/_combination2
-rw-r--r--Doc/Zsh/expn.yo2
-rw-r--r--Doc/Zsh/mod_clone.yo2
-rw-r--r--Doc/Zsh/options.yo2
-rw-r--r--Src/exec.c2
6 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index cd85135ce..b753aa08b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-12-16 Peter Stephenson <pws@csr.com>
+ * Mikael: 28531: Completion/Base/Utility/_combination,
+ Doc/Zsh/expn.yo, Doc/Zsh/mod_clone.yo, Doc/Zsh/options.yo,
+ Src/exec.c: typos.
+
* unposted: NEWS: add notes on (Z) parameter flag.
* unposted: README, Config/version.mk, Etc/FAQ.yo,
@@ -13970,5 +13974,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5154 $
+* $Revision: 1.5155 $
*****************************************************
diff --git a/Completion/Base/Utility/_combination b/Completion/Base/Utility/_combination
index d47d4ce31..5e87b31e2 100644
--- a/Completion/Base/Utility/_combination
+++ b/Completion/Base/Utility/_combination
@@ -8,7 +8,7 @@
#
# Example: telnet
#
-# Assume an user sets the style `users-hosts-ports' as for the my-accounts
+# Assume a user sets the style `users-hosts-ports' as for the my-accounts
# tag:
#
# zstyle ':completion:*:*:telnet:*:my-accounts' users-hosts-ports \
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index 1814d6c49..cb11e4a36 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -1067,7 +1067,7 @@ be given, in which case widths will be used for the calculation of
padding; otherwise individual multibyte characters are treated as occupying
one unit of width.
-IF the tt(MULTIBYTE) option is not in effect, each byte in the string is
+If the tt(MULTIBYTE) option is not in effect, each byte in the string is
treated as occupying one unit of width.
Control characters are always assumed to be one unit wide; this allows the
diff --git a/Doc/Zsh/mod_clone.yo b/Doc/Zsh/mod_clone.yo
index 1124958f2..a0bf42b17 100644
--- a/Doc/Zsh/mod_clone.yo
+++ b/Doc/Zsh/mod_clone.yo
@@ -37,7 +37,7 @@ as a controlling tty. That means two things:
This does not apply when cloning to an bf(unused) vc.
-Cloning to an used (and unprepared) terminal will result in two
+Cloning to a used (and unprepared) terminal will result in two
processes reading simultaneously from the same terminal, with
input bytes going randomly to either process.
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index eb5ce37cb..a96597157 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -1579,7 +1579,7 @@ example(unsetopt localtraps
trap - INT
fn+LPAR()RPAR() { setopt localtraps; trap '' INT; sleep 3; })
-will restore normally handling of tt(SIGINT) after the function exits.
+will restore normal handling of tt(SIGINT) after the function exits.
)
pindex(MULTI_FUNC_DEF)
pindex(NO_MULTI_FUNC_DEF)
diff --git a/Src/exec.c b/Src/exec.c
index 85d996bd4..4576fc031 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -3325,7 +3325,7 @@ save_params(Estate state, Wordcode pc, LinkList *restore_p, LinkList *remove_p)
* been done at this point. Instead, copy the
* parameter: in this case, we'll insert the
* copied parameter straight back into the parameter
- * table so we wan't to be sure everything is
+ * table so we want to be sure everything is
* properly set up and in permanent memory.
*/
tpm = (Param) zshcalloc(sizeof *tpm);