aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/conf.py
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2016-08-12 17:13:33 -0600
committerJonathan Corbet <corbet@lwn.net>2016-08-12 17:13:33 -0600
commit34df2a45bdcea483c46ba80dd1197720b5416c48 (patch)
treec61416f6e560cef16ab4adb02f2caeb294601803 /Documentation/conf.py
parentDocumentation: exclude media documentation from pdf generation (diff)
parentdocs: kernel-documentation: remove some highlight directives (diff)
downloadlinux-dev-34df2a45bdcea483c46ba80dd1197720b5416c48.tar.xz
linux-dev-34df2a45bdcea483c46ba80dd1197720b5416c48.zip
Merge branch 'doc/4.8-fixes' into docs-next
Diffstat (limited to 'Documentation/conf.py')
-rw-r--r--Documentation/conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 827dafc515b1..b198147b8bc5 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -131,7 +131,7 @@ pygments_style = 'sphinx'
todo_include_todos = False
primary_domain = 'C'
-highlight_language = 'C'
+highlight_language = 'guess'
# -- Options for HTML output ----------------------------------------------