[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (os doc)

[victor.stinner]

https://hg.python.org/cpython/rev/756c4822ba38
changeset:   94925:756c4822ba38
parent:      94923:8d76dabd40f6
parent:      94924:50e32059a404
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Mar 10 13:31:58 2015 +0100
summary:
  Merge 3.4 (os doc)

files:
  Doc/library/os.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2604,8 +2604,9 @@
           if 'CVS' in dirs:
               dirs.remove('CVS')  # don't visit CVS directories
 
-   In the next example, walking the tree bottom-up is essential: :func:`rmdir`
-   doesn't allow deleting a directory before the directory is empty::
+   In the next example (simple implementation of :func:`shutil.rmtree`),
+   walking the tree bottom-up is essential, :func:`rmdir` doesn't allow
+   deleting a directory before the directory is empty::
 
       # Delete everything reachable from the directory named in "top",
       # assuming there are no symbolic links.

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