[Python-checkins] r82729 - in python/branches/release26-maint: Doc/distutils/apiref.rst Doc/distutils/builtdist.rst Doc/distutils/setupscript.rst Doc/distutils/sourcedist.rst Doc/library/functions.rst Doc/using/cmdline.rst

[georg.brandl]

Author: georg.brandl
Date: Fri Jul  9 09:51:43 2010
New Revision: 82729

Log:
Merged revisions 82548,82634-82635 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r82548 | georg.brandl | 2010-07-04 19:28:33 +0200 (So, 04 Jul 2010) | 1 line
  
  #8472: fix misleading reference to ifilterfalse() in filter() docs.
................
  r82634 | georg.brandl | 2010-07-07 21:05:35 +0200 (Mi, 07 Jul 2010) | 13 lines
  
  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.
  ........
................
  r82635 | georg.brandl | 2010-07-07 21:09:12 +0200 (Mi, 07 Jul 2010) | 9 lines
  
  Merged revisions 82615 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/branches/py3k
  
  ........
    r82615 | georg.brandl | 2010-07-07 00:58:50 +0200 (Mi, 07 Jul 2010) | 1 line
    
    Fix typo.
  ........
................


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/distutils/apiref.rst
   python/branches/release26-maint/Doc/distutils/builtdist.rst
   python/branches/release26-maint/Doc/distutils/setupscript.rst
   python/branches/release26-maint/Doc/distutils/sourcedist.rst
   python/branches/release26-maint/Doc/library/functions.rst
   python/branches/release26-maint/Doc/using/cmdline.rst

Modified: python/branches/release26-maint/Doc/distutils/apiref.rst
==============================================================================
--- python/branches/release26-maint/Doc/distutils/apiref.rst	(original)
+++ python/branches/release26-maint/Doc/distutils/apiref.rst	Fri Jul  9 09:51:43 2010
@@ -1012,7 +1012,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
@@ -1328,8 +1328,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/release26-maint/Doc/distutils/builtdist.rst
==============================================================================
--- python/branches/release26-maint/Doc/distutils/builtdist.rst	(original)
+++ python/branches/release26-maint/Doc/distutils/builtdist.rst	Fri Jul  9 09:51:43 2010
@@ -143,8 +143,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/release26-maint/Doc/distutils/setupscript.rst
==============================================================================
--- python/branches/release26-maint/Doc/distutils/setupscript.rst	(original)
+++ python/branches/release26-maint/Doc/distutils/setupscript.rst	Fri Jul  9 09:51:43 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/release26-maint/Doc/distutils/sourcedist.rst
==============================================================================
--- python/branches/release26-maint/Doc/distutils/sourcedist.rst	(original)
+++ python/branches/release26-maint/Doc/distutils/sourcedist.rst	Fri Jul  9 09:51:43 2010
@@ -68,10 +68,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
 

Modified: python/branches/release26-maint/Doc/library/functions.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/functions.rst	(original)
+++ python/branches/release26-maint/Doc/library/functions.rst	Fri Jul  9 09:51:43 2010
@@ -399,8 +399,9 @@
    iterable if function(item)]`` if function is not ``None`` and ``[item for item
    in iterable if item]`` if function is ``None``.
 
-   See :func:`itertools.ifilterfalse` for the complementary function that returns
-   elements of *iterable* for which *function* returns false.
+   See :func:`itertools.ifilter` and :func:`itertools.ifilterfalse` for iterator
+   versions of this function, including a variation that filters for elements
+   where the *function* returns false.
 
 
 .. function:: float([x])

Modified: python/branches/release26-maint/Doc/using/cmdline.rst
==============================================================================
--- python/branches/release26-maint/Doc/using/cmdline.rst	(original)
+++ python/branches/release26-maint/Doc/using/cmdline.rst	Fri Jul  9 09:51:43 2010
@@ -58,7 +58,7 @@
 
 .. cmdoption:: -c <command>
 
-   Execute the Python code in *command*.  *command* can be one ore more
+   Execute the Python code in *command*.  *command* can be one or more
    statements separated by newlines, with significant leading whitespace as in
    normal module code.