Merged revisions 86794,86798,86801 via svnmerge from

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

........
  r86794 | georg.brandl | 2010-11-26 12:50:13 +0100 (Fr, 26 Nov 2010) | 1 line

  #10526: fix typo.
........
  r86798 | georg.brandl | 2010-11-26 13:05:48 +0100 (Fr, 26 Nov 2010) | 1 line

  #10420: fix docs of bdb.effective().
........
  r86801 | georg.brandl | 2010-11-26 13:12:14 +0100 (Fr, 26 Nov 2010) | 1 line

  Better example for os.system(): do not change the system time.
........

diff --git a/Doc/library/bdb.rst b/Doc/library/bdb.rst
index c0c3dc890d17438b6271c8d0c168837ceaa6a29b..93304dec70e716486b5d368bc21912711670b2f0 100644 (file)
--- a/Doc/library/bdb.rst
+++ b/Doc/library/bdb.rst
@@ -342,12 +342,10 @@ Finally, the module defines the following functions:
 .. function:: effective(file, line, frame)
 
    Determine if there is an effective (active) breakpoint at this line of code.
-   Return breakpoint number or 0 if none.
-
-   Called only if we know there is a breakpoint at this location.  Returns the
-   breakpoint that was triggered and a flag that indicates if it is ok to delete
-   a temporary breakpoint.
+   Return a tuple of the breakpoint and a boolean that indicates if it is ok
+   to delete a temporary breakpoint.  Return ``(None, None)`` if there is no
+   matching breakpoint.
 
 .. function:: set_trace()
 
-   Starts debugging with a :class:`Bdb` instance from caller's frame.
+   Start debugging with a :class:`Bdb` instance from caller's frame.

diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 955ce73282aa1fd1f7dcdffac30d30848fe9ea8c..844f8bc011abb7b843056168a8a8008c486682d3 100644 (file)
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -14,11 +14,11 @@ The :mod:`os` module provides dozens of functions for interacting with the
 operating system::
 
    >>> import os
-   >>> os.system('time 0:02')
-   0
    >>> os.getcwd()      # Return the current working directory
    'C:\\Python26'
-   >>> os.chdir('/server/accesslogs')
+   >>> os.chdir('/server/accesslogs')   # Change current working directory
+   >>> os.system('mkdir today')   # Run the command mkdir in the system shell
+   0
 
 Be sure to use the ``import os`` style instead of ``from os import *``.  This
 will keep :func:`os.open` from shadowing the built-in :func:`open` function which

diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 5ba22a7f780b5e4c8d20667b9e7a1ab73659de82..6cd3aba911ba5b7a29b7fca24744ce964663834b 100644 (file)
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -244,7 +244,7 @@ The standard library now supports use of ordered dictionaries in several
 modules.
 
 * The :mod:`ConfigParser` module uses them by default, meaning that
-  configuration files can now read, modified, and then written back
+  configuration files can now be read, modified, and then written back
   in their original order.
 
 * The :meth:`~collections.somenamedtuple._asdict()` method for