[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #24962: Merge 3.4

[zach.ware]

https://hg.python.org/cpython/rev/84c3188f6e1e
changeset:   97546:84c3188f6e1e
branch:      3.5
parent:      97542:81222106eabe
parent:      97545:2de6fba18ff6
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Sat Aug 29 22:26:54 2015 -0500
summary:
  Issue #24962: Merge 3.4

files:
  Doc/using/mac.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
--- a/Doc/using/mac.rst
+++ b/Doc/using/mac.rst
@@ -102,8 +102,9 @@
 Python on OS X honors all standard Unix environment variables such as
 :envvar:`PYTHONPATH`, but setting these variables for programs started from the
 Finder is non-standard as the Finder does not read your :file:`.profile` or
-:file:`.cshrc` at startup. You need to create a file :file:`~
-/.MacOSX/environment.plist`. See Apple's Technical Document QA1067 for details.
+:file:`.cshrc` at startup. You need to create a file
+:file:`~/.MacOSX/environment.plist`. See Apple's Technical Document QA1067 for
+details.
 
 For more information on installation Python packages in MacPython, see section
 :ref:`mac-package-manager`.

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