diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-07 22:03:10 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-07 22:03:10 +0100 |
| commit | 41dcd67e88688afbeb3b2bd23960eed5daec74e7 (patch) | |
| tree | 4e270335606ed568f544900e77e866a5437bcc69 /scripts | |
| parent | Merge branch 'i2c/for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/w... (diff) | |
| parent | Allow git builds of Sphinx (diff) | |
| download | linux-41dcd67e88688afbeb3b2bd23960eed5daec74e7.tar.xz linux-41dcd67e88688afbeb3b2bd23960eed5daec74e7.zip | |
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-x | scripts/sphinx-pre-install | 2 |
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; } |