aboutsummaryrefslogtreecommitdiffstats
path: root/docs/conf.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-01-02 18:38:36 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-01-02 18:38:36 -0500
commit16ee10c47583a4a2b7480af6fc5a205343acfdfd (patch)
tree7cfbb6d488a92fa01ddb86d6f226f549ad26a01e /docs/conf.py
parent866ff739f6e64aaaefcf7816263410527c9f55f7 (diff)
parent41f2c5ec8dd669747f3cfd8d6b2ae9a40d219545 (diff)
downloadexternal_python_setuptools-16ee10c47583a4a2b7480af6fc5a205343acfdfd.tar.gz
external_python_setuptools-16ee10c47583a4a2b7480af6fc5a205343acfdfd.tar.bz2
external_python_setuptools-16ee10c47583a4a2b7480af6fc5a205343acfdfd.zip
Merge with 10.2.1
--HG-- branch : feature/issue-229
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 8be5c3dd..5ea2e05e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -28,7 +28,7 @@ import setup as setup_script
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
+extensions = ['linkify']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -44,7 +44,7 @@ master_doc = 'index'
# General information about the project.
project = 'Setuptools'
-copyright = '2009-2013, The fellowship of the packaging'
+copyright = '2009-2014, The fellowship of the packaging'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the