From cafa9d87b48c4221e21b2c5236eb44cc6fcf3941 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 22 Mar 2022 00:21:36 +0100
Subject: [PATCH] man: clarify that type #1 entries are also read from the
 XBOOTLDR partition

---
 man/loader.conf.xml  | 13 +++++++++----
 man/systemd-boot.xml | 12 ++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/man/loader.conf.xml b/man/loader.conf.xml
index b68601cb09e..d5abb1c04ec 100644
--- a/man/loader.conf.xml
+++ b/man/loader.conf.xml
@@ -23,6 +23,7 @@
   <refsynopsisdiv>
     <para><filename><replaceable>ESP</replaceable>/loader/loader.conf</filename>,
     <filename><replaceable>ESP</replaceable>/loader/entries/*.conf</filename>
+    <filename><replaceable>XBOOTLDR</replaceable>/loader/entries/*.conf</filename>
     </para>
   </refsynopsisdiv>
 
@@ -33,8 +34,10 @@
     <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry> will
     read <filename><replaceable>ESP</replaceable>/loader/loader.conf</filename>, and any files with the
     <literal>.conf</literal> extension under
-    <filename><replaceable>ESP</replaceable>/loader/entries/</filename> on the EFI system partition (ESP) as
-    defined by <ulink url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot Loader Specification</ulink>.
+    <filename><replaceable>ESP</replaceable>/loader/entries/</filename> on the EFI system partition (ESP),
+    and <filename><replaceable>XBOOTLDR</replaceable>/loader/entries/</filename> on the extended boot loader
+    partition (XBOOTLDR) as defined by <ulink url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot Loader
+    Specification</ulink>.
     </para>
 
     <para>Each of these configuration files must consist of series of newline (i.e. ASCII code 10) separated
@@ -52,8 +55,10 @@
     <title>Options</title>
 
     <para>The configuration options supported by
-    <filename><replaceable>ESP</replaceable>/loader/entries/*.conf</filename> files are defined as part of
-    the <ulink url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot Loader Specification</ulink>.</para>
+    <filename><replaceable>ESP</replaceable>/loader/entries/*.conf</filename> and
+    <filename><replaceable>XBOOTLDR</replaceable>/loader/entries/*.conf</filename> files are defined as part
+    of the <ulink url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot Loader
+    Specification</ulink>.</para>
 
     <para>The following configuration are supported by the <filename>loader.conf</filename> configuration
     file:</para>
diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml
index 6029330dd10..393c0312fa3 100644
--- a/man/systemd-boot.xml
+++ b/man/systemd-boot.xml
@@ -30,12 +30,12 @@
 
     <para><command>systemd-boot</command> loads boot entry information from the EFI system partition (ESP),
     usually mounted at <filename>/efi/</filename>, <filename>/boot/</filename>, or
-    <filename>/boot/efi/</filename> during OS runtime, as well as from the Extended Boot Loader partition if
-    it exists (usually mounted to <filename>/boot/</filename>). Configuration file fragments, kernels,
-    initrds and other EFI images to boot generally need to reside on the ESP or the Extended Boot Loader
-    partition. Linux kernels must be built with <option>CONFIG_EFI_STUB</option> to be able to be directly
-    executed as an EFI image. During boot <command>systemd-boot</command> automatically assembles a list of
-    boot entries from the following sources:</para>
+    <filename>/boot/efi/</filename> during OS runtime, as well as from the Extended Boot Loader partition
+    (XBOOTLDR) if it exists (usually mounted to <filename>/boot/</filename>). Configuration file fragments,
+    kernels, initrds and other EFI images to boot generally need to reside on the ESP or the Extended Boot
+    Loader partition. Linux kernels must be built with <option>CONFIG_EFI_STUB</option> to be able to be
+    directly executed as an EFI image. During boot <command>systemd-boot</command> automatically assembles a
+    list of boot entries from the following sources:</para>
 
     <itemizedlist>
       <listitem><para>Boot entries defined with <ulink