Demote warnings to notices, part 2: stuff that is 2.x-only.
diff --git a/Doc/library/aepack.rst b/Doc/library/aepack.rst
index 798d603..a2adc9c 100644
--- a/Doc/library/aepack.rst
+++ b/Doc/library/aepack.rst
@@ -14,9 +14,9 @@
AppleEvent descriptor is handled by Python objects of built-in type
:class:`AEDesc`, defined in module :mod:`Carbon.AE`.
-.. warning::
+.. note::
- This module is removed in 3.0.
+ This module has been removed in Python 3.x.
The :mod:`aepack` module defines the following functions:
diff --git a/Doc/library/aetools.rst b/Doc/library/aetools.rst
index 76b5e17..0b8ec77 100644
--- a/Doc/library/aetools.rst
+++ b/Doc/library/aetools.rst
@@ -22,9 +22,9 @@
manager, see section :ref:`osx-gui-scripts` for details. This restriction may be
lifted in future releases.
-.. warning::
+.. note::
- This module is removed in 3.0.
+ This module has been removed in Python 3.x.
The :mod:`aetools` module defines the following functions:
diff --git a/Doc/library/aetypes.rst b/Doc/library/aetypes.rst
index 997203e..1e1067f 100644
--- a/Doc/library/aetypes.rst
+++ b/Doc/library/aetypes.rst
@@ -31,9 +31,9 @@
contains object specifiers for a number of common OSA classes such as
``Document``, ``Window``, ``Character``, etc.
-.. warning::
+.. note::
- This module is removed in 3.0.
+ This module has been removed in Python 3.x.
diff --git a/Doc/library/autogil.rst b/Doc/library/autogil.rst
index 938bf56..1c25cb1 100644
--- a/Doc/library/autogil.rst
+++ b/Doc/library/autogil.rst
@@ -13,9 +13,9 @@
automatically locks and unlocks Python's :term:`Global Interpreter Lock` when
running an event loop.
-.. warning::
+.. note::
- This module has been removed in 3.0.
+ This module has been removed in Python 3.x.
.. exception:: AutoGILError
diff --git a/Doc/library/bastion.rst b/Doc/library/bastion.rst
index 5916af4..8f103e7 100644
--- a/Doc/library/bastion.rst
+++ b/Doc/library/bastion.rst
@@ -15,7 +15,7 @@
.. versionchanged:: 2.3
Disabled module.
-.. warning::
+.. note::
The documentation has been left in place to help in reading old code that uses
the module.
diff --git a/Doc/library/binhex.rst b/Doc/library/binhex.rst
index b24e00a..a112813 100644
--- a/Doc/library/binhex.rst
+++ b/Doc/library/binhex.rst
@@ -1,4 +1,3 @@
-
:mod:`binhex` --- Encode and decode binhex4 files
=================================================
@@ -11,9 +10,9 @@
file and the finder information are encoded (or decoded), on other platforms
only the data fork is handled.
-.. warning::
+.. note::
- In 3.0, special Macintosh support is removed.
+ In Python 3.x, special Macintosh support has been removed.
The :mod:`binhex` module defines the following functions:
diff --git a/Doc/library/carbon.rst b/Doc/library/carbon.rst
index 7c63f18..c53c1b6 100644
--- a/Doc/library/carbon.rst
+++ b/Doc/library/carbon.rst
@@ -22,9 +22,9 @@
from Carbon import AE
-.. warning::
+.. note::
- The Carbon modules are removed in 3.0.
+ The Carbon modules have been removed in Python 3.0.
:mod:`Carbon.AE` --- Apple Events
diff --git a/Doc/library/colorpicker.rst b/Doc/library/colorpicker.rst
index e0771ac..b1a5a73 100644
--- a/Doc/library/colorpicker.rst
+++ b/Doc/library/colorpicker.rst
@@ -13,9 +13,9 @@
The :mod:`ColorPicker` module provides access to the standard color picker
dialog.
-.. warning::
+.. note::
- This module is removed in 3.0.
+ This module has been removed in Python 3.x.
.. function:: GetColor(prompt, rgb)
diff --git a/Doc/library/commands.rst b/Doc/library/commands.rst
index a700628..916e4a5 100644
--- a/Doc/library/commands.rst
+++ b/Doc/library/commands.rst
@@ -22,11 +22,12 @@
processes and retrieving their results. Using the :mod:`subprocess` module is
preferable to using the :mod:`commands` module.
-.. warning::
+.. note::
- In 3.x, :func:`getstatus` and two undocumented functions (:func:`mk2arg` and
- :func:`mkarg`) have been removed. Also, :func:`getstatusoutput` and
- :func:`getoutput` have been moved to the :mod:`subprocess` module.
+ In Python 3.x, :func:`getstatus` and two undocumented functions
+ (:func:`mk2arg` and :func:`mkarg`) have been removed. Also,
+ :func:`getstatusoutput` and :func:`getoutput` have been moved to the
+ :mod:`subprocess` module.
The :mod:`commands` module defines the following functions:
diff --git a/Doc/library/easydialogs.rst b/Doc/library/easydialogs.rst
index ad478a5..f672af6 100644
--- a/Doc/library/easydialogs.rst
+++ b/Doc/library/easydialogs.rst
@@ -16,9 +16,9 @@
type and item number) to those in the default :const:`DLOG` resource. See source
code for details.
-.. warning::
+.. note::
- This module is removed in 3.0.
+ This module has been removed in Python 3.x.
The :mod:`EasyDialogs` module defines the following functions:
diff --git a/Doc/library/framework.rst b/Doc/library/framework.rst
index ea58c05..1237e56 100644
--- a/Doc/library/framework.rst
+++ b/Doc/library/framework.rst
@@ -16,9 +16,9 @@
dialog window in a non-standard way it is not necessary to override the complete
event handling.
-.. warning::
+.. note::
- This module is removed in 3.0.
+ This module has been removed in Python 3.x.
Work on the :mod:`FrameWork` has pretty much stopped, now that :mod:`PyObjC` is
available for full Cocoa access from Python, and the documentation describes
diff --git a/Doc/library/gl.rst b/Doc/library/gl.rst
index cbc175a..0d189dc 100644
--- a/Doc/library/gl.rst
+++ b/Doc/library/gl.rst
@@ -1,4 +1,3 @@
-
:mod:`gl` --- *Graphics Library* interface
==========================================
@@ -17,9 +16,9 @@
.. warning::
- Some illegal calls to the GL library cause the Python interpreter to dump core.
- In particular, the use of most GL calls is unsafe before the first window is
- opened.
+ Some illegal calls to the GL library cause the Python interpreter to dump
+ core. In particular, the use of most GL calls is unsafe before the first
+ window is opened.
The module is too large to document here in its entirety, but the following
should help you to get started. The parameter conventions for the C functions
diff --git a/Doc/library/hotshot.rst b/Doc/library/hotshot.rst
index 21c76a9..b59d2b9 100644
--- a/Doc/library/hotshot.rst
+++ b/Doc/library/hotshot.rst
@@ -26,7 +26,7 @@
The results should be more meaningful than in the past: the timing core
contained a critical bug.
-.. warning::
+.. note::
The :mod:`hotshot` profiler does not yet work well with threads. It is useful to
use an unthreaded script to run the profiler over the code you're interested in
diff --git a/Doc/library/ic.rst b/Doc/library/ic.rst
index 88d4eee..ab40e7a 100644
--- a/Doc/library/ic.rst
+++ b/Doc/library/ic.rst
@@ -1,4 +1,3 @@
-
:mod:`ic` --- Access to the Mac OS X Internet Config
====================================================
@@ -11,9 +10,9 @@
This module provides access to various internet-related preferences set through
:program:`System Preferences` or the :program:`Finder`.
-.. warning::
+.. note::
- This module is removed in 3.0.
+ This module has been removed in Python 3.x.
.. index:: module: icglue
diff --git a/Doc/library/mac.rst b/Doc/library/mac.rst
index f5fa969..7ac1ca2 100644
--- a/Doc/library/mac.rst
+++ b/Doc/library/mac.rst
@@ -10,9 +10,9 @@
modules, and the HOWTO :ref:`using-on-mac` for a general introduction to
Mac-specific Python programming.
-.. warning::
+.. note::
- These modules are deprecated and are removed in 3.0.
+ These modules are deprecated and have been removed in Python 3.x.
.. toctree::
diff --git a/Doc/library/macos.rst b/Doc/library/macos.rst
index 526fb3c..75cbb19 100644
--- a/Doc/library/macos.rst
+++ b/Doc/library/macos.rst
@@ -11,9 +11,9 @@
interpreter, such as how the interpreter eventloop functions and the like. Use
with care.
-.. warning::
+.. note::
- This module is removed in 3.0.
+ This module has been removed in Python 3.x.
Note the capitalization of the module name; this is a historical artifact.
diff --git a/Doc/library/macostools.rst b/Doc/library/macostools.rst
index eae867d..96d2897 100644
--- a/Doc/library/macostools.rst
+++ b/Doc/library/macostools.rst
@@ -13,9 +13,9 @@
:class:`FSSpec` objects. This module expects a filesystem which supports forked
files, so it should not be used on UFS partitions.
-.. warning::
+.. note::
- This module is removed in 3.0.
+ This module has been removed in Python 3.0.
The :mod:`macostools` module defines the following functions:
diff --git a/Doc/library/plistlib.rst b/Doc/library/plistlib.rst
index d8694e8..239e3f6 100644
--- a/Doc/library/plistlib.rst
+++ b/Doc/library/plistlib.rst
@@ -75,10 +75,9 @@
Read a plist from the resource with type *restype* from the resource fork of
*path*. Availability: Mac OS X.
- .. warning::
+ .. note::
- In 3.0, this function is removed.
-
+ In Python 3.x, this function has been removed.
.. function:: writePlistToResource(rootObject, path[, restype='plst'[, resid=0]])
@@ -86,9 +85,9 @@
Write *rootObject* as a resource with type *restype* to the resource fork of
*path*. Availability: Mac OS X.
- .. warning::
+ .. note::
- In 3.0, this function is removed.
+ In Python 3.x, this function has been removed.
diff --git a/Doc/library/rexec.rst b/Doc/library/rexec.rst
index e25e5c9..7736904 100644
--- a/Doc/library/rexec.rst
+++ b/Doc/library/rexec.rst
@@ -1,4 +1,3 @@
-
:mod:`rexec` --- Restricted execution framework
===============================================
diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst
index ac646c5..f62c96a 100644
--- a/Doc/library/undoc.rst
+++ b/Doc/library/undoc.rst
@@ -20,9 +20,8 @@
Some of these are very old and/or not very robust; marked with "hmm."
:mod:`ihooks`
- --- Import hook support (for :mod:`rexec`; may become obsolete).
-
- .. warning:: The :mod:`ihooks` module has been removed in Python 3.0.
+ --- Import hook support (for :mod:`rexec`; may become obsolete). Removed in
+ Python 3.x.
Platform specific modules
@@ -47,27 +46,19 @@
==========
:mod:`audiodev`
- --- Platform-independent API for playing audio data.
-
- .. warning:: The :mod:`audiodev` module has been removed in 3.0.
+ --- Platform-independent API for playing audio data. Removed in Python 3.x.
:mod:`linuxaudiodev`
--- Play audio data on the Linux audio device. Replaced in Python 2.3 by the
- :mod:`ossaudiodev` module.
-
- .. warning:: The :mod:`linuxaudiodev` module has been removed in Python 3.0.
+ :mod:`ossaudiodev` module. Removed in Python 3.x.
:mod:`sunaudio`
--- Interpret Sun audio headers (may become obsolete or a tool/demo).
-
- .. warning:: The :mod:`sunaudio` module has been removed in Python 3.0.
+ Removed in Python 3.x.
:mod:`toaiff`
--- Convert "arbitrary" sound files to AIFF files; should probably become a tool
- or demo. Requires the external program :program:`sox`.
-
-
- .. warning:: The :mod:`toaiff` module has been removed in 3.0.
+ or demo. Requires the external program :program:`sox`. Removed in Python 3.x.
.. _undoc-mac-modules:
@@ -239,9 +230,8 @@
\envvar{PYTHONPATH}.
:mod:`timing`
- --- Measure time intervals to high resolution (use :func:`time.clock` instead).
-
- .. warning:: The :mod:`timing` module has been removed in Python 3.0.
+ --- Measure time intervals to high resolution (use :func:`time.clock`
+ instead). Removed in Python 3.x.
SGI-specific Extension modules
@@ -255,6 +245,4 @@
:mod:`sv`
--- Interface to the "simple video" board on SGI Indigo (obsolete hardware).
-
- .. warning:: The :mod:`sv` module has been removed in Python 3.0.
-
+ Removed in Python 3.x.