socketserver renaming reversal part 3: move the module into the right
place and fix all references to it. Closes #2926.
diff --git a/Misc/NEWS b/Misc/NEWS
index c1f9555..b4b61e6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -161,9 +161,6 @@
- The multifile module has been deprecated as per PEP 4.
-- The SocketServer module has been renamed 'socketserver'. The old
- name is now deprecated.
-
- The imageop module has been deprecated for removal in Python 3.0.
- Issue #2250: Exceptions raised during evaluation of names in
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
index e699359..8954e98 100644
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -1973,7 +1973,7 @@
sys.path.
smtplib SMTP Client class (RFC 821)
sndhdr Several routines that help recognizing sound.
-socketserver Generic socket server classes.
+SocketServer Generic socket server classes.
stat Constants and functions for interpreting stat/lstat struct.
statcache Maintain a cache of file stats.
statvfs Constants for interpreting statvfs struct as returned by