diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-08-13 02:13:33 +0300 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-08-13 02:13:33 +0300 |
| commit | 34df2a45bdcea483c46ba80dd1197720b5416c48 (patch) | |
| tree | c61416f6e560cef16ab4adb02f2caeb294601803 | |
| parent | 3eb6cd6834c356f40e1633a0ced4ff9a4c59936b (diff) | |
| parent | c2d5be14cb39da34b076b461d8aa2344611364c6 (diff) | |
| download | linux-34df2a45bdcea483c46ba80dd1197720b5416c48.tar.xz | |
Merge branch 'doc/4.8-fixes' into docs-next
| -rw-r--r-- | Documentation/conf.py | 2 | ||||
| -rw-r--r-- | Documentation/kernel-documentation.rst | 6 |
2 files changed, 1 insertions, 7 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 ---------------------------------------------- diff --git a/Documentation/kernel-documentation.rst b/Documentation/kernel-documentation.rst index c4eb5049da39..391decc66a18 100644 --- a/Documentation/kernel-documentation.rst +++ b/Documentation/kernel-documentation.rst @@ -366,8 +366,6 @@ Domain`_ references. Cross-referencing from reStructuredText ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. highlight:: none - To cross-reference the functions and types defined in the kernel-doc comments from reStructuredText documents, please use the `Sphinx C Domain`_ references. For example:: @@ -390,8 +388,6 @@ For further details, please refer to the `Sphinx C Domain`_ documentation. Function documentation ---------------------- -.. highlight:: c - The general format of a function and function-like macro kernel-doc comment is:: /** @@ -572,8 +568,6 @@ DocBook XML [DEPRECATED] Converting DocBook to Sphinx ---------------------------- -.. highlight:: none - Over time, we expect all of the documents under ``Documentation/DocBook`` to be converted to Sphinx and reStructuredText. For most DocBook XML documents, a good enough solution is to use the simple ``Documentation/sphinx/tmplcvt`` script, |