Skip to content

Documentation/sphinx

Jani Nikula lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest38 patches 8 repliesIn review
  2. v110 patches 34 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/38kernel-doc/rst: fix use of uninitialized valuescripts/kernel-doc+2 -10 replies
2/38kernel-doc: support printing exported and non-exported symbolsscripts/kernel-doc+27 -20 replies
3/38Documentation/sphinx: add basic working Sphinx configuration and buildDocumentation/DocBook/Makefile Documentation/Makefile.sphinx Documentation/conf.py +2 more+478 -50 replies
4/38Documentation: add .gitignoreDocumentation/.gitignore+1 -00 replies
5/38Documentation/sphinx: add Sphinx kernel-doc directive extensionDocumentation/sphinx/kernel-doc.py+102 -00 replies
6/38Documentation/sphinx: configure the kernel-doc extensionDocumentation/Makefile.sphinx Documentation/conf.py+11 -30 replies
7/38Documentation/sphinx: set version and release properlyDocumentation/Makefile.sphinx Documentation/conf.py+26 -50 replies
8/38sphinx: cheesy script to convert .tmpl filesDocumentation/sphinx/convert_template.sed Documentation/sphinx/post_convert.sed Documentation/sphinx/tmplcvt+52 -00 replies
9/38sphinx: update docbook->rst conversion script match C domain specDocumentation/sphinx/convert_template.sed+4 -40 replies
10/38Documentation/sphinx: nicer referencing of struct in docbook->rst conversionDocumentation/sphinx/convert_template.sed Documentation/sphinx/post_convert.sed+14 -60 replies
11/38kernel-doc: add names for states and substatesscripts/kernel-doc+48 -430 replies
12/38kernel-doc: add names for output selectionscripts/kernel-doc+30 -170 replies
13/38kernel-doc/rst: do not output DOC: section titles for requested onesscripts/kernel-doc+3 -10 replies
14/38kernel-doc/rst: reference functions according to C domain specscripts/kernel-doc+1 -10 replies
15/38kernel-doc/rst: &foo references are more universal than structsscripts/kernel-doc+2 -10 replies
16/38kernel-doc/rst: add support for &union foo and &typedef foo referencesscripts/kernel-doc+4 -00 replies
17/38kernel-doc/rst: add support for struct/union/enum member referencesscripts/kernel-doc+5 -00 replies
18/38kernel-doc/rst: drop redundant unescape in highlightingscripts/kernel-doc+0 -10 replies
19/38kernel-doc/rst: highlight function/struct/enum purpose lines tooscripts/kernel-doc+25 -120 replies
20/38kernel-doc: do not regard $, %, or & prefixes as special in section namesscripts/kernel-doc+2 -120 replies
21/38kernel-doc: fix wrong code indentationscripts/kernel-doc+1 -10 replies
22/38kernel-doc/rst: blank lines in output are not neededscripts/kernel-doc+1 -60 replies
23/38kernel-doc: strip leading blank lines from inline doc commentsscripts/kernel-doc+4 -00 replies
24/38kernel-doc/rst: change the output layoutscripts/kernel-doc+17 -170 replies
25/38kernel-doc: improve handling of whitespace on the first line param descriptionscripts/kernel-doc+4 -40 replies
26/38kernel-doc: strip leading whitespace from continued param descsscripts/kernel-doc+15 -10 replies
27/38kernel-doc/rst: use *undescribed* instead of _undescribed_scripts/kernel-doc+2 -20 replies
28/38kernel-doc/rst: remove fixme commentscripts/kernel-doc+0 -10 replies
29/38kernel-doc: limit the "section header:" detection to a select fewscripts/kernel-doc+17 -22 replies
30/38kernel-doc: concatenate contents of colliding sectionsscripts/kernel-doc+6 -40 replies
31/38kernel-doc: reset contents and section harderscripts/kernel-doc+3 -00 replies
32/38Documentation/sphinx: fix kernel-doc extension on python3Documentation/sphinx/kernel-doc.py+7 -20 replies
33/38doc/sphinx: Pass right filename as sourceDocumentation/sphinx/kernel-doc.py+1 -10 replies
34/38scripts/kernel-doc: Remove duplicated DOC: start handlingscripts/kernel-doc+1 -180 replies
35/38doc/sphinx: Stop touching state_machine internalsDocumentation/sphinx/kernel-doc.py+9 -20 replies
36/38scripts/kernel-doc: Also give functions symbolic namesscripts/kernel-doc+4 -40 replies
37/38scripts/kernel-doc: Add option to inject line numbersscripts/kernel-doc+41 -00 replies
38/38doc/sphinx: Track line-number of starting blocksDocumentation/sphinx/kernel-doc.py+15 -20 replies

Reviews trailers per patch

None of the 38 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMarius VladDaniel Vetter
SeriesA-b T-b
1/38
2/38
3/38
4/38
5/38
6/38
7/38
8/38
9/38
10/38
11/38
12/38
13/38
14/38
15/38
16/38
17/38
18/38
19/38
20/38
21/38
22/38
23/38
24/38
25/38
26/38
27/38
28/38
29/38
30/38
31/38
32/38Reported-and-tested-by
33/38
34/38
35/38
36/38
37/38
38/38

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/38] Documentation/sphinx

Jon, this is v2 of [1] and [2], with a considerable amount of polish and fixes added. We started dogfooding this within drm-intel, and Daniel has reviewed the lot and contributed a number of fixes, most notably accurate file and line number references from Sphinx build errors/warnings to the kernel-doc comments in source code.

We believe this is now in good shape for merging for v4.8. It's all in my sphinx-for-docs-next branch that you've already looked at; pull details below.

When this lands in docs-next and we can backmerge to drm, we'll plunge ahead and convert gpu.tmpl to rst, and have that ready for v4.8. We think it's best to contribute that via the drm tree, as it'll involve splitting up the documentation and likely numerous updates to kernel-doc comments.

I plan to update Documentation/kernel-doc-nano-HOWTO.txt for Sphinx and rst, obviously converting it to rst while at it.

BR,
Jani.

[1] http://mid.gmane.org/[email protected]
[2] http://mid.gmane.org/[email protected]

The following changes since commit 1a695a905c18548062509178b98bc91e67510864:

Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)

are available in the git repository at:

git://people.freedesktop.org/~jani/drm sphinx-for-docs-next

for you to fetch changes up to d90368f2fa7ded7c56d214aef087e88bba5199e7:

doc/sphinx: Track line-number of starting blocks (2016-06-04 11:35:59 +0300)

----------------------------------------------------------------
Daniel Vetter (6):
doc/sphinx: Pass right filename as source scripts/kernel-doc: Remove duplicated DOC: start handling doc/sphinx: Stop touching state_machine internals scripts/kernel-doc: Also give functions symbolic names scripts/kernel-doc: Add option to inject line numbers doc/sphinx: Track line-number of starting blocks

Jani Nikula (31):
kernel-doc/rst: fix use of uninitialized value
kernel-doc: support printing exported and non-exported symbols Documentation/sphinx: add basic working Sphinx configuration and build
Documentation: add .gitignore
Documentation/sphinx: add Sphinx kernel-doc directive extension Documentation/sphinx: configure the kernel-doc extension Documentation/sphinx: set version and release properly
sphinx: update docbook->rst conversion script match C domain spec Documentation/sphinx: nicer referencing of struct in docbook->rst conversion
kernel-doc: add names for states and substates
kernel-doc: add names for output selection
kernel-doc/rst: do not output DOC: section titles for requested ones kernel-doc/rst: reference functions according to C domain spec kernel-doc/rst: &foo references are more universal than structs kernel-doc/rst: add support for &union foo and &typedef foo references kernel-doc/rst: add support for struct/union/enum member references kernel-doc/rst: drop redundant unescape in highlighting kernel-doc/rst: highlight function/struct/enum purpose lines too
kernel-doc: do not regard $, %, or & prefixes as special in section names
kernel-doc: fix wrong code indentation
kernel-doc/rst: blank lines in output are not needed
kernel-doc: strip leading blank lines from inline doc comments kernel-doc/rst: change the output layout
kernel-doc: improve handling of whitespace on the first line param description
kernel-doc: strip leading whitespace from continued param descs kernel-doc/rst: use *undescribed* instead of _undescribed_ kernel-doc/rst: remove fixme comment
kernel-doc: limit the "section header:" detection to a select few
kernel-doc: concatenate contents of colliding sections
kernel-doc: reset contents and section harder Documentation/sphinx: fix kernel-doc extension on python3

Jonathan Corbet (1):
sphinx: cheesy script to convert .tmpl files

 Documentation/.gitignore                  |   1 +
 Documentation/DocBook/Makefile            |   7 +-
 Documentation/Makefile.sphinx             |  63 +++++
 Documentation/conf.py                     | 414 ++++++++++++++++++++++++++++++
 Documentation/index.rst                   |  23 ++
 Documentation/sphinx/convert_template.sed |  18 ++
 Documentation/sphinx/kernel-doc.py        | 127 +++++++++
 Documentation/sphinx/post_convert.sed     |  23 ++
 Documentation/sphinx/tmplcvt              |  19 ++
 Makefile                                  |   5 +-
 scripts/kernel-doc                        | 392 ++++++++++++++++++----------
 11 files changed, 948 insertions(+), 144 deletions(-)
 create mode 100644 Documentation/.gitignore
 create mode 100644 Documentation/Makefile.sphinx
 create mode 100644 Documentation/conf.py
 create mode 100644 Documentation/index.rst
 create mode 100644 Documentation/sphinx/convert_template.sed
 create mode 100644 Documentation/sphinx/kernel-doc.py
 create mode 100644 Documentation/sphinx/post_convert.sed
 create mode 100755 Documentation/sphinx/tmplcvt
Signature · 1 line
2.1.4