[Python-checkins] cpython (merge 3.4 -> default): Issue #24077: merge from 3.4

[ned.deily]

https://hg.python.org/cpython/rev/493b3310d5d0
changeset:   95824:493b3310d5d0
parent:      95822:293d9964cf6e
parent:      95823:d774401879d8
user:        Ned Deily <nad at acm.org>
date:        Wed Apr 29 14:53:34 2015 -0700
summary:
  Issue #24077: merge from 3.4

files:
  Misc/NEWS       |  2 ++
  Misc/python.man |  2 +-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -49,6 +49,8 @@
 
 - Issue #24029: Document the name binding behavior for submodule imports.
 
+- Issue #24077: Fix typo in man page for -I command option: -s, not -S
+
 Tools/Demos
 -----------
 
diff --git a/Misc/python.man b/Misc/python.man
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -143,7 +143,7 @@
 raises an exception.
 .TP
 .B \-I
-Run Python in isolated mode. This also implies \fB\-E\fP and \fB\-S\fP. In
+Run Python in isolated mode. This also implies \fB\-E\fP and \fB\-s\fP. In
 isolated mode sys.path contains neither the script’s directory nor the user’s
 site-packages directory. All PYTHON* environment variables are ignored, too.
 Further restrictions may be imposed to prevent the user from injecting

-- 
Repository URL: https://hg.python.org/cpython