diff options
| author | Jonathan Corbet <[email protected]> | 2020-02-25 03:22:29 -0700 |
|---|---|---|
| committer | Jonathan Corbet <[email protected]> | 2020-02-25 03:22:29 -0700 |
| commit | 2f5ab6225fa2bd1435a65e9a2c5503e5b5cf4b45 (patch) | |
| tree | 455e2dd45375ad600370278674c9153e654a53f1 | |
| parent | a3aead706dac19ca504c31ed5d6b3e141addbaec (diff) | |
| parent | adc10f5b0a03606e30c704cff1f0283a696d0260 (diff) | |
Merge tag 'docs-5.6-fixes' into docs-next
A pair of docs-build fixes.
| -rw-r--r-- | Documentation/sphinx/parallel-wrapper.sh | 2 | ||||
| -rw-r--r-- | Documentation/x86/index.rst | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/sphinx/parallel-wrapper.sh b/Documentation/sphinx/parallel-wrapper.sh index 7daf5133bdd3..e54c44ce117d 100644 --- a/Documentation/sphinx/parallel-wrapper.sh +++ b/Documentation/sphinx/parallel-wrapper.sh @@ -30,4 +30,4 @@ if [ -n "$parallel" ] ; then parallel="-j$parallel" fi -exec "$sphinx" "$parallel" "$@" +exec "$sphinx" $parallel "$@" diff --git a/Documentation/x86/index.rst b/Documentation/x86/index.rst index a8de2fbc1caa..265d9e9a093b 100644 --- a/Documentation/x86/index.rst +++ b/Documentation/x86/index.rst @@ -19,7 +19,6 @@ x86-specific Documentation tlb mtrr pat - intel_mpx intel-iommu intel_txt amd-memory-encryption |