From 3221dc9b316a23b0d6533bb07ee89dfc922ced9c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 27 Apr 2009 16:23:47 +0000
Subject: [PATCH] Merged revisions 72008 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72008 | georg.brandl | 2009-04-27 17:10:44 +0200 (Mo, 27 Apr 2009) | 1 line

  Remove ".. warning::" markup that doesnt contain warnings for users, rather todo items.
........
---
 Doc/distutils/apiref.rst | 25 +++++++------------------
 Doc/using/cmdline.rst    |  2 +-
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 490e7f35603..8abd0e37cbf 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -869,9 +869,7 @@ tarballs or zipfiles.
    prefix of all files and directories in the archive.  *root_dir* and *base_dir*
    both default to the current directory.  Returns the name of the archive file.
 
-   .. warning::
-
-      This should be changed to support bz2 files
+   .. XXX This should be changed to support bz2 files.
 
 
 .. function:: make_tarball(base_name, base_dir[, compress='gzip', verbose=0, dry_run=0])
@@ -884,9 +882,7 @@ tarballs or zipfiles.
    possibly plus the appropriate compression extension (:file:`.gz`, :file:`.bz2`
    or :file:`.Z`).  Return the output filename.
 
-   .. warning::
-
-      This should be replaced with calls to the :mod:`tarfile` module.
+   .. XXX This should be replaced with calls to the :mod:`tarfile` module.
 
 
 .. function:: make_zipfile(base_name, base_dir[, verbose=0, dry_run=0])
@@ -1329,10 +1325,8 @@ provides the following additional features:
 
    Wraps *text* to less than *width* wide.
 
-   .. warning::
-
-      Should be replaced with :mod:`textwrap` (which is available  in Python 2.3 and
-      later).
+   .. XXX Should be replaced with :mod:`textwrap` (which is available in Python
+      2.3 and later).
 
 
 .. class:: FancyGetopt([option_table=None])
@@ -1381,8 +1375,8 @@ The :class:`FancyGetopt` class provides the following methods:
 ================================================
 
 .. module:: distutils.filelist
-   :synopsis: The FileList class, used for poking about the file system and building lists of
-              files.
+   :synopsis: The FileList class, used for poking about the file system and
+              building lists of files.
 
 
 This module provides the :class:`FileList` class, used for poking about the
@@ -1396,13 +1390,8 @@ filesystem and building lists of files.
    :synopsis: A simple logging mechanism, 282-style
 
 
-.. warning::
+.. XXX Should be replaced with standard :mod:`logging` module.
 
-   Should be replaced with standard :mod:`logging` module.
-
-.. % \subsubsection{\module{} --- }
-.. % \declaremodule{standard}{distutils.magic}
-.. % \modulesynopsis{ }
 
 
 :mod:`distutils.spawn` --- Spawn a sub-process
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 9eecba672be..84a7943c244 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -318,7 +318,7 @@ Miscellaneous options
    Skip the first line of the source, allowing use of non-Unix forms of
    ``#!cmd``.  This is intended for a DOS specific hack only.
 
-   .. warning:: The line numbers in error messages will be off by one!
+   .. note:: The line numbers in error messages will be off by one.
 
 .. _using-on-envvars: