From 8de9119447c72db518196f0ddcdfc1cceaff1c1c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 26 May 2008 15:01:48 +0000
Subject: Add renaming notices to 3.0 http package members.

---
 Doc/library/cgihttpserver.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Doc/library/cgihttpserver.rst')

diff --git a/Doc/library/cgihttpserver.rst b/Doc/library/cgihttpserver.rst
index 6275c1a4d1..6abfde5d31 100644
--- a/Doc/library/cgihttpserver.rst
+++ b/Doc/library/cgihttpserver.rst
@@ -1,4 +1,3 @@
-
 :mod:`CGIHTTPServer` --- CGI-capable HTTP request handler
 =========================================================
 
@@ -7,6 +6,11 @@
               scripts.
 .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
 
+.. note::
+   The :mod:`CGIHTTPServer` module has been merged into :mod:`http.server` in
+   Python 3.0.  The :term:`2to3` tool will automatically adapt imports when
+   converting your sources to 3.0.
+
 
 The :mod:`CGIHTTPServer` module defines a request-handler class, interface
 compatible with :class:`BaseHTTPServer.BaseHTTPRequestHandler` and inherits
-- 
cgit v1.2.1