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

Sun Mar 17 20:31:06 CET 2013

http://hg.python.org/cpython/rev/8fddce9a9606
changeset: 82717:8fddce9a9606
parent: 82714:2d860bb13110
parent: 82716:3251b2a04fee
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sun Mar 17 15:29:19 2013 -0400
summary:
 Merge with 3.3
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
@@ -222,7 +222,7 @@
 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`. 
+ backward slashes. To normalize case, use :func:`normcase`.
 
 
 .. function:: realpath(path)
-- 
Repository URL: http://hg.python.org/cpython
