summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-03-21 09:01:27 (GMT)
committerGeorg Brandl <georg@python.org>2010-03-21 09:01:27 (GMT)
commit118c55778ee8516acfbcf5c5d4e2136793d0d311 (patch)
tree8fe2d746b744b76fa29d1040e2fdb97199036d08
parent07627880813ffaad8d9b90bfe8791ccf588b031b (diff)
downloadcpython-118c55778ee8516acfbcf5c5d4e2136793d0d311.zip
cpython-118c55778ee8516acfbcf5c5d4e2136793d0d311.tar.gz
cpython-118c55778ee8516acfbcf5c5d4e2136793d0d311.tar.bz2
Fix some issues found by Jacques Ducasse on the docs list.
-rw-r--r--Doc/library/functions.rst5
-rw-r--r--Doc/library/pdb.rst2
-rw-r--r--Doc/library/stdtypes.rst12
3 files changed, 10 insertions, 9 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index c248b12..1a4e921 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -339,7 +339,7 @@ available. They are listed here in alphabetical order.
This function can also be used to execute arbitrary code objects (such as
those created by :func:`compile`). In this case pass a code object instead
of a string. If the code object has been compiled with ``'exec'`` as the
- *kind* argument, :func:`eval`\'s return value will be ``None``.
+ *mode* argument, :func:`eval`\'s return value will be ``None``.
Hints: dynamic execution of statements is supported by the :keyword:`exec`
statement. Execution of statements from a file is supported by the
@@ -1145,7 +1145,8 @@ available. They are listed here in alphabetical order.
value is ``None``.
*key* specifies a function of one argument that is used to extract a comparison
- key from each list element: ``key=str.lower``. The default value is ``None``.
+ key from each list element: ``key=str.lower``. The default value is ``None``
+ (compare the elements directly).
*reverse* is a boolean value. If set to ``True``, then the list elements are
sorted as if each comparison were reversed.
diff --git a/Doc/library/pdb.rst b/Doc/library/pdb.rst
index cd1597f..f6651ab 100644
--- a/Doc/library/pdb.rst
+++ b/Doc/library/pdb.rst
@@ -22,7 +22,7 @@ supports post-mortem debugging and can be called under program control.
The debugger is extensible --- it is actually defined as the class :class:`Pdb`.
This is currently undocumented but easily understood by reading the source. The
-extension interface uses the modules :mod:`bdb` (undocumented) and :mod:`cmd`.
+extension interface uses the modules :mod:`bdb` and :mod:`cmd`.
The debugger's prompt is ``(Pdb)``. Typical usage to run a program under control
of the debugger is::
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 1a1ed46..3736ad0 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -918,12 +918,12 @@ string functions based on regular expressions.
.. method:: str.format(*args, **kwargs)
- Perform a string formatting operation. The *format_string* argument can
- contain literal text or replacement fields delimited by braces ``{}``. Each
- replacement field contains either the numeric index of a positional argument,
- or the name of a keyword argument. Returns a copy of *format_string* where
- each replacement field is replaced with the string value of the corresponding
- argument.
+ Perform a string formatting operation. The string on which this method is
+ called can contain literal text or replacement fields delimited by braces
+ ``{}``. Each replacement field contains either the numeric index of a
+ positional argument, or the name of a keyword argument. Returns a copy of
+ the string where each replacement field is replaced with the string value of
+ the corresponding argument.
>>> "The sum of 1 + 2 is {0}".format(1+2)
'The sum of 1 + 2 is 3'