[Python-checkins] cpython (merge 3.3 -> default): Issue #17332: fix json doc typo /convered/converted/ found by Ernie Hershey.

[terry.reedy]

http://hg.python.org/cpython/rev/d86f5686cef9
changeset:   82556:d86f5686cef9
parent:      82552:a8047d1376d5
parent:      82555:8817a09e012c
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Mar 08 19:40:17 2013 -0500
summary:
  Issue #17332: fix json doc typo /convered/converted/ found by Ernie Hershey.

files:
  Doc/library/json.rst |  2 +-
  Misc/ACKS            |  1 +
  2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -192,7 +192,7 @@
 
       Keys in key/value pairs of JSON are always of the type :class:`str`. When
       a dictionary is converted into JSON, all the keys of the dictionary are
-      coerced to strings. As a result of this, if a dictionary is convered
+      coerced to strings. As a result of this, if a dictionary is converted
       into JSON and then back into a dictionary, the dictionary may not equal
       the original one. That is, ``loads(dumps(x)) != x`` if x has non-string
       keys.
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -493,6 +493,7 @@
 Ivan Herman
 Jürgen Hermann
 Gary Herron
+Ernie Hershey
 Thomas Herve
 Bernhard Herzog
 Magnus L. Hetland

-- 
Repository URL: http://hg.python.org/cpython