merge 3.4

This commit is contained in:
Benjamin Peterson 2014-03-20 12:40:03 -05:00
commit 8efe3df664
1 changed files with 1 additions and 1 deletions

View File

@ -242,7 +242,7 @@ the :mod:`glob` module.)
links encountered in the path (if they are supported by the operating system).
.. function:: relpath(path, start=None)
.. function:: relpath(path, start=os.curdir)
Return a relative filepath to *path* either from the current directory or
from an optional *start* directory. This is a path computation: the