summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2008-05-12 02:18:15 +0000
committerAlexandre Vassalotti <alexandre@peadrop.com>2008-05-12 02:18:15 +0000
commitfea23a4d004673f2a2295669e94c9c9fb2229f4b (patch)
tree86b532784ac760ac127891debf94eda383cc554b
parentd192c925ac0d8e7801462b71cd0be033ddb18103 (diff)
downloadcpython-git-fea23a4d004673f2a2295669e94c9c9fb2229f4b.tar.gz
Added stub entry in the documentation mentioning SocketServer
was renamed.
-rw-r--r--Doc/library/socketserver.rst2
-rw-r--r--Doc/library/socketserver_old.rst8
2 files changed, 10 insertions, 0 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index e24b4296bc..9df72e3d05 100644
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -4,6 +4,8 @@
.. module:: socketserver
:synopsis: A framework for network servers.
+.. versionadded:: 2.6
+
The :mod:`socketserver` module simplifies the task of writing network servers.
diff --git a/Doc/library/socketserver_old.rst b/Doc/library/socketserver_old.rst
new file mode 100644
index 0000000000..a6f564e6c9
--- /dev/null
+++ b/Doc/library/socketserver_old.rst
@@ -0,0 +1,8 @@
+:mod:`SocketServer` --- A framework for network servers
+=======================================================
+
+.. module:: SocketServer
+ :synopsis: A framework for network servers.
+
+The :mod:`SocketServer` module has been renamed to :mod:`socketserver`
+in Python 3.0. The old name is now deprecated.