summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-07 13:03:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-07 13:03:10 -0800
commit41dcd67e88688afbeb3b2bd23960eed5daec74e7 (patch)
tree4e270335606ed568f544900e77e866a5437bcc69 /scripts
parent11777ee8b04acab07c96959e9c6ac6a1603d0958 (diff)
parentd1c9038ab5c1c96c0fd9d13ec56f2d650fe4c59f (diff)
downloadlinux-41dcd67e88688afbeb3b2bd23960eed5daec74e7.tar.bz2
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
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/sphinx-pre-install2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index 470ccfe678aa..a8f0c002a340 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -272,7 +272,7 @@ sub check_sphinx()
open IN, "$sphinx --version 2>&1 |" or die "$sphinx returned an error";
while (<IN>) {
- if (m/^\s*sphinx-build\s+([\d\.]+)$/) {
+ if (m/^\s*sphinx-build\s+([\d\.]+)(\+\/[\da-f]+)?$/) {
$cur_version=$1;
last;
}