Issue #24077: merge from 3.4

This commit is contained in:
Ned Deily 2015-04-29 14:53:34 -07:00
commit 919587090c
2 changed files with 3 additions and 1 deletions

View File

@ -49,6 +49,8 @@ Documentation
- 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
-----------

View File

@ -143,7 +143,7 @@ useful to inspect global variables or a stack trace when a script
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 scripts directory nor the users
site-packages directory. All PYTHON* environment variables are ignored, too.
Further restrictions may be imposed to prevent the user from injecting