summaryrefslogtreecommitdiffstats
path: root/Documentation/x86
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2019-12-08 20:25:10 -0800
committerJonathan Corbet <corbet@lwn.net>2019-12-19 09:25:18 -0700
commit0854cbdb1829413680cc1bf072dc68254a5ffe7b (patch)
tree8af55de23c448e67276535442d16ccea6e526b98 /Documentation/x86
parentab229d620263e2399c1bd611e64bde5250f72dae (diff)
downloadlinux-0854cbdb1829413680cc1bf072dc68254a5ffe7b.tar.bz2
Documentation: x86: fix boot.rst warning and format
Fix a Sphinx documentation format warning by breaking a long line into 2 lines. Also drop the ':' usage after the Protocol version numbers since other Protocol versions don't use colons. Documentation/x86/boot.rst:72: WARNING: Malformed table. Text in column margin in table line 57. Fixes: 2c33c27fd603 ("x86/boot: Introduce kernel_info") Fixes: 00cd1c154d56 ("x86/boot: Introduce kernel_info.setup_type_max") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Link: https://lore.kernel.org/r/c6fbf592-0aca-69d9-e903-e869221a041a@infradead.org Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/x86')
-rw-r--r--Documentation/x86/boot.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/x86/boot.rst b/Documentation/x86/boot.rst
index 90bb8f5ab384..e0dc2ffb7094 100644
--- a/Documentation/x86/boot.rst
+++ b/Documentation/x86/boot.rst
@@ -69,11 +69,12 @@ Protocol 2.13 (Kernel 3.14) Support 32- and 64-bit flags being set in
xloadflags to support booting a 64-bit kernel from 32-bit
EFI
-Protocol 2.14: BURNT BY INCORRECT COMMIT ae7e1238e68f2a472a125673ab506d49158c1889
+Protocol 2.14 BURNT BY INCORRECT COMMIT
+ ae7e1238e68f2a472a125673ab506d49158c1889
(x86/boot: Add ACPI RSDP address to setup_header)
DO NOT USE!!! ASSUME SAME AS 2.13.
-Protocol 2.15: (Kernel 5.5) Added the kernel_info and kernel_info.setup_type_max.
+Protocol 2.15 (Kernel 5.5) Added the kernel_info and kernel_info.setup_type_max.
============= ============================================================
.. note::