diff --git a/docs/distutils/apiref.rst b/docs/distutils/apiref.rst index c6785f0d..34acc12b 100644 --- a/docs/distutils/apiref.rst +++ b/docs/distutils/apiref.rst @@ -23,9 +23,9 @@ API Reference The :mod:`distutils.core` module is the only module that needs to be installed -to use the Distutils. It provides the :func:`setup` (which is called from the -setup script). Indirectly provides the :class:`distutils.dist.Distribution` and -:class:`distutils.cmd.Command` class. +to use the Distutils. It provides the :func:`setup` function (which is called +from the setup script) and indirectly provides the +:class:`distutils.dist.Distribution` and :class:`distutils.cmd.Command` class. .. function:: setup(arguments) diff --git a/docs/distutils/builtdist.rst b/docs/distutils/builtdist.rst index 052a5850..2200fb8a 100644 --- a/docs/distutils/builtdist.rst +++ b/docs/distutils/builtdist.rst @@ -195,8 +195,7 @@ Distutils configuration files. Various options and sections in the | Version | ``version`` | +------------------------------------------+----------------------------------------------+ | Vendor | ``author`` and ``author_email``, | -| | or --- & ``maintainer`` and | -| | ``maintainer_email`` | +| | or ``maintainer`` and ``maintainer_email`` | +------------------------------------------+----------------------------------------------+ | Copyright | ``license`` | +------------------------------------------+----------------------------------------------+ @@ -294,7 +293,7 @@ installed, you can use a 32bit version of Windows to create 64bit extensions and vice-versa. To build for an alternate platform, specify the :option:`!--plat-name` option -to the build command. Valid values are currently 'win32', and 'win-amd64'. +to the build command. Valid values are currently 'win32', and 'win-amd64'. For example, on a 32bit version of Windows, you could execute:: python setup.py build --plat-name=win-amd64 @@ -317,8 +316,8 @@ check or modify your existing install.) .. _postinstallation-script: -The Postinstallation script ---------------------------- +The Post-installation script +---------------------------- Starting with Python 2.3, a postinstallation script can be specified with the :option:`!--install-script` option. The basename of the script must be diff --git a/docs/distutils/examples.rst b/docs/distutils/examples.rst index d758a810..64698097 100644 --- a/docs/distutils/examples.rst +++ b/docs/distutils/examples.rst @@ -57,7 +57,7 @@ setup might look like this:: foo.py bar.py -and the setup script might be :: +and the setup script might be :: from distutils.core import setup setup(name='foobar', @@ -82,7 +82,7 @@ can just tell the Distutils to process modules from the root package, and that works the same as any other package (except that you don't have to have an :file:`__init__.py` file). -The setup script from the last example could also be written as :: +The setup script from the last example could also be written as :: from distutils.core import setup setup(name='foobar', @@ -142,7 +142,7 @@ need to use the ``package_dir`` option again. For example, if the foo.py bar.py -an appropriate setup script would be :: +an appropriate setup script would be :: from distutils.core import setup setup(name='foobar', @@ -160,7 +160,7 @@ root:: foo.py bar.py -in which case your setup script would be :: +in which case your setup script would be :: from distutils.core import setup setup(name='foobar', @@ -187,7 +187,7 @@ figure out which directories correspond to Python packages by looking for __init__.py blah.py -then the corresponding setup script would be :: +then the corresponding setup script would be :: from distutils.core import setup setup(name='foobar', @@ -211,7 +211,7 @@ single extension module in a single C source file, is:: foo.c If the :mod:`foo` extension belongs in the root package, the setup script for -this could be :: +this could be :: from distutils.core import setup from distutils.extension import Extension @@ -322,7 +322,7 @@ You can read back this static file, by using the 'Easily download, build, install, upgrade, and uninstall Python packages' Notice that the class can also be instantiated with a metadata file path to -loads its values:: +load its values:: >>> pkg_info_path = 'distribute-0.6.8-py2.7.egg-info' >>> DistributionMetadata(pkg_info_path).name