summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-27 23:42:04 -0500
committerChris McDonough <chrism@plope.com>2010-11-27 23:42:04 -0500
commit77d15aef3237b05b18af5630a31bfe50a8c443af (patch)
tree2427cb5cd2064963b46d23d9228c02e72e58da48 /docs/conf.py
parente6261fa3a07c38cb8cd2877aa51f5c3ae8521782 (diff)
parent8069e93ea3d1d8a837ad427023f9f245fa3204e3 (diff)
downloadpyramid-77d15aef3237b05b18af5630a31bfe50a8c443af.tar.gz
pyramid-77d15aef3237b05b18af5630a31bfe50a8c443af.tar.bz2
pyramid-77d15aef3237b05b18af5630a31bfe50a8c443af.zip
Merge branch 'blaflamme-master'
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 653f7ab15..3de2f7ac4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -110,6 +110,9 @@ add_module_names = False
# The name of the Pygments (syntax highlighting) style to use.
#pygments_style = book and 'bw' or 'tango'
+# The default language to highlight source code in.
+highlight_language = 'guess'
+
# Options for HTML output
# -----------------------