[Python-checkins] cpython (merge 3.5 -> 3.6): Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/3ed425f497af
changeset:   104197:3ed425f497af
branch:      3.6
parent:      104194:6c42aeafbf0c
parent:      104196:ad52117e5ab0
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sat Oct 01 01:07:17 2016 +0300
summary:
  Merge from 3.5

files:
  Doc/library/pathlib.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst
--- a/Doc/library/pathlib.rst
+++ b/Doc/library/pathlib.rst
@@ -930,7 +930,7 @@
       >>> p.resolve()
       PosixPath('/home/antoine/pathlib')
 
-   `".."` components are also eliminated (this is the only method to do so)::
+   "``..``" components are also eliminated (this is the only method to do so)::
 
       >>> p = Path('docs/../setup.py')
       >>> p.resolve()

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