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.
........

1 files changed, 4 insertions, 6 deletions

diff --git a/Doc/library/bdb.rst b/Doc/library/bdb.rst
index c0c3dc8..93304de 100644
--- 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.