Merge tag 'doc-4.10-3' of git://git.lwn.net/linux (1351522b) · Commits · 戴 / test

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

Documentation/sphinx/rstFlatTable.py

+5 −0

Original line number	Diff line number	Diff line
		@@ -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)

Admin message