changeset:   80597:25321e2172ad
parent:      80590:9bc6e157475a
parent:      80596:3eec2d562df0
user:        Chris Jerdonek <chris.jerdonek@gmail.com>
date:        Sun Nov 25 20:42:00 2012 -0800
files:       Doc/library/os.path.rst Lib/logging/__init__.py Lib/test/test_logging.py
description:
Merge from 3.3: add hyperlinks to some os.path function docs (issue #16552).


diff -r 9bc6e157475a -r 25321e2172ad Doc/library/os.path.rst
--- a/Doc/library/os.path.rst	Sun Nov 25 14:37:43 2012 +0000
+++ b/Doc/library/os.path.rst	Sun Nov 25 20:42:00 2012 -0800
@@ -42,13 +42,15 @@
 .. function:: abspath(path)
 
    Return a normalized absolutized version of the pathname *path*. On most
-   platforms, this is equivalent to ``normpath(join(os.getcwd(), path))``.
+   platforms, this is equivalent to calling the function :func:`normpath` as
+   follows: ``normpath(join(os.getcwd(), path))``.
 
 
 .. function:: basename(path)
 
-   Return the base name of pathname *path*.  This is the second half of the pair
-   returned by ``split(path)``.  Note that the result of this function is different
+   Return the base name of pathname *path*.  This is the second element of the
+   pair returned by passing *path* to the function :func:`split`.  Note that
+   the result of this function is different
    from the Unix :program:`basename` program; where :program:`basename` for
    ``'/foo/bar/'`` returns ``'bar'``, the :func:`basename` function returns an
    empty string (``''``).
@@ -63,8 +65,8 @@
 
 .. function:: dirname(path)
 
-   Return the directory name of pathname *path*.  This is the first half of the
-   pair returned by ``split(path)``.
+   Return the directory name of pathname *path*.  This is the first element of
+   the pair returned by passing *path* to the function :func:`split`.
 
 
 .. function:: exists(path)
@@ -281,7 +283,8 @@
    *path* is empty, both *head* and *tail* are empty.  Trailing slashes are
    stripped from *head* unless it is the root (one or more slashes only).  In
    all cases, ``join(head, tail)`` returns a path to the same location as *path*
-   (but the strings may differ).
+   (but the strings may differ).  Also see the functions :func:`dirname` and
+   :func:`basename`.
 
 
 .. function:: splitdrive(path)