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 798d603eaa6312c579ffcfbffaaa635607113dee..a2adc9cd595eb13fd3cccbc9faa89fb57bcb930b 100644 (file)
--- a/Doc/library/aepack.rst
+++ b/Doc/library/aepack.rst
@@ -14,9 +14,9 @@ variables to AppleEvent descriptors and back (unpacking). Within Python the
 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 76b5e177fc2de63f1d7eaff0817912b51b22229d..0b8ec776114962cdc64ea175d3760e3f272f6b81 100644 (file)
--- a/Doc/library/aetools.rst
+++ b/Doc/library/aetools.rst
@@ -22,9 +22,9 @@ The :mod:`aetools` module itself uses the AppleEvent support provided by the
 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 997203e7e5ddee1fec33997af325a0a97eb74c64..1e1067f121829c3b1cf072979865046490ab643f 100644 (file)
--- a/Doc/library/aetypes.rst
+++ b/Doc/library/aetypes.rst
@@ -31,9 +31,9 @@ application for which you have not generated the stub package this module also
 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 938bf5612f33e9deed3f0b0a0fe0367e52b86753..1c25cb19b871f2d5268e63c5a6e584b3bbc83f4b 100644 (file)
--- a/Doc/library/autogil.rst
+++ b/Doc/library/autogil.rst
@@ -13,9 +13,9 @@ The :mod:`autoGIL` module provides a function :func:`installAutoGIL` that
 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 5916af4158413a1fd2119c7b380a7c389c5e8488..8f103e7a02826c53991e73cc498a852a28e28b9c 100644 (file)
--- 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 b24e00a5d619a26eda64fa81d08f22b1e1dc9f4e..a112813ce8cc24ebad29ee3dd524a1990953f7d2 100644 (file)
--- 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 @@ representation of Macintosh files in ASCII.  On the Macintosh, both forks of a
 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 7c63f18065da9810441b9be3ad0826f5785b6504..c53c1b65ef7110e4ffa099a02aed529304e1acce 100644 (file)
--- a/Doc/library/carbon.rst
+++ b/Doc/library/carbon.rst
@@ -22,9 +22,9 @@ framework and Qt is in the QuickTime framework. The normal use pattern is ::
 
    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 e0771acf90b177bf56d6bd8b700d61b81abbceb6..b1a5a738aeea78c6883450c9d7049b16a349dc11 100644 (file)
--- 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 a700628c79d850f90140fd579d0be9b7b308e33f..916e4a520cae94e5789c3e2caca60fdcf388ab31 100644 (file)
--- a/Doc/library/commands.rst
+++ b/Doc/library/commands.rst
@@ -22,11 +22,12 @@ The :mod:`subprocess` module provides more powerful facilities for spawning new
 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 ad478a594b5c44c91cf6971b218196704cfac631..f672af6e144c57aaf3ed697ceacb83c7eaf24a71 100644 (file)
--- a/Doc/library/easydialogs.rst
+++ b/Doc/library/easydialogs.rst
@@ -16,9 +16,9 @@ resource used for the dialog, provided that the dialog items correspond (both
 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 ea58c050e4dc959e34641e800500f5f1633f73e1..1237e56fb8f050424fa6048af00092a7fd35a0da 100644 (file)
--- a/Doc/library/framework.rst
+++ b/Doc/library/framework.rst
@@ -16,9 +16,9 @@ often be done on various different levels, i.e. to handle clicks in a single
 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 cbc175ad154802b52b4e0c2b977c67191111ec5d..0d189dca99089fd44d692ec36bcad30ad063c4b2 100644 (file)
--- a/Doc/library/gl.rst
+++ b/Doc/library/gl.rst
@@ -1,4 +1,3 @@
-
 :mod:`gl` --- *Graphics Library* interface
 ==========================================
 
@@ -17,9 +16,9 @@ available only on Silicon Graphics machines.
 
 .. 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 21c76a988160fdddd462ba40c38af6e4d109cb89..b59d2b913a7fb758fbcae065259e910dcbd1b199 100644 (file)
--- a/Doc/library/hotshot.rst
+++ b/Doc/library/hotshot.rst
@@ -26,7 +26,7 @@ in C, it should result in a much smaller performance impact than the existing
    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 88d4eee96a17893036545ae05af11f4eb71b82ad..ab40e7a941a153715f3749adc8b95d8be03900c5 100644 (file)
--- 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 f5fa969e4629bfeb873b56053fe58ff6f8ef021e..7ac1ca29a144d7c9a820b5281fb0208c49e5f43c 100644 (file)
--- a/Doc/library/mac.rst
+++ b/Doc/library/mac.rst
@@ -10,9 +10,9 @@ See the chapters :ref:`mac-scripting` and :ref:`undoc-mac-modules` for more
 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 526fb3ce12e5558dcebeb448290f8c090c87dffc..75cbb19548f2061b84141535733397c75ecc8d6f 100644 (file)
--- a/Doc/library/macos.rst
+++ b/Doc/library/macos.rst
@@ -11,9 +11,9 @@ This module provides access to MacOS specific functionality in the Python
 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 eae867db1f34142c3c11a3464a9020f9e09b47dc..96d289749ae5d1e9a3d75b5dd2aa77587a90bb2b 100644 (file)
--- a/Doc/library/macostools.rst
+++ b/Doc/library/macostools.rst
@@ -13,9 +13,9 @@ Macintosh. All file parameters can be specified as pathnames, :class:`FSRef` or
 :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 d8694e8c56da270f9e32d12ab9faa904c8ffeae2..239e3f671b42bd3ac737c484e284e9185ef153a9 100644 (file)
--- a/Doc/library/plistlib.rst
+++ b/Doc/library/plistlib.rst
@@ -75,10 +75,9 @@ This module defines the following functions:
     Read a plist from the resource with type *restype* from the resource fork of
     *path*.  Availability: Mac OS X.
 
-    .. warning::
-
-       In 3.0, this function is removed.
+    .. note::
 
+       In Python 3.x, this function has been removed.
 
 
 .. function:: writePlistToResource(rootObject, path[, restype='plst'[, resid=0]])
@@ -86,9 +85,9 @@ This module defines the following functions:
     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 e25e5c9f20a9699cc694345436d198fb6beb84c5..773690437fb4b28e48acd8620036f96de04b6f94 100644 (file)
--- 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 ac646c5f303dda05d7f7ae8563eebd678041f967..f62c96a722a5fc9492577051445a90b633558c89 100644 (file)
--- a/Doc/library/undoc.rst
+++ b/Doc/library/undoc.rst
@@ -20,9 +20,8 @@ Miscellaneous useful utilities
 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 @@ Multimedia
 ==========
 
 :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 @@ extensions.
    \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 @@ of reality.
 
 :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.