[Python-checkins] cpython (merge 3.2 -> 3.3): Merge with 3.2

[terry.reedy]

http://hg.python.org/cpython/rev/4045413a9ab4
changeset:   82712:4045413a9ab4
branch:      3.3
parent:      82707:7b737011d822
parent:      82711:ff9636af9505
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sun Mar 17 15:22:00 2013 -0400
summary:
  Merge with 3.2

files:
  Doc/library/os.path.rst |  12 +++++-------
  1 files changed, 5 insertions(+), 7 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
@@ -219,13 +219,11 @@
 
 .. function:: normpath(path)
 
-   Normalize a pathname.  This collapses redundant separators and up-level
-   references so that ``A//B``, ``A/B/``, ``A/./B`` and ``A/foo/../B`` all become
-   ``A/B``.
-
-   It does not normalize the case (use :func:`normcase` for that).  On Windows, it
-   converts forward slashes to backward slashes. It should be understood that this
-   may change the meaning of the path if it contains symbolic links!
+   Normalize a pathname by collapsing redundant separators and up-level
+   references so that ``A//B``, ``A/B/``, ``A/./B`` and ``A/foo/../B`` all
+   become ``A/B``.  This string manipulation may change the meaning of a path
+   that contains symbolic links.  On Windows, it converts forward slashes to
+   backward slashes. To normalize case, use :func:`normcase`.  
 
 
 .. function:: realpath(path)

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