summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-11-05 02:49:11 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-11-05 02:49:11 (GMT)
commitb0bbaa854e6fc0485015871873da77ae97379244 (patch)
treee9b435e94db6f90f37e500c80a623bbfc09ff36a
parent52dfd4bd998417417a843b63722eae89dd180251 (diff)
parent873305b28cbe11f192c6d4120405f629f1b18e1c (diff)
downloadcpython-b0bbaa854e6fc0485015871873da77ae97379244.zip
cpython-b0bbaa854e6fc0485015871873da77ae97379244.tar.gz
cpython-b0bbaa854e6fc0485015871873da77ae97379244.tar.bz2
Merge doc fixup from 3.6
-rw-r--r--Doc/distutils/apiref.rst2
-rw-r--r--Doc/distutils/setupscript.rst2
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