[Python-checkins] cpython (merge 3.3 -> default): #16556: merge with 3.3.

Tue Nov 27 18:19:18 CET 2012

http://hg.python.org/cpython/rev/c28f593ea0cb
changeset: 80605:c28f593ea0cb
parent: 80601:a5b3eb62311e
parent: 80604:ae19d86b71c8
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Tue Nov 27 19:19:01 2012 +0200
summary:
 #16556: merge with 3.3.
files:
 Doc/library/string.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -100,7 +100,7 @@
 This function does the actual work of formatting. It is exposed as a
 separate function for cases where you want to pass in a predefined
 dictionary of arguments, rather than unpacking and repacking the
- dictionary as individual arguments using the ``*args`` and ``**kwds``
+ dictionary as individual arguments using the ``*args`` and ``**kwargs``
 syntax. :meth:`vformat` does the work of breaking up the format string
 into character data and replacement fields. It calls the various
 methods described below.
-- 
Repository URL: http://hg.python.org/cpython
