diff options
| author | Éric Araujo <merwok@netwok.org> | 2010-08-18 22:42:07 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2010-08-18 22:42:07 (GMT) |
| commit | 790c9af79ec02dfb10dc97bd687ed67c21783108 (patch) | |
| tree | 9cca4699537ee4e5b3dbe6f2ef5633e7c3930a6b /Doc | |
| parent | a9d7c7772fa087fb1bf8bce5dc62fe29391525ca (diff) | |
| download | cpython-790c9af79ec02dfb10dc97bd687ed67c21783108.zip cpython-790c9af79ec02dfb10dc97bd687ed67c21783108.tar.gz cpython-790c9af79ec02dfb10dc97bd687ed67c21783108.tar.bz2 | |
Manually merge r84187
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/stdtypes.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 8e54120..694ff56 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1960,8 +1960,8 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: .. method:: update([other]) - Update the dictionary with the key/value pairs from *other*, overwriting - existing keys. Return ``None``. + Update the dictionary with the key/value pairs from *other*, overwriting + existing keys. Return ``None``. :meth:`update` accepts either another dictionary object or an iterable of key/value pairs (as a tuple or other iterable of length two). If keyword |