changeset:   95824:493b3310d5d0
parent:      95822:293d9964cf6e
parent:      95823:d774401879d8
user:        Ned Deily <nad@acm.org>
date:        Wed Apr 29 14:53:34 2015 -0700
files:       Misc/NEWS Misc/python.man
description:
Issue #24077: merge from 3.4


diff -r 293d9964cf6e -r 493b3310d5d0 Misc/NEWS
--- a/Misc/NEWS	Tue Apr 28 00:04:53 2015 -0400
+++ b/Misc/NEWS	Wed Apr 29 14:53:34 2015 -0700
@@ -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 -r 293d9964cf6e -r 493b3310d5d0 Misc/python.man
--- a/Misc/python.man	Tue Apr 28 00:04:53 2015 -0400
+++ b/Misc/python.man	Wed Apr 29 14:53:34 2015 -0700
@@ -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