aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2020-02-25 03:22:29 -0700
committerJonathan Corbet <corbet@lwn.net>2020-02-25 03:22:29 -0700
commit2f5ab6225fa2bd1435a65e9a2c5503e5b5cf4b45 (patch)
tree455e2dd45375ad600370278674c9153e654a53f1
parentdocs: gpu: i915.rst: fix warnings due to file renames (diff)
parentdocs: Fix empty parallelism argument (diff)
downloadwireguard-linux-2f5ab6225fa2bd1435a65e9a2c5503e5b5cf4b45.tar.xz
wireguard-linux-2f5ab6225fa2bd1435a65e9a2c5503e5b5cf4b45.zip
Merge tag 'docs-5.6-fixes' into docs-next
A pair of docs-build fixes.
Diffstat (limited to '')
-rw-r--r--Documentation/sphinx/parallel-wrapper.sh2
-rw-r--r--Documentation/x86/index.rst1
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