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

[benjamin.peterson]

http://hg.python.org/cpython/rev/81529993f60d
changeset:   91339:81529993f60d
parent:      91336:7dc94337ef67
parent:      91338:db7887f3e6a2
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Jun 22 18:00:07 2014 -0700
summary:
  merge 3.4 (#13143)

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
@@ -188,7 +188,7 @@
 .. function:: islink(path)
 
    Return ``True`` if *path* refers to a directory entry that is a symbolic link.
-   Always ``False`` if symbolic links are not supported.
+   Always ``False`` if symbolic links are not supported by the python runtime.
 
 
 .. function:: ismount(path)

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