diff options
| author | Dana Powers <dana.powers@rd.io> | 2016-01-07 18:51:14 -0800 |
|---|---|---|
| committer | Dana Powers <dana.powers@rd.io> | 2016-01-07 18:51:14 -0800 |
| commit | 828377377da43749af0d27ee256ef31bf714cf17 (patch) | |
| tree | fbad4d4381fc4d1ea2be7ce2009214d18fbeb674 /docs/conf.py | |
| parent | 71e7568fcb8132899f366b37c32645fd5a40dc4b (diff) | |
| parent | 9a8af1499ca425366d934487469d9977fae7fe5f (diff) | |
| download | kafka-python-828377377da43749af0d27ee256ef31bf714cf17.tar.gz | |
Merge branch '0.9'
Conflicts:
kafka/codec.py
kafka/version.py
test/test_producer.py
test/test_producer_integration.py
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py index dc68fd4..66f9663 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -32,7 +32,7 @@ extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.viewcode', - 'sphinxcontrib.napoleon', + 'sphinx.ext.napoleon', ] # Add any paths that contain templates here, relative to this directory. @@ -49,7 +49,7 @@ master_doc = 'index' # General information about the project. project = u'kafka-python' -copyright = u'2015 - David Arthur, Dana Powers, and Contributors' +copyright = u'2016 -- Dana Powes, David Arthur, and Contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the |