Merge branch 'master' into 0.9

1 files changed, 4 insertions, 4 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 2979560..dc68fd4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,7 +49,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'kafka-python'
-copyright = u'2015, David Arthur'
+copyright = u'2015 - David Arthur, Dana Powers, 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
@@ -203,7 +203,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   ('index', 'kafka-python.tex', u'kafka-python Documentation',
-   u'David Arthur', 'manual'),
+   u'Dana Powers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -233,7 +233,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'kafka-python', u'kafka-python Documentation',
-     [u'David Arthur'], 1)
+     [u'Dana Powers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -247,7 +247,7 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'kafka-python', u'kafka-python Documentation',
-   u'David Arthur', 'kafka-python', 'One line description of project.',
+   u'Dana Powers', 'kafka-python', 'One line description of project.',
    'Miscellaneous'),
 ]