summary refs log tree commit diff
diff options
context:
space:
mode:
authorHan Pingtian <hanpt@linux.vnet.ibm.com>2015-03-27 07:05:00 +0800
committerPeter Stephenson <pws@zsh.org>2015-03-27 10:36:45 +0000
commit26cfae830c076dff8289b8a8edc6580b285286de (patch)
treed726070d8e438b29839f7ace4f5dd67e2a4beb38
parente6a6505dc45078ff41800e61ab18da58aec41e7f (diff)
downloadzsh-26cfae830c076dff8289b8a8edc6580b285286de.tar.gz
zsh-26cfae830c076dff8289b8a8edc6580b285286de.tar.xz
zsh-26cfae830c076dff8289b8a8edc6580b285286de.zip
34785: fix typo in SHINSTDIN doc
-rw-r--r--ChangeLog2
-rw-r--r--Doc/Zsh/options.yo2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 490499a8d..75ed142af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-03-27  Peter Stephenson  <p.stephenson@samsung.com>
 
+	* Han Pingtian: 34785: Doc/Zsh/options.yo: fix typo in SHINSTDIN.
+
 	* 34787: Test/W01history.ztst: new tests.
 
 2015-03-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index 8a0222cfd..359ecb94e 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -2248,7 +2248,7 @@ taken as a file to run will instead be treated as a normal positional
 parameter.
 Note that setting or unsetting this option on the command line does not
 necessarily affect the state the option will have while the shell is
-running - that is purely an indicator of whether on not commands are
+running - that is purely an indicator of whether or not commands are
 em(actually) being read from standard input.
 The value of this option can only be changed via flags supplied at
 invocation of the shell.