diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2018-10-31 11:00:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 11:00:24 +0200 |
| commit | b183750f999953bac7738b1fff114e0a2615d970 (patch) | |
| tree | 4f27db02b8229fde997d5fda06aecd985d026f1b /Doc/distutils | |
| parent | aa0a21a7c81cb4eca723b0f400e860a0e8e730b5 (diff) | |
| download | cpython-git-b183750f999953bac7738b1fff114e0a2615d970.tar.gz | |
[3.7] bpo-35110: Fix unintentional spaces around hyphens and dashes. (GH-10231). (GH-10253)
(cherry picked from commit 3f819ca138db6945ee4271bf13e42db9f9b3b1e4)
Diffstat (limited to 'Doc/distutils')
| -rw-r--r-- | Doc/distutils/apiref.rst | 9 | ||||
| -rw-r--r-- | Doc/distutils/builtdist.rst | 6 | ||||
| -rw-r--r-- | Doc/distutils/configfile.rst | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index 3c89468220..dccd7ce236 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -183,8 +183,9 @@ the full reference. | *sources* | list of source filenames, | a list of strings | | | relative to the distribution | | | | root (where the setup script | | - | | lives), in Unix form (slash- | | - | | separated) for portability. | | + | | lives), in Unix form | | + | | (slash-separated) for | | + | | portability. | | | | Source files may be C, C++, | | | | SWIG (.i), platform-specific | | | | resource files, or whatever | | @@ -1566,8 +1567,8 @@ lines, and joining lines with backslashes. +------------------+--------------------------------+---------+ | option name | description | default | +==================+================================+=========+ - | *strip_comments* | strip from ``'#'`` to end-of- | true | - | | line, as well as any | | + | *strip_comments* | strip from ``'#'`` to | true | + | | end-of-line, as well as any | | | | whitespace leading up to the | | | | ``'#'``\ ---unless it is | | | | escaped by a backslash | | diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst index 758bd141ac..f1f3471261 100644 --- a/Doc/distutils/builtdist.rst +++ b/Doc/distutils/builtdist.rst @@ -63,9 +63,9 @@ distribution to generate: for example, :: python setup.py bdist --format=zip -would, when run on a Unix system, create :file:`Distutils-1.0.{plat}.zip`\ ----again, this archive would be unpacked from the root directory to install the -Distutils. +would, when run on a Unix system, create +:file:`Distutils-1.0.{plat}.zip`\ ---again, this archive would be unpacked +from the root directory to install the Distutils. The available formats for built distributions are: diff --git a/Doc/distutils/configfile.rst b/Doc/distutils/configfile.rst index cd10a7fdf3..0874d05fe7 100644 --- a/Doc/distutils/configfile.rst +++ b/Doc/distutils/configfile.rst @@ -13,8 +13,8 @@ edit is a cheap and easy way to solicit it. Configuration files also let you provide default values for any command option, which the installer can then override either on the command-line or by editing the config file. -The setup configuration file is a useful middle-ground between the setup script ----which, ideally, would be opaque to installers [#]_---and the command-line to +The setup configuration file is a useful middle-ground between the setup +script---which, ideally, would be opaque to installers [#]_---and the command-line to the setup script, which is outside of your control and entirely up to the installer. In fact, :file:`setup.cfg` (and any other Distutils configuration files present on the target system) are processed after the contents of the |