Merged revisions 80894,80896 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80894 | benjamin.peterson | 2010-05-06 17:33:46 -0500 (Thu, 06 May 2010) | 1 line
Availability gets its own line
........
r80896 | benjamin.peterson | 2010-05-06 17:49:28 -0500 (Thu, 06 May 2010) | 1 line
ensure that availability information is on its own line at the end of the function docs
........
diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index 2075468..c4fbae9 100644
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -231,7 +231,9 @@
Return a relative filepath to *path* either from the current directory or from
an optional *start* point.
- *start* defaults to :attr:`os.curdir`. Availability: Windows, Unix.
+ *start* defaults to :attr:`os.curdir`.
+
+ Availability: Windows, Unix.
.. versionadded:: 2.6
@@ -240,12 +242,15 @@
Return ``True`` if both pathname arguments refer to the same file or directory
(as indicated by device number and i-node number). Raise an exception if a
- :func:`os.stat` call on either pathname fails. Availability: Unix.
+ :func:`os.stat` call on either pathname fails.
+
+ Availability: Unix.
.. function:: sameopenfile(fp1, fp2)
Return ``True`` if the file descriptors *fp1* and *fp2* refer to the same file.
+
Availability: Unix.
@@ -254,7 +259,9 @@
Return ``True`` if the stat tuples *stat1* and *stat2* refer to the same file.
These structures may have been returned by :func:`fstat`, :func:`lstat`, or
:func:`stat`. This function implements the underlying comparison used by
- :func:`samefile` and :func:`sameopenfile`. Availability: Unix.
+ :func:`samefile` and :func:`sameopenfile`.
+
+ Availability: Unix.
.. function:: split(path)
@@ -296,7 +303,9 @@
Split the pathname *path* into a pair ``(unc, rest)`` so that *unc* is the UNC
mount point (such as ``r'\\host\mount'``), if present, and *rest* the rest of
the path (such as ``r'\path\file.ext'``). For paths containing drive letters,
- *unc* will always be the empty string. Availability: Windows.
+ *unc* will always be the empty string.
+
+ Availability: Windows.
.. function:: walk(path, visit, arg)