diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-20 15:17:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-20 15:17:55 -0800 |
| commit | 1351522b5f627f06e44e781805b5bd5c01566cf3 (patch) | |
| tree | e44eaf09047de1de798a2939d1cecd2b87253b3a /Documentation | |
| parent | Merge tag 'microblaze-4.10-rc1' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| parent | docs: sphinx-extensions: make rstFlatTable work with docutils 0.13 (diff) | |
| download | linux-dev-1351522b5f627f06e44e781805b5bd5c01566cf3.tar.xz linux-dev-1351522b5f627f06e44e781805b5bd5c01566cf3.zip | |
Merge tag 'doc-4.10-3' of git://git.lwn.net/linux
Pull documentation fix from Jonathan Corbet:
"A single fix for the build system.
It would appear that the docutils developers, in their wisdom, broke
the API in the 0.13 release. This fix detects the breakage and allows
the docs to be built with both the old and new versions"
* tag 'doc-4.10-3' of git://git.lwn.net/linux:
docs: sphinx-extensions: make rstFlatTable work with docutils 0.13
Diffstat (limited to 'Documentation')
| -rwxr-xr-x | Documentation/sphinx/rstFlatTable.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/sphinx/rstFlatTable.py b/Documentation/sphinx/rstFlatTable.py index 55f275793028..25feb0d35e7a 100755 --- a/Documentation/sphinx/rstFlatTable.py +++ b/Documentation/sphinx/rstFlatTable.py @@ -157,6 +157,11 @@ class ListTableBuilder(object): def buildTableNode(self): colwidths = self.directive.get_column_widths(self.max_cols) + if isinstance(colwidths, tuple): + # Since docutils 0.13, get_column_widths returns a (widths, + # colwidths) tuple, where widths is a string (i.e. 'auto'). + # See https://sourceforge.net/p/docutils/patches/120/. + colwidths = colwidths[1] stub_columns = self.directive.options.get('stub-columns', 0) header_rows = self.directive.options.get('header-rows', 0) |