Distribute is merged with setuptools

dahlia · dahlia · commit dee4adf926d0 · 2014-05-22T22:25:41.000+09:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -249,7 +249,7 @@
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     'python': ('http://docs.python.org/', None),
-    'distribute': ('http://packages.python.org/distribute/', None),
+    'setuptools': ('http://pythonhosted.org/setuptools/', None),
     'flask': ('http://flask.pocoo.org/docs/', None)
 }
 
diff --git a/docs/frameworks/flask.rst b/docs/frameworks/flask.rst
@@ -118,13 +118,12 @@ Building SASS/SCSS for each deployment
 
 .. note::
 
-   This section assumes that you use distribute_ (:mod:`setuptools`)
-   for deployment.
+   This section assumes that you use setuptools_ for deployment.
 
 .. seealso::
 
    Flask --- :ref:`flask:distribute-deployment`
-      How to deploy Flask application using distribute_.
+      How to deploy Flask application using setuptools_.
 
 If libsass has been installed in the :file:`site-packages` (for example,
 your virtualenv), :file:`setup.py` script also gets had new command
@@ -173,4 +172,4 @@ command before.  Make :file:`setup.cfg` config:
 Now it automatically builds SASS/SCSS sources and include compiled CSS files
 to the package archive when you run :program:`setup.py sdist`.
 
-.. _distribute: http://pypi.python.org/pypi/distribute
+.. _setuptools: https://pypi.python.org/pypi/setuptools

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@`
`249`	`249`	`# Example configuration for intersphinx: refer to the Python standard library.`
`250`	`250`	`intersphinx_mapping = {`
`251`	`251`	`'python': ('http://docs.python.org/', None),`
`252`		`- 'distribute': ('http://packages.python.org/distribute/', None),`
	`252`	`+ 'setuptools': ('http://pythonhosted.org/setuptools/', None),`
`253`	`253`	`'flask': ('http://flask.pocoo.org/docs/', None)`
`254`	`254`	`}`
`255`	`255`