summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-08-24 19:59:38 (GMT)
committerLarry Hastings <larry@hastings.org>2015-08-24 19:59:38 (GMT)
commitf962473149b86292aa0c70772367a37749cd6aac (patch)
treebf9e8cfdeb08524c5725d5bf65aa5ecf0e12fde6 /Doc
parent4c4cfad2df20d00a8d954ba0d6109c1781ffe009 (diff)
parent721b9aab10a4c4f95c3fba08af24337efe63384c (diff)
downloadcpython-f962473149b86292aa0c70772367a37749cd6aac.zip
cpython-f962473149b86292aa0c70772367a37749cd6aac.tar.gz
cpython-f962473149b86292aa0c70772367a37749cd6aac.tar.bz2
Merge.
Diffstat (limited to 'Doc')
-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
------