merge 3.4 (#13143)

benjaminp · benjaminp · commit 7534539536c0 · 2014-06-22T18:00:07.000-07:00
diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
@@ -188,7 +188,7 @@ the :mod:`glob` module.)
 .. 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)
