summaryrefslogtreecommitdiffstats
path: root/Doc/library/netdata.rst
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-05-08 14:29:10 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-05-08 14:29:10 (GMT)
commit90540004d3e1cbc0bd5595838bca3d1970198120 (patch)
tree9006c98a1c71cf39761d3eb35d4c227540b24947 /Doc/library/netdata.rst
parentc848655eb05c38f9c31bca0df87f2013670a1efa (diff)
downloadcpython-90540004d3e1cbc0bd5595838bca3d1970198120.zip
cpython-90540004d3e1cbc0bd5595838bca3d1970198120.tar.gz
cpython-90540004d3e1cbc0bd5595838bca3d1970198120.tar.bz2
Merged revisions 62734,62736,62748,62769 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r62734 | brett.cannon | 2008-05-05 22:21:38 +0200 (Mon, 05 May 2008) | 5 lines Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob Ippolito. Closes issue #2750. ........ r62736 | georg.brandl | 2008-05-05 22:53:39 +0200 (Mon, 05 May 2008) | 2 lines Fix JSON module docs. ........ r62748 | benjamin.peterson | 2008-05-06 04:51:10 +0200 (Tue, 06 May 2008) | 2 lines PEP 8 nits in json package ........ r62769 | christian.heimes | 2008-05-06 18:18:41 +0200 (Tue, 06 May 2008) | 2 lines Intern static string Use float constructors instead of magic code for float constants ........
Diffstat (limited to 'Doc/library/netdata.rst')
-rw-r--r--Doc/library/netdata.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/Doc/library/netdata.rst b/Doc/library/netdata.rst
index add01d2..2f27189 100644
--- a/Doc/library/netdata.rst
+++ b/Doc/library/netdata.rst
@@ -12,6 +12,7 @@ on the Internet.
.. toctree::
email.rst
+ json.rst
mailcap.rst
mailbox.rst
mhlib.rst