summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-08-24 19:58:57 (GMT)
committerLarry Hastings <larry@hastings.org>2015-08-24 19:58:57 (GMT)
commitf51fd7bc1a2bafabdebc58c95faaac10dc1abc39 (patch)
tree528dc6221d863c04e2f7c59eca7dfbb4e480275b
parent7d9376f2d8b9b0f57097745f94fcfddd2bd1aa16 (diff)
parentd5b129c9a1dc005f87df26c10f2d77ca018f7f31 (diff)
downloadcpython-f51fd7bc1a2bafabdebc58c95faaac10dc1abc39.zip
cpython-f51fd7bc1a2bafabdebc58c95faaac10dc1abc39.tar.gz
cpython-f51fd7bc1a2bafabdebc58c95faaac10dc1abc39.tar.bz2
Merge.
-rw-r--r--Doc/whatsnew/3.5.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
index a974130..11f871b 100644
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -729,7 +729,7 @@ os.path
* New :func:`~os.path.commonpath` function that extracts common path prefix.
Unlike the :func:`~os.path.commonprefix` function, it always returns a valid
- patch. (Contributed by Rafik Draoui and Serhiy Storchaka in :issue:`10395`.)
+ path. (Contributed by Rafik Draoui and Serhiy Storchaka in :issue:`10395`.)
pickle
------