From d20bcc38fda2f2c3a69f15f36dae2ef3839af312 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 23 Oct 2023 05:33:27 +0100
Subject: [PATCH] use less harsh language on safety notices

there doesn't need to be a big load of text on every
page that features this warning. a bold warning at the
top of the page will be sufficient.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 site/docs/hardware/index.md    | 29 ++---------------------------
 site/docs/install/index.md     | 20 ++++++++++----------
 site/download.md               | 26 +++++---------------------
 site/download.uk.md            | 26 +++++---------------------
 site/news/libreboot20221214.md | 20 ++------------------
 site/news/libreboot20230319.md | 20 ++------------------
 site/news/libreboot20230413.md | 20 ++------------------
 site/news/libreboot20230423.md | 20 ++------------------
 site/news/libreboot20230625.md | 20 ++------------------
 site/news/libreboot20231021.md |  5 ++---
 10 files changed, 34 insertions(+), 172 deletions(-)

diff --git a/site/docs/hardware/index.md b/site/docs/hardware/index.md
index de0763d..90d7c07 100644
--- a/site/docs/hardware/index.md
+++ b/site/docs/hardware/index.md
@@ -3,38 +3,13 @@ title: Hardware compatibility list
 x-toc-enable: true
 ...
 
-**[PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING](../../news/safety.md),
-OR YOU MIGHT BRICK YOUR MACHINE: [SAFETY PRECAUTIONS](../../news/safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](../../news/safety.md).**
 
 This sections relates to known hardware compatibility in libreboot.
 
 For installation instructions, refer to [../install/](../install/).
 
-NOTE: For T60/R60 thinkpads, make sure that it has an Intel GPU, not an ATI GPU
-because coreboot lacks native video initialization for the ATI GPUs on these
-machines.
-
-(for later machines like T500, T400, ATI GPU doesn't matter, because it also
-has an Intel GPU, and libreboot uses the Intel one)
-
-READ THIS BEFORE UPDATING LIBREBOOT, OR YOU MIGHT BRICK YOUR MACHINE
-====================================================================
-
-**On newer Intel platforms that require Intel ME and/or MRC firmware, such as
-ThinkPad X230 or T440p, and/or HP laptops that require KBC1126 EC firmware,
-the release ROMs of Libreboot are MISSING certain files, that you must insert
-yourself. FAILURE to adhere to this warning may result in you bricking your
-machine (rendering it unbootable), if you were to flash the release ROMs without
-modifying them in any way. For more information, please read:**
-
-**[Insert vendor files on Sandybridge/Ivybridge/Haswell](../install/ivy_has_common.md)**
-
-NOTE: This warning does not apply to ROMs that you compiled yourself, using
-lbmk. It only applies to release ROMs, because ME/MRC/EC firmware is *deleted*
-in release ROMs. The link above says how to re-add them. When building ROM images
-yourself, from source, Libreboot's build system automatically handles it. See:
-[Libreboot build instructions](../build/)
-
 Supported hardware
 ==================
 
diff --git a/site/docs/install/index.md b/site/docs/install/index.md
index deddc02..54fc3b4 100644
--- a/site/docs/install/index.md
+++ b/site/docs/install/index.md
@@ -727,8 +727,8 @@ below.**
 On currently supported HP laptops AND desktops
 -------------------------------------
 
-**[PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING](../../news/safety.md),
-OR YOU MIGHT BRICK YOUR MACHINE: [SAFETY PRECAUTIONS](../../news/safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](../../news/safety.md).**
 
 Refer to links about and the [hardware page](../hardware/) for installation
 instructions on each HP mainboard.
@@ -736,8 +736,8 @@ instructions on each HP mainboard.
 TARGET: ThinkPad X220/T420/T420s
 --------------------------------
 
-**[PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING](../../news/safety.md),
-OR YOU MIGHT BRICK YOUR MACHINE: [SAFETY PRECAUTIONS](../../news/safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](../../news/safety.md).**
 
 Similar to X230 but there's only 1 flash. Intel ME image must be inserted
 if using release ROMs. See: [guide](ivy_has_common.md) (says ivy/haswell but
@@ -756,8 +756,8 @@ guide.**
 TARGET: Thinkpad X230/T430/T530/W530
 ---------------------
 
-**[PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING](../../news/safety.md),
-OR YOU MIGHT BRICK YOUR MACHINE: [SAFETY PRECAUTIONS](../../news/safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](../../news/safety.md).**
 
 NOTE: no install docs for T430/T530/W530 yet, but check coreboot wiki.
 
@@ -774,8 +774,8 @@ Read [board documentation](/docs/install/x230_external.html) for disassembly.
 TARGET: Thinkpad X230t
 ---------------------
 
-**[PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING](../../news/safety.md),
-OR YOU MIGHT BRICK YOUR MACHINE: [SAFETY PRECAUTIONS](../../news/safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](../../news/safety.md).**
 
 Refer to the [ivybridge/haswell common guide.](ivy_has_common.md) for how to
 make the rom image usable for external flashing.
@@ -790,8 +790,8 @@ guide.**
 TARGET: Thinkpad t440p/w541
 ---------------------
 
-**[PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING](../../news/safety.md),
-OR YOU MIGHT BRICK YOUR MACHINE: [SAFETY PRECAUTIONS](../../news/safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](../../news/safety.md).**
 
 Refer to the [ivybridge/haswell common guide.](ivy_has_common.md) for how to
 make the rom image usable for external flashing.
diff --git a/site/download.md b/site/download.md
index 3bd26c6..9133950 100644
--- a/site/download.md
+++ b/site/download.md
@@ -11,27 +11,11 @@ Git repositories. The page on [/docs/maintain/](docs/maintain/) describes how
 Libreboot is put together, and how to maintain it. If you wish to build
 Libreboot from source, [read this page](docs/build/).
 
-READ THIS BEFORE UPDATING LIBREBOOT, OR YOU MIGHT BRICK YOUR MACHINE
-====================================================================
-
-**On newer Intel platforms that require Intel ME and/or MRC firmware, such as
-ThinkPad X230 or T440p, and/or HP laptops that require KBC1126 EC firmware,
-the release ROMs of Libreboot are MISSING certain files, that you must insert
-yourself. FAILURE to adhere to this warning may result in you bricking your
-machine (rendering it unbootable), if you were to flash the release ROMs without
-modifying them in any way. For more information, please read:**
-
-**[Insert vendor files on Sandybridge/Ivybridge/Haswell](docs/install/ivy_has_common.md)**
-
-NOTE: This warning does not apply to ROMs that you compiled yourself, using
-lbmk. It only applies to release ROMs, because ME/MRC/EC firmware is *deleted*
-in release ROMs. The link above says how to re-add them. When building ROM images
-yourself, from source, Libreboot's build system automatically handles it. See:
-[Libreboot build instructions](docs/build/)
-
-This isn't required on *all* Libreboot-supported boards, but if in doubt, follow
-these instructions anyway. If you run the vendor scripts on a board that doesn't
-need blobs, nothing will happen.
+Safety warning
+--------------
+
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](news/safety.md).**
 
 GPG signing key
 ---------------
diff --git a/site/download.uk.md b/site/download.uk.md
index 33d4ac0..89821af 100644
--- a/site/download.uk.md
+++ b/site/download.uk.md
@@ -11,27 +11,11 @@ x-toc-enable: true
 Libreboot складається разом, і як підтримувати його. Якщо ви бажаєте зібрати
 Libreboot із джерельного кода, [прочитайте цю сторінку](docs/build/).
 
-READ THIS BEFORE UPDATING LIBREBOOT, OR YOU MIGHT BRICK YOUR MACHINE
-====================================================================
-
-**On newer Intel platforms that require Intel ME and/or MRC firmware, such as
-ThinkPad X230 or T440p, and/or HP laptops that require KBC1126 EC firmware,
-the release ROMs of Libreboot are MISSING certain files, that you must insert
-yourself. FAILURE to adhere to this warning may result in you bricking your
-machine (rendering it unbootable), if you were to flash the release ROMs without
-modifying them in any way. For more information, please read:**
-
-**[Insert vendor files on Sandybridge/Ivybridge/Haswell](docs/install/ivy_has_common.md)**
-
-NOTE: This warning does not apply to ROMs that you compiled yourself, using
-lbmk. It only applies to release ROMs, because ME/MRC/EC firmware is *deleted*
-in release ROMs. The link above says how to re-add them. When building ROM images
-yourself, from source, Libreboot's build system automatically handles it. See:
-[Libreboot build instructions](docs/build/)
-
-This isn't required on *all* Libreboot-supported boards, but if in doubt, follow
-these instructions anyway. If you run the vendor scripts on a board that doesn't
-need vendor files, nothing will happen.
+Safety warning
+--------------
+
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](news/safety.md).**
 
 Код підпису GPG
 ---------------
diff --git a/site/news/libreboot20221214.md b/site/news/libreboot20221214.md
index 4774961..e75009b 100644
--- a/site/news/libreboot20221214.md
+++ b/site/news/libreboot20221214.md
@@ -9,24 +9,8 @@ in 2022. *This* new release, Libreboot 20221214, is released today on December
 This is marked as a *testing* release, but most/all boards should be fairly
 stable.
 
-**PLEASE READ THIS BEFORE INSTALLING:
-[Safety issues updating Libreboot on Sandybridge/Ivybridge/Haswell](safety.md)**
-
-READ THIS BEFORE FLASHING LIBREBOOT, OR YOU MIGHT BRICK YOUR MACHINE
-====================================================================
-
-**On newer Intel platforms that require Intel ME and/or MRC firmware, such as
-ThinkPad X230 or T440p, and/or HP laptops that require KBC1126 EC firmware,
-the release ROMs of Libreboot are MISSING certain files, that you must insert
-yourself. FAILURE to adhere to this warning may result in you bricking your
-machine (rendering it unbootable), if you were to flash the release ROMs without
-modifying them in any way. For more information, please read:**
-
-**[Insert vendor files on Sandybridge/Ivybridge/Haswell](../docs/install/ivy_has_common.md)**
-
-This isn't required on *all* Libreboot-supported boards, but if in doubt, follow
-these instructions anyway. If you run the vendor scripts on a board that doesn't
-need vendor files, nothing will happen.
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](safety.md).**
 
 Build from source
 -----------------
diff --git a/site/news/libreboot20230319.md b/site/news/libreboot20230319.md
index c3fc459..38594dd 100644
--- a/site/news/libreboot20230319.md
+++ b/site/news/libreboot20230319.md
@@ -7,8 +7,8 @@ See: [Libreboot 20230413 release announcement of 13
 April 2023](libreboot20230413.md) - the `t440pmrc_12mb` and `w541mrc_12mb`
 images have been re-added, in the new release.**
 
-**PLEASE READ THIS BEFORE INSTALLING:
-[Safety issues updating Libreboot on Sandybridge/Ivybridge/Haswell](safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](safety.md).**
 
 Introduction
 ============
@@ -33,22 +33,6 @@ been provided pre-compiled; specifically, `daisy` and `veyron` chromebook
 boards are not available pre-compiled, but the other boards are. A few new
 boards have been added, in addition to several fixes and feature additions.
 
-READ THIS BEFORE FLASHING LIBREBOOT, OR YOU MIGHT BRICK YOUR MACHINE
-====================================================================
-
-**On newer Intel platforms that require Intel ME and/or MRC firmware, such as
-ThinkPad X230 or T440p, and/or HP laptops that require KBC1126 EC firmware,
-the release ROMs of Libreboot are MISSING certain files, that you must insert
-yourself. FAILURE to adhere to this warning may result in you bricking your
-machine (rendering it unbootable), if you were to flash the release ROMs without
-modifying them in any way. For more information, please read:**
-
-**[Insert vendor files on Sandybridge/Ivybridge/Haswell](../docs/install/ivy_has_common.md)**
-
-This isn't required on *all* Libreboot-supported boards, but if in doubt, follow
-these instructions anyway. If you run the vendor scripts on a board that doesn't
-need any vendor files, nothing will happen.
-
 Build from source
 -----------------
 
diff --git a/site/news/libreboot20230413.md b/site/news/libreboot20230413.md
index 1809713..003c082 100644
--- a/site/news/libreboot20230413.md
+++ b/site/news/libreboot20230413.md
@@ -2,8 +2,8 @@
 % Leah Rowe
 % 13 April 2023
 
-**PLEASE READ THIS BEFORE INSTALLING:
-[Safety issues updating Libreboot on Sandybridge/Ivybridge/Haswell](safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](safety.md).**
 
 Introduction
 ============
@@ -33,22 +33,6 @@ existing supported hardware; the focus is going to be on adding *more* boards
 to Libreboot, to support more hardware. I've been on a spree, buying lots of
 mainboards that coreboot supports, that would be interesting in Libreboot.
 
-READ THIS BEFORE FLASHING LIBREBOOT, OR YOU MIGHT BRICK YOUR MACHINE
-====================================================================
-
-**On newer Intel platforms that require Intel ME and/or MRC firmware, such as
-ThinkPad X230 or T440p, and/or HP laptops that require KBC1126 EC firmware,
-the release ROMs of Libreboot are MISSING certain files, that you must insert
-yourself. FAILURE to adhere to this warning may result in you bricking your
-machine (rendering it unbootable), if you were to flash the release ROMs without
-modifying them in any way. For more information, please read:**
-
-**[Insert vendor files on Sandybridge/Ivybridge/Haswell](../docs/install/ivy_has_common.md)**
-
-This isn't required on *all* Libreboot-supported boards, but if in doubt, follow
-these instructions anyway. If you run the vendor scripts on a board that doesn't
-need any vendor files, then nothing will happen.
-
 Build from source
 -----------------
 
diff --git a/site/news/libreboot20230423.md b/site/news/libreboot20230423.md
index b0aa902..2ed1047 100644
--- a/site/news/libreboot20230423.md
+++ b/site/news/libreboot20230423.md
@@ -2,8 +2,8 @@
 % Leah Rowe
 % 23 April 2023
 
-**PLEASE READ THIS BEFORE INSTALLING:
-[Safety issues updating Libreboot on Sandybridge/Ivybridge/Haswell](safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](safety.md).**
 
 Introduction
 ============
@@ -32,22 +32,6 @@ The *priority* for Libreboot is to add as many new boards as possible, from now
 to the next stable release (ETA Q3 2023), with many testing releases in
 between. Release early, release often. Rigorious testing ensues.
 
-READ THIS BEFORE FLASHING LIBREBOOT, OR YOU MIGHT BRICK YOUR MACHINE
-====================================================================
-
-**On newer Intel platforms that require Intel ME and/or MRC firmware, such as
-ThinkPad X230 or T440p, and/or HP laptops that require KBC1126 EC firmware,
-the release ROMs of Libreboot are MISSING certain files, that you must insert
-yourself. FAILURE to adhere to this warning may result in you bricking your
-machine (rendering it unbootable), if you were to flash the release ROMs without
-modifying them in any way. For more information, please read:**
-
-**[Insert vendor files on Sandybridge/Ivybridge/Haswell](../docs/install/ivy_has_common.md)**
-
-This isn't required on *all* Libreboot-supported boards, but if in doubt, follow
-these instructions anyway. If you run the vendor scripts on a board that doesn't
-need vendor files, nothing will happen.
-
 Build from source
 -----------------
 
diff --git a/site/news/libreboot20230625.md b/site/news/libreboot20230625.md
index a50ab91..b2227a6 100644
--- a/site/news/libreboot20230625.md
+++ b/site/news/libreboot20230625.md
@@ -2,8 +2,8 @@
 % Leah Rowe
 % 25 June 2023
 
-**PLEASE READ THIS BEFORE INSTALLING:
-[Safety issues updating Libreboot on Sandybridge/Ivybridge/Haswell](safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](safety.md).**
 
 Introduction
 ============
@@ -34,22 +34,6 @@ firmware, but not Libreboot! Booting Linux/BSD is also [well](../docs/linux/)
 a new *stable* release of Libreboot. The previous stable release was
 Libreboot 20220710, released on 10 July 2022.
 
-READ THIS BEFORE FLASHING LIBREBOOT, OR YOU MIGHT BRICK YOUR MACHINE
-====================================================================
-
-**On newer Intel platforms that require Intel ME and/or MRC firmware, such as
-ThinkPad X230 or T440p, and/or HP laptops that require KBC1126 EC firmware,
-the release ROMs of Libreboot are MISSING certain files, that you must insert
-yourself. FAILURE to adhere to this warning may result in you bricking your
-machine (rendering it unbootable), if you were to flash the release ROMs without
-modifying them in any way. For more information, please read:**
-
-**[Insert vendor files on Sandybridge/Ivybridge/Haswell](../docs/install/ivy_has_common.md)**
-
-This isn't required on *all* Libreboot-supported boards, but if in doubt, follow
-these instructions anyway. If you run the vendor scripts on a board that doesn't
-need vendor files, nothing will happen.
-
 A note about the changelog
 --------------------------
 
diff --git a/site/news/libreboot20231021.md b/site/news/libreboot20231021.md
index cadd241..68ef2bc 100644
--- a/site/news/libreboot20231021.md
+++ b/site/news/libreboot20231021.md
@@ -2,9 +2,8 @@
 % Leah Rowe
 % 21 October 2023
 
-**PLEASE READ THIS BEFORE INSTALLING:
-[Safety advice when updating Libreboot on
-Sandybridge/Ivybridge/Haswell](safety.md)**
+**IMPORTANT ADVICE: [PLEASE READ THESE INSTRUCTIONS BEFORE INSTALLING/UPDATING
+LIBREBOOT](safety.md).**
 
 Introduction
 ============
-- 
GitLab