Use deprecated-removed directive, clean up a few markup issues around

deprecated directives.

diff --git a/Doc/library/formatter.rst b/Doc/library/formatter.rst
index 1847a8094b83fdd0dcea5a9a8b0467711244f1b3..a515f74f64b0d26b16b1c328d547e58a76b3afa3 100644 (file)
--- a/Doc/library/formatter.rst
+++ b/Doc/library/formatter.rst
@@ -5,7 +5,7 @@
    :synopsis: Generic output formatter and device interface.
    :deprecated:
 
-.. deprecated:: 3.4
+.. deprecated-removed:: 3.4 3.6
    Due to lack of usage, the formatter module has been deprecated and is slated
    for removal in Python 3.6.
 

diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
index 8f0b79f332066f62605ffb0bfc16f096c3f55188..ed4820e64059123fef682d894249c40efe837a57 100644 (file)
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -262,12 +262,12 @@ that circular imports work without any deadlocks.
    exception is made for circular imports, which by construction have to
    expose an incomplete module object at some point.
 
-.. versionchanged:: 3.3
-   The locking scheme has changed to per-module locks for
-   the most part.  A global import lock is kept for some critical tasks,
-   such as initializing the per-module locks.
+   .. versionchanged:: 3.3
+      The locking scheme has changed to per-module locks for
+      the most part.  A global import lock is kept for some critical tasks,
+      such as initializing the per-module locks.
 
-.. deprecated:: 3.4
+   .. deprecated:: 3.4
 
 
 .. function:: acquire_lock()
@@ -282,12 +282,12 @@ that circular imports work without any deadlocks.
 
    On platforms without threads, this function does nothing.
 
-.. versionchanged:: 3.3
-   The locking scheme has changed to per-module locks for
-   the most part.  A global import lock is kept for some critical tasks,
-   such as initializing the per-module locks.
+   .. versionchanged:: 3.3
+      The locking scheme has changed to per-module locks for
+      the most part.  A global import lock is kept for some critical tasks,
+      such as initializing the per-module locks.
 
-.. deprecated:: 3.4
+   .. deprecated:: 3.4
 
 
 .. function:: release_lock()
@@ -295,12 +295,12 @@ that circular imports work without any deadlocks.
    Release the interpreter's global import lock. On platforms without
    threads, this function does nothing.
 
-.. versionchanged:: 3.3
-   The locking scheme has changed to per-module locks for
-   the most part.  A global import lock is kept for some critical tasks,
-   such as initializing the per-module locks.
+   .. versionchanged:: 3.3
+      The locking scheme has changed to per-module locks for
+      the most part.  A global import lock is kept for some critical tasks,
+      such as initializing the per-module locks.
 
-.. deprecated:: 3.4
+   .. deprecated:: 3.4
 
 
 The following constants with integer values, defined in this module, are used

diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 3b55b06ec096a3662ab7dfe7a5e63d84cbf91c3f..f3b206311a130ce6d871163e2f40cfcaeda202f4 100644 (file)
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -626,8 +626,8 @@ ABC hierarchy::
            have to implement it, but it is still available for compatibility
            purposes. Raise :exc:`IOError` if the path cannot be handled.
 
-          .. versionchanged:: 3.4
-             Raise :exc:`IOError` instead of :exc:`NotImplementedError`.
+        .. versionchanged:: 3.4
+           Raise :exc:`IOError` instead of :exc:`NotImplementedError`.
 
     .. method:: set_data(path, data)
 

diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
index 13395b636d443cd0809b84fab6efd000240fb843..72145aa59b5fb580795c591fcf6ce4fba97c00b4 100644 (file)
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -8,8 +8,8 @@
 .. sectionauthor:: Greg Ward <gward@python.net>
 
 .. deprecated:: 3.2
-  The :mod:`optparse` module is deprecated and will not be developed further;
-  development will continue with the :mod:`argparse` module.
+   The :mod:`optparse` module is deprecated and will not be developed further;
+   development will continue with the :mod:`argparse` module.
 
 **Source code:** :source:`Lib/optparse.py`
 

diff --git a/Doc/library/pkgutil.rst b/Doc/library/pkgutil.rst
index 13ea7b9b330af3e7d899cb9b099dfd82c0179895..5d3295db7ef8c0efb1df222887edce11aadd6511 100644 (file)
--- a/Doc/library/pkgutil.rst
+++ b/Doc/library/pkgutil.rst
@@ -58,7 +58,7 @@ support.
 
    .. deprecated:: 3.3
       This emulation is no longer needed, as the standard import mechanism
-      is now fully PEP 302 compliant and available in :mod:`importlib`
+      is now fully PEP 302 compliant and available in :mod:`importlib`.
 
 
 .. class:: ImpLoader(fullname, file, filename, etc)
@@ -67,7 +67,7 @@ support.
 
    .. deprecated:: 3.3
       This emulation is no longer needed, as the standard import mechanism
-      is now fully PEP 302 compliant and available in :mod:`importlib`
+      is now fully PEP 302 compliant and available in :mod:`importlib`.
 
 
 .. function:: find_loader(fullname)

diff --git a/Doc/library/site.rst b/Doc/library/site.rst
index 2fdf303c8898bbfcaf481d58558388acbab9055f..e249bab4fa25396d583d14b63d8d7ea27e8210e2 100644 (file)
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -38,7 +38,7 @@ Unix and Macintosh).  For each of the distinct head-tail combinations, it sees
 if it refers to an existing directory, and if so, adds it to ``sys.path`` and
 also inspects the newly added path for configuration files.
 
-.. deprecated:: 3.4
+.. deprecated-removed:: 3.4 3.5
    Support for the "site-python" directory will be removed in 3.5.
 
 If a file named "pyvenv.cfg" exists one directory above sys.executable,