From c3fb1e43c17d2f40682d5ab715c61d054e79b022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 21 Mar 2022 12:08:41 +0100 Subject: [PATCH 1/2] spelling: weekday names are capitalized --- NEWS | 2 +- units/systemd-sysupdate.timer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index c591694a72..4677c75177 100644 --- a/NEWS +++ b/NEWS @@ -12493,7 +12493,7 @@ CHANGES WITH 197: based on a calendar time specification such as "Thu,Fri 2013-*-1,5 11:12:13" which refers to 11:12:13 of the first or fifth day of any month of the year 2013, given that it is - a thursday or friday. This brings timer event support + a Thursday or a Friday. This brings timer event support considerably closer to cron's capabilities. For details on the supported calendar time specification language see systemd.time(7). diff --git a/units/systemd-sysupdate.timer b/units/systemd-sysupdate.timer index d998765e21..6ecd98d13e 100644 --- a/units/systemd-sysupdate.timer +++ b/units/systemd-sysupdate.timer @@ -18,7 +18,7 @@ ConditionVirtualization=!container [Timer] # Trigger the update 15min after boot, and then – on average – every 6h, but # randomly distributed in a 2h…6h interval. In addition trigger things -# persistently once on each saturday, to ensure that even on systems that are +# persistently once on each Saturday, to ensure that even on systems that are # never booted up for long we have a chance to to do the update. OnBootSec=15min OnUnitActiveSec=2h From a0aa38389d994208b90b101cc5c3254ccd75a6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 21 Mar 2022 12:16:35 +0100 Subject: [PATCH 2/2] man: cross-link to BLS in more places, use "Type #1", "Type #2" as appropriate --- man/loader.conf.xml | 7 ++++--- man/systemd-boot.xml | 23 +++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/man/loader.conf.xml b/man/loader.conf.xml index e5453c7dcd..1186d3e2b4 100644 --- a/man/loader.conf.xml +++ b/man/loader.conf.xml @@ -30,10 +30,11 @@ Description - systemd-boot7 - will read ESP/loader/loader.conf and any files with the + systemd-boot7 will + read ESP/loader/loader.conf, and any files with the .conf extension under - ESP/loader/entries/ on the EFI system partition (ESP). + ESP/loader/entries/ on the EFI system partition (ESP) as + defined by Boot Loader Specification. Each configuration file must consist of an option name, followed by diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml index ceea368ef2..6029330dd1 100644 --- a/man/systemd-boot.xml +++ b/man/systemd-boot.xml @@ -39,23 +39,22 @@ Boot entries defined with Boot Loader Specification description files - located in /loader/entries/ on the ESP and the Extended Boot Loader - Partition. These usually describe Linux kernel images with associated initrd images, but alternatively - may also describe arbitrary other EFI executables. + url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot Loader Specification Type #1 + description files located in /loader/entries/ on the ESP and the Extended Boot + Loader Partition. These usually describe Linux kernel images with associated initrd images, but + alternatively may also describe other arbitrary EFI executables. - Unified kernel images following the Boot Loader Specification, as executable EFI - binaries in /EFI/Linux/ on the ESP and the Extended Boot Loader Partition. - + Unified kernel images, Boot + Loader Specification Type #2, which are executable EFI binaries in + /EFI/Linux/ on the ESP and the Extended Boot Loader Partition. - The Microsoft Windows EFI boot manager, if installed + The Microsoft Windows EFI boot manager, if installed. - The Apple macOS boot manager, if installed + The Apple macOS boot manager, if installed. - The EFI Shell binary, if installed + The EFI Shell binary, if installed. - A reboot into the UEFI firmware setup option, if supported by the firmware + A reboot into the UEFI firmware setup option, if supported by the firmware. systemd-boot supports the following features: