[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4
georg.brandl
python-checkins at python.org
Wed Oct 29 08:06:00 CET 2014
https://hg.python.org/cpython/rev/c9533e4a861c
changeset: 93216:c9533e4a861c
parent: 93214:55c4ac3a8cd5
parent: 93215:d6a6f13ab7e6
user: Georg Brandl <georg at python.org>
date: Wed Oct 29 08:04:31 2014 +0100
summary:
merge with 3.4
files:
Doc/conf.py | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/Doc/conf.py b/Doc/conf.py
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -14,7 +14,6 @@
extensions = ['sphinx.ext.coverage', 'sphinx.ext.doctest',
'pyspecific', 'c_annotations']
-templates_path = ['tools']
# General substitutions.
project = 'Python'
@@ -31,16 +30,6 @@
# Else, today_fmt is used as the format for a strftime call.
today_fmt = '%B %d, %Y'
-# Relative filename of the reference count data file.
-refcount_file = 'data/refcounts.dat'
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-add_module_names = True
-
# By default, highlight as Python 3.
highlight_language = 'python3'
@@ -51,19 +40,20 @@
# Options for HTML output
# -----------------------
+# Use our custom theme.
html_theme = 'pydoctheme'
html_theme_path = ['tools']
html_theme_options = {'collapsiblesidebar': True}
+# Short title used e.g. for <title> HTML tags.
html_short_title = '%s Documentation' % release
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
html_last_updated_fmt = '%b %d, %Y'
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-html_use_smartypants = True
+# Path to find HTML templates.
+templates_path = ['tools']
# Custom sidebar templates, filenames relative to this file.
html_sidebars = {
@@ -145,6 +135,7 @@
# Get LaTeX to handle Unicode correctly
latex_elements = {'inputenc': r'\usepackage[utf8x]{inputenc}', 'utf8extra': ''}
+
# Options for the coverage checker
# --------------------------------
@@ -180,3 +171,9 @@
coverage_ignore_c_items = {
# 'cfunction': [...]
}
+
+# Options for extensions
+# ----------------------
+
+# Relative filename of the reference count data file.
+refcount_file = 'data/refcounts.dat'
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list