From: Éric Araujo <merwok@netwok.org>
Date: Wed, 18 Aug 2010 22:42:07 +0000 (+0000)
Subject: Manually merge r84187
X-Git-Tag: v3.1.3rc1~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=790c9af79ec02dfb10dc97bd687ed67c21783108;p=python

Manually merge r84187
---

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 8e5412086c..694ff56bfe 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