diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-11-05 02:46:30 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-11-05 02:46:30 (GMT) |
| commit | 873305b28cbe11f192c6d4120405f629f1b18e1c (patch) | |
| tree | 0dd0d0d0cd29c338acbc9db2201c43326f07ec1f /Doc | |
| parent | cee93c3b73a115e9f2982b9210be15c417a482dc (diff) | |
| parent | 04b3d8b6973150bf0c3ce9ec0ffe5cabf4161b7b (diff) | |
| download | cpython-873305b28cbe11f192c6d4120405f629f1b18e1c.zip cpython-873305b28cbe11f192c6d4120405f629f1b18e1c.tar.gz cpython-873305b28cbe11f192c6d4120405f629f1b18e1c.tar.bz2 | |
Merge doc fixup from 3.5 into 3.6
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/distutils/apiref.rst | 2 | ||||
| -rw-r--r-- | Doc/distutils/setupscript.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index be0e89a..b5b7731 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -166,7 +166,7 @@ the full reference. .. class:: Extension - The Extension class describes a single C or C++extension module in a setup + The Extension class describes a single C or C++ extension module in a setup script. It accepts the following keyword arguments in its constructor: .. tabularcolumns:: |l|L|l| diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index 9c4a9d5..38e0202 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -201,7 +201,7 @@ The second argument to the :class:`~distutils.core.Extension` constructor is a list of source files. Since the Distutils currently only support C, C++, and Objective-C extensions, these are normally C/C++/Objective-C source files. (Be sure to use -appropriate extensions to distinguish C++\ source files: :file:`.cc` and +appropriate extensions to distinguish C++ source files: :file:`.cc` and :file:`.cpp` seem to be recognized by both Unix and Windows compilers.) However, you can also include SWIG interface (:file:`.i`) files in the list; the |