[Python-checkins] r82634 - in python/branches/release27-maint: Doc/distutils/apiref.rst Doc/distutils/builtdist.rst Doc/distutils/setupscript.rst Doc/distutils/sourcedist.rst
georg.brandl
python-checkins at python.org
Wed Jul 7 21:05:35 CEST 2010
Author: georg.brandl
Date: Wed Jul 7 21:05:35 2010
New Revision: 82634
Log:
Merged revisions 82629,82632 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82629 | georg.brandl | 2010-07-07 20:51:43 +0200 (Mi, 07 Jul 2010) | 1 line
Make comment out of an awkward note.
........
r82632 | georg.brandl | 2010-07-07 21:04:36 +0200 (Mi, 07 Jul 2010) | 1 line
Turn more notes into comments.
........
Modified:
python/branches/release27-maint/ (props changed)
python/branches/release27-maint/Doc/distutils/apiref.rst
python/branches/release27-maint/Doc/distutils/builtdist.rst
python/branches/release27-maint/Doc/distutils/setupscript.rst
python/branches/release27-maint/Doc/distutils/sourcedist.rst
Modified: python/branches/release27-maint/Doc/distutils/apiref.rst
==============================================================================
--- python/branches/release27-maint/Doc/distutils/apiref.rst (original)
+++ python/branches/release27-maint/Doc/distutils/apiref.rst Wed Jul 7 21:05:35 2010
@@ -995,7 +995,7 @@
errors are ignored (apart from being reported to ``sys.stdout`` if *verbose* is
true).
-**\*\*** Some of this could be replaced with the shutil module? **\*\***
+.. XXX Some of this could be replaced with the shutil module?
:mod:`distutils.file_util` --- Single file operations
@@ -1311,8 +1311,7 @@
the "negative alias" of :option:`--verbose`, then :option:`--quiet` on the
command line sets *verbose* to false.
-**\*\*** Should be replaced with :mod:`optik` (which is also now known as
-:mod:`optparse` in Python 2.3 and later). **\*\***
+.. XXX Should be replaced with :mod:`optparse`.
.. function:: fancy_getopt(options, negative_opt, object, args)
Modified: python/branches/release27-maint/Doc/distutils/builtdist.rst
==============================================================================
--- python/branches/release27-maint/Doc/distutils/builtdist.rst (original)
+++ python/branches/release27-maint/Doc/distutils/builtdist.rst Wed Jul 7 21:05:35 2010
@@ -146,8 +146,8 @@
Creating dumb built distributions
=================================
-**\*\*** Need to document absolute vs. prefix-relative packages here, but first
-I have to implement it! **\*\***
+.. XXX Need to document absolute vs. prefix-relative packages here, but first
+ I have to implement it!
.. _creating-rpms:
Modified: python/branches/release27-maint/Doc/distutils/setupscript.rst
==============================================================================
--- python/branches/release27-maint/Doc/distutils/setupscript.rst (original)
+++ python/branches/release27-maint/Doc/distutils/setupscript.rst Wed Jul 7 21:05:35 2010
@@ -207,7 +207,7 @@
SWIG on the interface file and compile the resulting C/C++ file into your
extension.
-**\*\*** SWIG support is rough around the edges and largely untested! **\*\***
+.. XXX SWIG support is rough around the edges and largely untested!
This warning notwithstanding, options to SWIG can be currently passed like
this::
@@ -326,7 +326,7 @@
(Again, this sort of non-portable construct should be avoided if you intend to
distribute your code.)
-**\*\*** Should mention clib libraries here or somewhere else! **\*\***
+.. XXX Should mention clib libraries here or somewhere else!
Other options
Modified: python/branches/release27-maint/Doc/distutils/sourcedist.rst
==============================================================================
--- python/branches/release27-maint/Doc/distutils/sourcedist.rst (original)
+++ python/branches/release27-maint/Doc/distutils/sourcedist.rst Wed Jul 7 21:05:35 2010
@@ -76,10 +76,10 @@
:option:`packages` options
* all C source files mentioned in the :option:`ext_modules` or
- :option:`libraries` options (
+ :option:`libraries` options
- **\*\*** getting C library sources currently broken---no
- :meth:`get_source_files` method in :file:`build_clib.py`! **\*\***)
+ .. XXX Getting C library sources is currently broken -- no
+ :meth:`get_source_files` method in :file:`build_clib.py`!
* scripts identified by the :option:`scripts` option
See :ref:`distutils-installing-scripts`.
More information about the Python-checkins
mailing list