summaryrefslogtreecommitdiffstats
path: root/Doc/library/socketserver.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-05-12 10:03:16 (GMT)
committerGeorg Brandl <georg@python.org>2008-05-12 10:03:16 (GMT)
commit7a148c23571491985b06fde373c29d299cd36447 (patch)
tree137a6c9c38b3bbd8d0b11c5112c2aad7b47e1f2a /Doc/library/socketserver.rst
parentbb141bb1f4ece144f681739279dba266f5e64a9d (diff)
downloadcpython-7a148c23571491985b06fde373c29d299cd36447.zip
cpython-7a148c23571491985b06fde373c29d299cd36447.tar.gz
cpython-7a148c23571491985b06fde373c29d299cd36447.tar.bz2
Fix-up docs for socketserver and queue renaming.
Diffstat (limited to 'Doc/library/socketserver.rst')
-rw-r--r--Doc/library/socketserver.rst10
1 files changed, 8 insertions, 2 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index 9df72e3..74aeb81 100644
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -1,10 +1,16 @@
-
:mod:`socketserver` --- A framework for network servers
=======================================================
+.. module:: SocketServer
+ :synopsis: Old name for the socketserver module.
+
.. module:: socketserver
:synopsis: A framework for network servers.
-.. versionadded:: 2.6
+
+.. note::
+ The :mod:`SocketServer` module has been renamed to :mod:`socketserver` in
+ Python 3.0. It is importable under both names in Python 2.6 and the rest of
+ the 2.x series.
The :mod:`socketserver` module simplifies the task of writing network servers.