diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-02-27 15:15:06 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-02-27 15:15:06 (GMT) |
| commit | f3352e7c1f77ad227b7e9db3d0f49c9d8ac72c1c (patch) | |
| tree | fc16903185670292bfdd6eebf3b89465ff5208ae | |
| parent | 86cbfec50aa025a16b83c9ea1de7be438f4e7997 (diff) | |
| download | cpython-f3352e7c1f77ad227b7e9db3d0f49c9d8ac72c1c.zip cpython-f3352e7c1f77ad227b7e9db3d0f49c9d8ac72c1c.tar.gz cpython-f3352e7c1f77ad227b7e9db3d0f49c9d8ac72c1c.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
........
| -rw-r--r-- | Doc/library/json.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst index 0ba22d1..6bb7fe3 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -6,7 +6,7 @@ .. moduleauthor:: Bob Ippolito <bob@redivi.com> .. sectionauthor:: Bob Ippolito <bob@redivi.com> -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 |