summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2016-11-28 06:19:23 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2016-11-28 06:19:23 (GMT)
commitd070b2ddbb300cb9c25efcef453154fabc99bcde (patch)
tree94b88fe049a9a93a630b3bf4cc415f64ac0da066 /Doc/whatsnew
parentde7bf086d2a77f5c963b8a97e1ac9d9bdeff14c7 (diff)
parent0425fc0fadb8760039d86bae38eb6770be8b3431 (diff)
downloadcpython-d070b2ddbb300cb9c25efcef453154fabc99bcde.zip
cpython-d070b2ddbb300cb9c25efcef453154fabc99bcde.tar.gz
cpython-d070b2ddbb300cb9c25efcef453154fabc99bcde.tar.bz2
Merge with 3.6
Diffstat (limited to 'Doc/whatsnew')
-rw-r--r--Doc/whatsnew/3.6.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 44aab85..60136ad 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -163,7 +163,7 @@ Windows improvements:
remains unchanged - "python" refers to Python 2 in that case.
* ``python.exe`` and ``pythonw.exe`` have been marked as long-path aware,
- which means that when the 260 character path limit may no longer apply.
+ which means that the 260 character path limit may no longer apply.
See :ref:`removing the MAX_PATH limitation <max-path>` for details.
* A ``._pth`` file can be added to force isolated mode and fully specify