diff options
| author | Ned Deily <nad@acm.org> | 2015-04-29 21:53:34 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2015-04-29 21:53:34 (GMT) |
| commit | 919587090cb360594c48eb7a554018d238965ff2 (patch) | |
| tree | 38aaf1d0c6008c4effce1b91ffde7ed2bd17fd3e | |
| parent | a567e564ec128fbdb1324b0b0053a4b8a83687ad (diff) | |
| parent | 64298ae62ef9c8044e175bd4e5062819e1a0f225 (diff) | |
| download | cpython-919587090cb360594c48eb7a554018d238965ff2.zip cpython-919587090cb360594c48eb7a554018d238965ff2.tar.gz cpython-919587090cb360594c48eb7a554018d238965ff2.tar.bz2 | |
Issue #24077: merge from 3.4
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Misc/python.man | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 ----------- diff --git a/Misc/python.man b/Misc/python.man index fecd802..0b736ef 100644 --- a/Misc/python.man +++ b/Misc/python.man @@ -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 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 |