make mentions of osboot make sense contextually

site/docs/maintain/index.md

@@ -6,7 +6,7 @@ x-toc-enable: true
 Automated pragmatism
 ====================
 
-This manual describes the nature of `lbmk` (OSBoot MaKe), the automated
+This manual describes the nature of `lbmk` (LibreBoot MaKe), the automated
 build system used to produce libreboot releases. It is intended as a reference
 for *libreboot development*.
 

site/news/libreboot20210522.md

@@ -140,6 +140,11 @@ days. It first started as an experimental fork named *osboot*, which you can
 see here: <https://osboot.org/> (I, Leah Rowe, am the founder and lead developer
 of both libreboot *and* osboot. osboot is the younger sibling of libreboot)
 
+**NOTE: As of November 2022,
+[osboot has merged with and become part of Libreboot](merge.md), but
+the old repos at <https://notabug.org/osboot/> still exist and shall be
+preserved.**
+
 The osboot Git repository was then forked into osboot-libre, available in the
 branch named `libre`. *That* branch was then forked to create this Libreboot
 release. The osboot build system is named osbmk (osboot-make) and the one in

site/news/libreboot20220710.md

@@ -140,6 +140,11 @@ payload, on x86 and ARM platforms.
 Planned osboot/Libreboot merger
 -------------------------------
 
+**NOTE: As of November 2022,
+[osboot has merged with and become part of Libreboot](merge.md), but
+the old repos at <https://notabug.org/osboot/> still exist and shall be
+preserved.**
+
 *The plans below are a guiding principle, but the details may change, when
 or if (most likely when) this decision is implemented.*