Boot loader menu docs and tweaks (#39842)

diff --cc docs/BOOT_LOADER_INTERFACE.md
index 82dd534a6573beefeeb71124f11a3c8dcf0b92f4,659c6ce195e1008b41250c338935ce6447e09a0b..37ec443d9dbace522f0631cedbe1b91a388104fc
--- 1/docs/BOOT_LOADER_INTERFACE.md
--- 2/docs/BOOT_LOADER_INTERFACE.md
+++ b/docs/BOOT_LOADER_INTERFACE.md
@@@ -128,15 -165,14 +165,14 @@@ variables
  
  ## Boot Loader Entry Identifiers
  
- While boot loader entries may be named relatively freely, it's highly
- recommended to follow the following rules when picking identifiers for the
- entries, so that programs (and users) can derive basic context and meaning from
- the identifiers as passed in `LoaderEntries`, `LoaderEntryDefault`,
- `LoaderEntryOneShot`, `LoaderEntrySelected`, and possibly show nicely localized
- names for them in UIs.
+ While boot loader entries may be named relatively freely,
+ it's highly recommended to follow the following rules when picking identifiers for the entries,
+ so that programs (and users) can derive basic context and meaning from the identifiers
+ as passed in `LoaderEntries`, `LoaderEntryDefault`, `LoaderEntryOneShot`, `LoaderEntrySelected`,
+ and possibly show nicely localized names for them in UIs.
  
  1. When boot loader entries are defined through the
 -   [Boot Loader Specification](https://uapi-group.org/specifications/specs/boot_loader_specification/)
 +   [BOOT.1 Boot Loader Specification](https://uapi-group.org/specifications/specs/boot_loader_specification/)
     files, the identifier should be derived directly from the file name,
     but with the `.conf` (Type #1 snippets) or `.efi` (Type #2 images)
     suffix removed.

diff --cc man/systemd-boot.xml
Simple merge

diff --cc src/bootctl/bootctl-status.c
Simple merge