[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

http://hg.python.org/cpython/rev/2346d5290b96
changeset:   89888:2346d5290b96
parent:      89886:a7bf938bc1e3
parent:      89887:9e0626766ac0
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Mar 20 12:40:03 2014 -0500
summary:
  merge 3.4

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


diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -242,7 +242,7 @@
    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

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