Add Ian to list of maintainers.

4 files changed, 13 insertions, 5 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 4bcfcf7..2fbab2d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,12 @@ Changelog
 1.x (unreleased)
 ----------------
 
+News:
+
+* Ian Lee <ianlee1521@gmail.com> joined the project as a maintainer.
+
+Bug fixes:
+
 * Report E731 for lambda assignment. (Issue #277)
 
 * Report E704 for one-liner def instead of E701.
diff --git a/docs/conf.py b/docs/conf.py
index cd288cc..d1dca3c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -45,7 +45,8 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'pep8'
-copyright = u'2012-2013, Florent Xicluna'
+authors = u'Johann C. Rocholl, Florent Xicluna, Ian Lee'
+copyright = u'2006-2014, %s' % (authors)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -192,7 +193,7 @@ latex_elements = {
 #  author, documentclass [howto/manual]).
 latex_documents = [
     ('index', 'pep8.tex', u'pep8 documentation',
-     u'Florent Xicluna', 'manual'),
+     authors, 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -222,7 +223,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'pep8', u'pep8 documentation',
-     [u'Florent Xicluna'], 1)
+     [authors], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -235,7 +236,7 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'pep8', u'pep8 documentation', u'Florent Xicluna',
+    ('index', 'pep8', u'pep8 documentation', authors,
      'pep8', 'One line description of project.',
      'Miscellaneous'),
 ]
diff --git a/docs/index.rst b/docs/index.rst
index eb3f21a..5500e0d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -37,7 +37,7 @@ Credits
 
 Created by Johann C. Rocholl.
 
-Maintained by Florent Xicluna.
+Maintained by Florent Xicluna and Ian Lee.
 
 
 .. _license:
diff --git a/pep8.py b/pep8.py
index b31a978..1000a06 100755
--- a/pep8.py
+++ b/pep8.py
@@ -2,6 +2,7 @@
 # pep8.py - Check Python source code formatting, according to PEP 8
 # Copyright (C) 2006-2009 Johann C. Rocholl <johann@rocholl.net>
 # Copyright (C) 2009-2014 Florent Xicluna <florent.xicluna@gmail.com>
+# Copyright (C) 2014 Ian Lee <ianlee1521@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files