about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2015-05-26 23:12:37 +0900
committerJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2015-05-26 23:12:37 +0900
commit0a97508bf64f0a5311d67d2a53a9d05147947b8c (patch)
tree66868c924b0f422135ce6a1d596d2a6564b8cc28
parent899613f5351642c8257401054fef5f25725af172 (diff)
downloadzsh-0a97508bf64f0a5311d67d2a53a9d05147947b8c.tar.gz
zsh-0a97508bf64f0a5311d67d2a53a9d05147947b8c.tar.xz
zsh-0a97508bf64f0a5311d67d2a53a9d05147947b8c.zip
35289: fix typos in the description of emulate
based on 34981 by Han Pingtian
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/builtins.yo4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dd0511c67..c226c1e42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-26  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+
+	* 35289: Doc/Zsh/builtions.yo: fix typos in the description
+	of emulate builtin (based on 34981 by Han Pingtian)
+
 2015-05-26  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* see 35268: revert 34476 (ae7dcab) as it seems to be having
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index 1b8729d7a..a2c03bcc4 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -551,8 +551,8 @@ fno
 
 The two functions tt(fni) and tt(fno) are defined with sticky tt(sh)
 emulation.  tt(fno) is then executed, causing options associated
-with emulations to be set to their values in tt(sh).  tt(fni) then
-calls tt(fno); because tt(fno) is also marked for sticky tt(sh)
+with emulations to be set to their values in tt(sh).  tt(fno) then
+calls tt(fni); because tt(fni) is also marked for sticky tt(sh)
 emulation, no option changes take place on entry to or exit from it.
 Hence the option tt(cshnullglob), turned off by tt(sh) emulation, will
 be turned on within tt(fni) and remain on on return to tt(fno).  On exit