merge

722db7bd · Brett Cannon · 65992c1c · 1740afde · 722db7bd · 722db7bd
Commit 722db7bd authored Jan 26, 2012 by Brett Cannon
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Doc/using/cmdline.rst Doc/using/cmdline.rst +1 -1

Misc/NEWS Misc/NEWS +2 -0

No files found.
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -448,7 +448,7 @@ These environment variables influence Python's behavior.
 .. envvar:: PYTHONCASEOK

   If this is set, Python ignores case in :keyword:`import` statements.  This
-   only works on Windows.
+   only works on Windows, OS X, and OS/2.


 .. envvar:: PYTHONDONTWRITEBYTECODE

--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -435,6 +435,8 @@ Extension Modules
 Documentation
 -------------

+- Issue #13883: PYTHONCASEOK also used on OS X and OS/2.
+
 - Issue #12949: Document the kwonlyargcount argument for the PyCode_New
  C API function.