Commit 2f5ab622 authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

Merge tag 'docs-5.6-fixes' into docs-next 

A pair of docs-build fixes.
parents a3aead70 adc10f5b

Documentation/sphinx/parallel-wrapper.sh

+1 −1
Original line number Diff line number Diff line
@@ -30,4 +30,4 @@ if [ -n "$parallel" ] ; then 
	parallel="-j$parallel"

fi



exec "$sphinx" "$parallel" "$@"
 
exec "$sphinx" $parallel "$@"

Documentation/x86/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ x86-specific Documentation 
   tlb

   mtrr

   pat

   intel_mpx

   intel-iommu

   intel_txt

   amd-memory-encryption