[Python-checkins] cpython (merge default -> default): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/4204de1e673e
changeset:   86204:4204de1e673e
parent:      86203:f38edb58fefb
parent:      86201:592579b89d8c
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Oct 10 17:40:48 2013 -0400
summary:
  merge heads

files:
  Doc/library/pdb.rst |  8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Doc/library/pdb.rst b/Doc/library/pdb.rst
--- a/Doc/library/pdb.rst
+++ b/Doc/library/pdb.rst
@@ -403,10 +403,16 @@
 
    Print the argument list of the current function.
 
-.. pdbcommand:: p(rint) expression
+.. pdbcommand:: p expression
 
    Evaluate the *expression* in the current context and print its value.
 
+   .. note::
+
+      ``print()`` can also be used, but is not a debugger command --- this executes the
+      Python :func:`print` function.
+
+
 .. pdbcommand:: pp expression
 
    Like the :pdbcmd:`p` command, except the value of the expression is

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