comparing with http://hg.python.org/cpython
searching for changes
changeset:   68810:c172de610233
tag:         tip
parent:      68808:74d3dc78f0db
user:        ysj.ray <ysj.ray@gmail.com>
date:        Mon Mar 21 21:19:04 2011 +0800
summary:     Fix setup() and Extension parameters' description wrong.

diff -r 74d3dc78f0db -r c172de610233 Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst	Mon Mar 21 13:26:24 2011 +0100
+++ b/Doc/distutils/apiref.rst	Mon Mar 21 21:19:04 2011 +0800
@@ -69,7 +69,7 @@
    |                    | installed                      |                                                             |
    +--------------------+--------------------------------+-------------------------------------------------------------+
    | *ext_modules*      | A list of Python extensions to | A list of  instances of                                     |
-   |                    | be built                       | :class:`distutils.core.Extension`                           |
+   |                    | be built                       | :class:`distutils.core.Extension` or 2-tuples               |
    +--------------------+--------------------------------+-------------------------------------------------------------+
    | *classifiers*      | A list of categories for the   | The list of available                                       |
    |                    | package                        | categorizations is at                                       |
@@ -85,7 +85,7 @@
    | *script_args*      | Arguments to supply to the     | a list of strings                                           |
    |                    | setup script                   |                                                             |
    +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *options*          | default options for the setup  | a string                                                    |
+   | *options*          | default options for the setup  | a dictionary                                                |
    |                    | script                         |                                                             |
    +--------------------+--------------------------------+-------------------------------------------------------------+
    | *license*          | The license for the package    | a string                                                    |
@@ -171,7 +171,7 @@
    |                        | filename or pathname, but      |                           |
    |                        | Python dotted name             |                           |
    +------------------------+--------------------------------+---------------------------+
-   | *sources*              | list of source filenames,      | string                    |
+   | *sources*              | list of source filenames,      | a list of strings         |
    |                        | relative to the distribution   |                           |
    |                        | root (where the setup script   |                           |
    |                        | lives), in Unix form (slash-   |                           |
@@ -184,7 +184,7 @@
    |                        | as source for a Python         |                           |
    |                        | extension.                     |                           |
    +------------------------+--------------------------------+---------------------------+
-   | *include_dirs*         | list of directories to search  | string                    |
+   | *include_dirs*         | list of directories to search  | a list of strings         |
    |                        | for C/C++ header files (in     |                           |
    |                        | Unix form for portability)     |                           |
    +------------------------+--------------------------------+---------------------------+
@@ -203,15 +203,15 @@
    | *undef_macros*         | list of macros to undefine     | string                    |
    |                        | explicitly                     |                           |
    +------------------------+--------------------------------+---------------------------+
-   | *library_dirs*         | list of directories to search  | string                    |
+   | *library_dirs*         | list of directories to search  | a list of strings         |
    |                        | for C/C++ libraries at link    |                           |
    |                        | time                           |                           |
    +------------------------+--------------------------------+---------------------------+
-   | *libraries*            | list of library names (not     | string                    |
+   | *libraries*            | list of library names (not     | a list of strings         |
    |                        | filenames or paths) to link    |                           |
    |                        | against                        |                           |
    +------------------------+--------------------------------+---------------------------+
-   | *runtime_library_dirs* | list of directories to search  | string                    |
+   | *runtime_library_dirs* | list of directories to search  | a list of strings         |
    |                        | for C/C++ libraries at run     |                           |
    |                        | time (for shared extensions,   |                           |
    |                        | this is when the extension is  |                           |