summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-27 17:19:01 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-27 17:19:01 (GMT)
commit847d4add26e00ee7852fc89d32e42d4dcfa59e3b (patch)
treecbeddcf911036cb65fa5cacf051f5687ae166abb /Doc
parent185e7e91ae54c74a5a4bcb35d9f50b5e2b166207 (diff)
parent7768dd77c195f14359a7b858017ebb813f839bae (diff)
downloadcpython-847d4add26e00ee7852fc89d32e42d4dcfa59e3b.zip
cpython-847d4add26e00ee7852fc89d32e42d4dcfa59e3b.tar.gz
cpython-847d4add26e00ee7852fc89d32e42d4dcfa59e3b.tar.bz2
#16556: merge with 3.3.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/string.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 9c63272..f981f4e 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -100,7 +100,7 @@ implementation as the built-in :meth:`format` method.
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.