diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-18 18:54:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-18 18:54:40 -0700 |
| commit | 5cae6fe27a1dc4053ae2f8f52ef1ef2ca860bbfb (patch) | |
| tree | dede384fddd9728847f54cdbb318545e6ea3835b /Documentation/conf.py | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | doc-rst: customize RTD theme, drop padding of inline literal (diff) | |
| download | linux-dev-5cae6fe27a1dc4053ae2f8f52ef1ef2ca860bbfb.tar.xz linux-dev-5cae6fe27a1dc4053ae2f8f52ef1ef2ca860bbfb.zip | |
Merge tag '4.8-doc-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet:
"Three small fixes for Sphinx-formatted documentation generation"
* tag '4.8-doc-fixes' of git://git.lwn.net/linux:
doc-rst: customize RTD theme, drop padding of inline literal
docs: kernel-documentation: remove some highlight directives
docs: Set the Sphinx default highlight language to "guess"
Diffstat (limited to 'Documentation/conf.py')
| -rw-r--r-- | Documentation/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py index 96b7aa66c89c..106ae9c740b9 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 ---------------------------------------------- |