Merged revisions 72183-72184 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk ........ r72183 | georg.brandl | 2009-05-01 14:28:35 -0700 (Fri, 01 May 2009) | 2 lines Review ipaddr docs and add them in the TOC under "Internet protocols". ........ r72184 | georg.brandl | 2009-05-01 14:30:25 -0700 (Fri, 01 May 2009) | 1 line Fix directive name. ........

Merged revisions 72183-72184 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72183 | georg.brandl | 2009-05-01 14:28:35 -0700 (Fri, 01 May 2009) | 2 lines Review ipaddr docs and add them in the TOC under "Internet protocols". ........ r72184 | georg.brandl | 2009-05-01 14:30:25 -0700 (Fri, 01 May 2009) | 1 line Fix directive name. ........
842e8da6 · Gregory P. Smith · e54dff5e · 842e8da6 · 842e8da6
Commit 842e8da6 authored May 02, 2009 by Gregory P. Smith
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 80 additions and 77 deletions

Doc/library/internet.rst Doc/library/internet.rst +1 -0

Doc/library/ipaddr.rst Doc/library/ipaddr.rst +79 -77

No files found.
--- a/Doc/library/internet.rst
+++ b/Doc/library/internet.rst
@@ -37,6 +37,7 @@ is currently supported on most popular platforms.  Here is an overview:
   smtpd.rst
   telnetlib.rst
   uuid.rst
+   ipaddr.rst
   socketserver.rst
   http.server.rst
   http.cookies.rst

--- a/Doc/library/ipaddr.rst
+++ b/Doc/library/ipaddr.rst