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

[berker.peksag]

https://hg.python.org/cpython/rev/6c42aeafbf0c
changeset:   104194:6c42aeafbf0c
branch:      3.6
parent:      104191:a6f0cc1820f4
parent:      104193:abbf12ea20c0
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sat Oct 01 01:03:01 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
@@ -943,7 +943,7 @@
 
 .. method:: Path.rglob(pattern)
 
-   This is like calling :meth:`glob` with "``**``" added in front of the
+   This is like calling :meth:`Path.glob` with "``**``" added in front of the
    given *pattern*:
 
       >>> sorted(Path().rglob("*.py"))

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