From: Benjamin Peterson Date: Sun, 27 Feb 2011 15:09:14 +0000 (+0000) Subject: Merged revisions 88668 via svnmerge from X-Git-Tag: v2.7.2rc1~296 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17e25d8c653edd3d8bef6da094af14001b534c70;p=thirdparty%2FPython%2Fcpython.git 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 ........ --- diff --git a/Doc/library/json.rst b/Doc/library/json.rst index bb26f3505c9b..be54eec524e4 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -7,7 +7,7 @@ .. sectionauthor:: Bob Ippolito .. versionadded:: 2.6 -JSON (JavaScript Object Notation) is a subset of JavaScript +`JSON (JavaScript Object Notation) `_ 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