Reformat to EOL80.

1 files changed, 27 insertions, 27 deletions

diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 67ab62731..c0a219efa 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -15,7 +15,8 @@ from os import path
 TERM_ENCODING = getattr(sys.stdin, 'encoding', None)
 
 from sphinx.util import make_filename
-from sphinx.util.console import purple, bold, red, turquoise, nocolor, color_terminal
+from sphinx.util.console import purple, bold, red, turquoise, \
+     nocolor, color_terminal
 from sphinx.util import texescape
 
 
@@ -29,9 +30,6 @@ QUICKSTART_CONF = '''\
 #
 # This file is execfile()d with the current directory set to its containing dir.
 #
-# The contents of this file are pickled, so don't put values in the namespace
-# that aren't pickleable (module imports are okay, they're removed automatically).
-#
 # Note that not all possible configuration values are present in this
 # autogenerated file.
 #
@@ -45,8 +43,7 @@ import sys, os
 # absolute, like shown here.
 #sys.path.append(os.path.abspath('.'))
 
-# General configuration
-# ---------------------
+# -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
@@ -112,8 +109,7 @@ exclude_trees = [%(exclude_trees)s]
 pygments_style = 'sphinx'
 
 
-# Options for HTML output
-# -----------------------
+# -- Options for HTML output ---------------------------------------------------
 
 # The style sheet to use for HTML and HTML Help pages. A file of that name
 # must exist either in Sphinx' static/ path, or in one of the custom paths
@@ -180,8 +176,7 @@ html_static_path = ['%(dot)sstatic']
 htmlhelp_basename = '%(project_fn)sdoc'
 
 
-# Options for LaTeX output
-# ------------------------
+# -- Options for LaTeX output --------------------------------------------------
 
 # The paper size ('letter' or 'a4').
 #latex_paper_size = 'letter'
@@ -190,7 +185,7 @@ htmlhelp_basename = '%(project_fn)sdoc'
 #latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, document class [howto/manual]).
+# (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('%(master)s', '%(project_fn)s.tex', ur'%(project_doc_texescaped)s',
    ur'%(author_texescaped)s', 'manual'),
@@ -217,11 +212,12 @@ latex_documents = [
 INTERSPHINX_CONFIG = '''
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/dev': None}
+intersphinx_mapping = {'http://docs.python.org/': None}
 '''
 
 MASTER_FILE = '''\
-.. %(project)s documentation master file, created by sphinx-quickstart on %(now)s.
+.. %(project)s documentation master file, created by
+   sphinx-quickstart on %(now)s.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
@@ -267,7 +263,7 @@ help:
 \t@echo "  htmlhelp  to make HTML files and a HTML help project"
 \t@echo "  qthelp    to make HTML files and a qthelp project"
 \t@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-\t@echo "  changes   to make an overview over all changed/added/deprecated items"
+\t@echo "  changes   to make an overview of all changed/added/deprecated items"
 \t@echo "  linkcheck to check all external links for integrity"
 
 clean:
@@ -466,8 +462,9 @@ def do_prompt(d, key, text, default=None, validator=nonempty):
             if TERM_ENCODING:
                 x = x.decode(TERM_ENCODING)
             else:
-                print turquoise('* Note: non-ASCII characters entered and terminal '
-                                'encoding unknown -- assuming UTF-8 or Latin-1.')
+                print turquoise('* Note: non-ASCII characters entered '
+                                'and terminal encoding unknown -- assuming '
+                                'UTF-8 or Latin-1.')
                 try:
                     x = x.decode('utf-8')
                 except UnicodeDecodeError:
@@ -502,8 +499,8 @@ Enter the root path for documentation.'''
                    'selected root path.')
         print 'sphinx-quickstart will not overwrite existing Sphinx projects.'
         print
-        do_prompt(d, 'path', 'Please enter a new root path (or just Enter to exit)',
-                  '', is_path)
+        do_prompt(d, 'path', 'Please enter a new root path (or just Enter '
+                  'to exit)', '', is_path)
         if not d['path']:
             sys.exit(1)
 
@@ -516,8 +513,8 @@ Either, you use a directory "_build" within the root path, or you separate
 
     print '''
 Inside the root directory, two more directories will be created; "_templates"
-for custom HTML templates and "_static" for custom stylesheets and other
-static files. You can enter another prefix (such as ".") to replace the underscore.'''
+for custom HTML templates and "_static" for custom stylesheets and other static
+files. You can enter another prefix (such as ".") to replace the underscore.'''
     do_prompt(d, 'dot', 'Name prefix for templates and static dir', '_', ok)
 
     print '''
@@ -549,26 +546,29 @@ Please indicate if you want to use one of the following Sphinx extensions:'''
               'from modules (y/N)', 'n', boolean)
     do_prompt(d, 'ext_doctest', 'doctest: automatically test code snippets '
               'in doctest blocks (y/N)', 'n', boolean)
-    do_prompt(d, 'ext_intersphinx', 'intersphinx: link between Sphinx documentation '
-              'of different projects (y/N)', 'n', boolean)
+    do_prompt(d, 'ext_intersphinx', 'intersphinx: link between Sphinx '
+              'documentation of different projects (y/N)', 'n', boolean)
     print '''
 A Makefile and a Windows command file can be generated for you so that you
 only have to run e.g. `make html' instead of invoking sphinx-build
 directly.'''
     do_prompt(d, 'makefile', 'Create Makefile? (Y/n)', 'y', boolean)
-    do_prompt(d, 'batchfile', 'Create Windows command file? (Y/n)', 'y', boolean)
+    do_prompt(d, 'batchfile', 'Create Windows command file? (Y/n)',
+              'y', boolean)
 
     d['project_fn'] = make_filename(d['project'])
     d['now'] = time.asctime()
     d['underline'] = len(d['project']) * '='
     d['extensions'] = ', '.join(
-        repr('sphinx.ext.' + name) for name in ('autodoc', 'doctest', 'intersphinx')
+        repr('sphinx.ext.' + name) for name in ('autodoc', 'doctest',
+                                                'intersphinx')
         if d['ext_' + name].upper() in ('Y', 'YES'))
     d['copyright'] = time.strftime('%Y') + ', ' + d['author']
-    d['author_texescaped'] = unicode(d['author']).translate(texescape.tex_escape_map)
+    d['author_texescaped'] = unicode(d['author']).\
+                             translate(texescape.tex_escape_map)
     d['project_doc'] = d['project'] + ' Documentation'
-    d['project_doc_texescaped'] = \
-        unicode(d['project'] + ' Documentation').translate(texescape.tex_escape_map)
+    d['project_doc_texescaped'] = unicode(d['project'] + ' Documentation').\
+                                  translate(texescape.tex_escape_map)
 
     if not path.isdir(d['path']):
         mkdir_p(d['path'])