Merge tag 'docs-5.6-2' of git://git.lwn.net/linux

Pull Documentation fixes from Jonathan Corbet: "A handful of small documentation fixes that wandered in" * tag 'docs-5.6-2' of git://git.lwn.net/linux: Allow git builds of Sphinx Documentation: changes.rst: update several outdated project URLs Documentation: build warnings related to missing blank lines after explicit markups has been fixed mailmap: add entry for Tiezhu Yang Documentation/ko_KR/howto: Update a broken link Documentation/ko_KR/howto: Update broken web addresses docs/locking: Fix outdated section names

Linus Torvalds committed 6 years ago

Commit 41dcd672 parents 11777ee d1c90389 files · +27 −17Browse files

Showing the changes to scripts (1 of 9 files). Show all

Unified · Split

scripts/sphinx-pre-install+1−1

@@ -272,7 +272,7 @@ sub check_sphinx() · 271 unmodified lines
272	272
273	273	open IN, "$sphinx --version 2>&1 \|" or die "$sphinx returned an error";
274	274	while (<IN>) {
275		− if (m/^\s*sphinx-build\s+([\d\.]+)$/) {
	275	+ if (m/^\s*sphinx-build\s+([\d\.]+)(\+\/[\da-f]+)?$/) {
276	276	$cur_version=$1;
277	277	last;
278	278	}