diff --git a/Doc/library/bastion.rst b/Doc/library/bastion.rst
index cfc48a5..35ecd75 100644
--- a/Doc/library/bastion.rst
+++ b/Doc/library/bastion.rst
@@ -7,7 +7,7 @@
    :deprecated:
    
 .. deprecated:: 2.6
-   The Bastion module has been removed in Python 3.0.
+   The :mod:`Bastion` module has been removed in Python 3.0.
    
 .. moduleauthor:: Barry Warsaw <bwarsaw@python.org>
 
diff --git a/Doc/library/compiler.rst b/Doc/library/compiler.rst
index 7aac3b8..e13f7fc 100644
--- a/Doc/library/compiler.rst
+++ b/Doc/library/compiler.rst
@@ -6,7 +6,7 @@
 ***********************
 
 .. deprecated:: 2.6
-   The compiler package has been removed in Python 3.0.
+   The :mod:`compiler` package has been removed in Python 3.0.
 
 .. sectionauthor:: Jeremy Hylton <jeremy@zope.com>
 
diff --git a/Doc/library/dircache.rst b/Doc/library/dircache.rst
index ee48432..d5907a6 100644
--- a/Doc/library/dircache.rst
+++ b/Doc/library/dircache.rst
@@ -7,7 +7,7 @@
    :deprecated:
    
 .. deprecated:: 2.6
-   The dircache module has been removed in Python 3.0.
+   The :mod:`dircache` module has been removed in Python 3.0.
    
    
 .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
diff --git a/Doc/library/dl.rst b/Doc/library/dl.rst
index 5578120..ef8eb40 100644
--- a/Doc/library/dl.rst
+++ b/Doc/library/dl.rst
@@ -8,7 +8,8 @@
    :deprecated:
    
 .. deprecated:: 2.6
-    The dl module has been removed in Python 3.0.
+    The :mod:`dl` module has been removed in Python 3.0. Use the :mod:`ctypes`
+    module instead.
    
 .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
 
diff --git a/Doc/library/fpformat.rst b/Doc/library/fpformat.rst
index e82e164..29b29f4 100644
--- a/Doc/library/fpformat.rst
+++ b/Doc/library/fpformat.rst
@@ -7,7 +7,7 @@
    :deprecated:
    
 .. deprecated:: 2.6
-    The fpformat module has been removed in Python 3.0.
+    The :mod:`fpformat` module has been removed in Python 3.0.
    
 .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
 
diff --git a/Doc/library/imputil.rst b/Doc/library/imputil.rst
index f10e83d..6a50b7a 100644
--- a/Doc/library/imputil.rst
+++ b/Doc/library/imputil.rst
@@ -7,7 +7,7 @@
    :deprecated:
 
 .. deprecated:: 2.6
-   The module has been removed in Python 3.0.
+   The :mod:`imputil` module has been removed in Python 3.0.
 
 
 .. index:: statement: import
diff --git a/Doc/library/mutex.rst b/Doc/library/mutex.rst
index ed0ad92..480c888 100644
--- a/Doc/library/mutex.rst
+++ b/Doc/library/mutex.rst
@@ -7,7 +7,7 @@
    :deprecated:
    
 .. deprecated::
-   The mutex module has been removed in Python 3.0.
+   The :mod:`mutex` module has been removed in Python 3.0.
 
 .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
 
diff --git a/Doc/library/new.rst b/Doc/library/new.rst
index 3202f91..d8e455c 100644
--- a/Doc/library/new.rst
+++ b/Doc/library/new.rst
@@ -7,7 +7,7 @@
    :deprecated:
 
 .. deprecated:: 2.6
-   The new module has been removed in Python 3.0.
+   The :mod:`new` module has been removed in Python 3.0.
 
 .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
 
diff --git a/Doc/library/rexec.rst b/Doc/library/rexec.rst
index b61319f..3bc3fc9 100644
--- a/Doc/library/rexec.rst
+++ b/Doc/library/rexec.rst
@@ -7,7 +7,7 @@
    :deprecated:
    
 .. deprecated:: 2.6
-   The rexec module has been removed in Python 3.0.
+   The :mod:`rexec` module has been removed in Python 3.0.
 
 .. versionchanged:: 2.3
    Disabled module.
diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst
index 7da1b3b..7a5a760 100644
--- a/Doc/library/undoc.rst
+++ b/Doc/library/undoc.rst
@@ -22,7 +22,7 @@
 :mod:`ihooks`
    --- Import hook support (for :mod:`rexec`; may become obsolete).
    
-   .. warning:: The ihooks module has been removed in Python 3.0.
+   .. warning:: The :mod:`ihooks` module has been removed in Python 3.0.
 
 
 Platform specific modules
@@ -55,7 +55,7 @@
    --- Play audio data on the Linux audio device.  Replaced in Python 2.3 by the
    :mod:`ossaudiodev` module.
    
-   .. warning:: The linuxaudiodev module has been removed in Python 3.0.
+   .. warning:: The :mod:`linuxaudiodev` module has been removed in Python 3.0.
 
 :mod:`sunaudio`
    --- Interpret Sun audio headers (may become obsolete or a tool/demo).
diff --git a/Doc/library/user.rst b/Doc/library/user.rst
index ba6b462..920f429 100644
--- a/Doc/library/user.rst
+++ b/Doc/library/user.rst
@@ -7,7 +7,7 @@
    :deprecated:
 
 .. deprecated:: 2.6
-   The user module has been removed in Python 3.0.
+   The :mod:`user` module has been removed in Python 3.0.
 
 .. index::
    pair: .pythonrc.py; file