Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34df2a45 authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

Merge branch 'doc/4.8-fixes' into docs-next

parents 3eb6cd68 c2d5be14

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ pygments_style = 'sphinx' 
todo_include_todos = False



primary_domain = 'C'

highlight_language = 'C'

highlight_language = 'guess'



# -- Options for HTML output ----------------------------------------------

Documentation/kernel-documentation.rst

+0 −6
Original line number Diff line number Diff line
@@ -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,