summaryrefslogtreecommitdiffstats
path: root/Doc/library/json.rst
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-02-27 15:09:14 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-02-27 15:09:14 (GMT)
commit17e25d8c653edd3d8bef6da094af14001b534c70 (patch)
tree3b0bda333a12066d0f078298361507b8bd7db1c2 /Doc/library/json.rst
parentd3f6ea1d1e53f5ff35ebd149ddc57a1a0cb5e543 (diff)
downloadcpython-17e25d8c653edd3d8bef6da094af14001b534c70.zip
cpython-17e25d8c653edd3d8bef6da094af14001b534c70.tar.gz
cpython-17e25d8c653edd3d8bef6da094af14001b534c70.tar.bz2
Merged revisions 88668 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88668 | benjamin.peterson | 2011-02-27 09:06:44 -0600 (Sun, 27 Feb 2011) | 1 line make this a link #11345 ........
Diffstat (limited to 'Doc/library/json.rst')
-rw-r--r--Doc/library/json.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index bb26f35..be54eec 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -7,7 +7,7 @@
.. sectionauthor:: Bob Ippolito <bob@redivi.com>
.. versionadded:: 2.6
-JSON (JavaScript Object Notation) <http://json.org> is a subset of JavaScript
+`JSON (JavaScript Object Notation) <http://json.org>`_ is a subset of JavaScript
syntax (ECMA-262 3rd edition) used as a lightweight data interchange format.
:mod:`json` exposes an API familiar to users of the standard library