diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 20:32:18 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 20:32:18 +0100 |
commit | be834aafdf5f8a37c191e697ac8ee6d53ab5020c (patch) | |
tree | e5c4bce3fd97c046c7367b9eb46d25b35c2f84aa /Documentation/conf.py | |
parent | Merge tag 'staging-4.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | Documentation/sphinx: fix primary_domain configuration (diff) | |
download | linux-be834aafdf5f8a37c191e697ac8ee6d53ab5020c.tar.xz linux-be834aafdf5f8a37c191e697ac8ee6d53ab5020c.zip |
Merge tag 'docs-4.11-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet:
"A few fixes for the docs tree, including one for a 4.11 build
regression"
* tag 'docs-4.11-fixes' of git://git.lwn.net/linux:
Documentation/sphinx: fix primary_domain configuration
docs: Fix htmldocs build failure
doc/ko_KR/memory-barriers: Update control-dependencies section
pcieaer doc: update the link
Documentation: Update path to sysrq.txt
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 f6823cf01275..7fadb3b83293 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -135,7 +135,7 @@ pygments_style = 'sphinx' # If true, `todo` and `todoList` produce output, else they produce nothing. todo_include_todos = False -primary_domain = 'C' +primary_domain = 'c' highlight_language = 'none' # -- Options for HTML output ---------------------------------------------- |