diff options
| author | Georg Brandl <georg@python.org> | 2014-10-29 07:37:29 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-29 07:37:29 (GMT) |
| commit | cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3 (patch) | |
| tree | 7cf9c5f4bd20f8074adbf7ffd5eafc79685de9b3 /Doc/distutils | |
| parent | 347c3f6e346bf861b881d96f35feb5434ab8de92 (diff) | |
| parent | e73778c1ac0e58d3520b37308b970073e818fa00 (diff) | |
| download | cpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.zip cpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.tar.gz cpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.tar.bz2 | |
Merge with 3.4
Diffstat (limited to 'Doc/distutils')
| -rw-r--r-- | Doc/distutils/apiref.rst | 2 | ||||
| -rw-r--r-- | Doc/distutils/examples.rst | 2 | ||||
| -rw-r--r-- | Doc/distutils/setupscript.rst | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index 4c38a07..9218e5e 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -78,7 +78,7 @@ setup script). Indirectly provides the :class:`distutils.dist.Distribution` and | | be built | :class:`distutils.core.Extension` | +--------------------+--------------------------------+-------------------------------------------------------------+ | *classifiers* | A list of categories for the | a list of strings; valid classifiers are listed on `PyPI | - | | package | <http://pypi.python.org/pypi?:action=list_classifiers>`_. | + | | package | <https://pypi.python.org/pypi?:action=list_classifiers>`_. | +--------------------+--------------------------------+-------------------------------------------------------------+ | *distclass* | the :class:`Distribution` | a subclass of | | | class to use | :class:`distutils.core.Distribution` | diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst index b1ecd01..b08e023 100644 --- a/Doc/distutils/examples.rst +++ b/Doc/distutils/examples.rst @@ -11,7 +11,7 @@ Distutils Cookbook. .. seealso:: - `Distutils Cookbook <http://wiki.python.org/moin/Distutils/Cookbook>`_ + `Distutils Cookbook <https://wiki.python.org/moin/Distutils/Cookbook>`_ Collection of recipes showing how to achieve more control over distutils. diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index 8d89f3b..7fe73b9 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -28,7 +28,7 @@ the package into Python 1.5.2.) :: description='Python Distribution Utilities', author='Greg Ward', author_email='gward@python.net', - url='http://www.python.org/sigs/distutils-sig/', + url='https://www.python.org/sigs/distutils-sig/', packages=['distutils', 'distutils.command'], ) @@ -609,7 +609,7 @@ Notes: (4) These fields should not be used if your package is to be compatible with Python versions prior to 2.2.3 or 2.3. The list is available from the `PyPI website - <http://pypi.python.org/pypi>`_. + <https://pypi.python.org/pypi>`_. (5) The ``long_description`` field is used by PyPI when you are |