Merged revisions 85253,85452-85454 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85253 | georg.brandl | 2010-10-06 10:52:48 +0200 (Mi, 06 Okt 2010) | 1 line

  Copyedit of os.symlink() docs.
........
  r85452 | georg.brandl | 2010-10-14 08:43:22 +0200 (Do, 14 Okt 2010) | 1 line

  #10046: small correction to atexit docs.
........
  r85453 | georg.brandl | 2010-10-14 08:46:08 +0200 (Do, 14 Okt 2010) | 1 line

  #6825: small correction to split() docs.
........
  r85454 | georg.brandl | 2010-10-14 08:48:47 +0200 (Do, 14 Okt 2010) | 1 line

  Mention 2to3.
........

diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst
index 8d5bbabac489fa46529c79c1bd40ed5479791a78..eab8cd9cca34acf376c0b15a9c2f15c1ef845661 100644 (file)
--- a/Doc/library/atexit.rst
+++ b/Doc/library/atexit.rst
@@ -20,8 +20,8 @@ interpreter termination.
    <http://svn.python.org/view/python/branches/release27-maint/Lib/atexit.py?view=markup>`_
 
 Note: the functions registered via this module are not called when the program
-is killed by a signal, when a Python fatal internal error is detected, or when
-:func:`os._exit` is called.
+is killed by a signal not handled by Python, when a Python fatal internal error
+is detected, or when :func:`os._exit` is called.
 
 .. index:: single: exitfunc (in sys)
 

diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index aebde0c9109d296f1ad96b895fe9ac4a8751fad8..4867e8b211f3f32581f04d296c7c792c1436b881 100644 (file)
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -268,14 +268,14 @@ write files see :func:`open`, and for accessing the filesystem see the
 
 .. function:: split(path)
 
-   Split the pathname *path* into a pair, ``(head, tail)`` where *tail* is the last
-   pathname component and *head* is everything leading up to that.  The *tail* part
-   will never contain a slash; if *path* ends in a slash, *tail* will be empty.  If
-   there is no slash in *path*, *head* will be empty.  If *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 nearly all cases, ``join(head,
-   tail)`` equals *path* (the only exception being when there were multiple slashes
-   separating *head* from *tail*).
+   Split the pathname *path* into a pair, ``(head, tail)`` where *tail* is the
+   last pathname component and *head* is everything leading up to that.  The
+   *tail* part will never contain a slash; if *path* ends in a slash, *tail*
+   will be empty.  If there is no slash in *path*, *head* will be empty.  If
+   *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).
 
 
 .. function:: splitdrive(path)

diff --git a/Tools/README b/Tools/README
index 62883489bd896917231cdd583f3939092cd391ea..1fb010358c85f222b4ccf18804204494545bc621 100644 (file)
--- a/Tools/README
+++ b/Tools/README
@@ -30,9 +30,10 @@ i18n         Tools for internationalization. pygettext.py
 
 pynche         A Tkinter-based color editor.
 
-scripts                A number of useful single-file programs, e.g. tabnanny.py
-               (by Tim Peters), which checks for inconsistent mixing
-               of tabs and spaces.
+scripts         A number of useful single-file programs, e.g. tabnanny.py
+                by Tim Peters, which checks for inconsistent mixing of
+                tabs and spaces, and 2to3, which converts Python 2 code
+                to Python 3 code.
 
 unicode                Tools used to generate unicode database files for
                Python 2.0 (by Fredrik Lundh).