diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 7e7f341fc..16566761b 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -8,7 +8,8 @@
     creates a modules index (named modules.<suffix>).
 
     This is derived from the "sphinx-autopackage" script, which is:
-    Copyright 2008 Société des arts technologiques (SAT), http://www.sat.qc.ca/
+    Copyright 2008 Société des arts technologiques (SAT),
+    http://www.sat.qc.ca/
 
     :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
index de1578a26..faba11605 100644
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
@@ -79,7 +79,8 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst',
         sources = [os.path.join(base_path, filename) for filename in sources]
 
     # create our own templating environment
-    template_dirs = [os.path.join(package_dir, 'ext', 'autosummary', 'templates')]
+    template_dirs = [os.path.join(package_dir, 'ext',
+                                  'autosummary', 'templates')]
     if builder is not None:
         # allow the user to override the templates
         template_loader = BuiltinTemplateLoader()
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 88be5ceee..86dc04762 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -267,8 +267,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('%(master_str)s', '%(project_fn)s', u'%(project_doc_str)s', u'%(author_str)s',
-   '%(project_fn)s', 'One line description of project.', 'Miscellaneous'),
+  ('%(master_str)s', '%(project_fn)s', u'%(project_doc_str)s',
+   u'%(author_str)s', '%(project_fn)s', 'One line description of project.',
+   'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.