From d13186468bab402f8b6a5fb8b21df0f8a45c8281 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Sep 2025 23:08:55 +0000
Subject: [PATCH 1/7] Bump nokogiri from 1.18.8 to 1.18.10

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.8 to 1.18.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.18.8...v1.18.10)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-version: 1.18.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 385a34392..1160aec3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -63,12 +63,12 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minima (2.5.2)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    nokogiri (1.18.8)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pathutil (0.16.2)

From 28f8db9a9bf8c5bb37a472c5fe15bed7615a14ed Mon Sep 17 00:00:00 2001
From: Kat Shann <kat.shann@raspberrypi.com>
Date: Thu, 25 Sep 2025 17:47:14 +0100
Subject: [PATCH 2/7] Additional mentions of the 500+

---
 .../accessories/monitor/monitor_intro.adoc       |  2 +-
 .../asciidoc/computers/config_txt/boot.adoc      |  8 ++++----
 .../asciidoc/computers/config_txt/common.adoc    |  2 +-
 .../computers/config_txt/conditional.adoc        |  7 +++++--
 .../computers/configuration/boot_folder.adoc     |  4 ++--
 .../computers/configuration/device-tree.adoc     | 10 +++++-----
 .../computers/getting-started/setting-up.adoc    |  4 ++--
 .../computers/linux_kernel/building.adoc         |  2 +-
 .../asciidoc/computers/processors/bcm2712.adoc   |  4 ++--
 .../raspberry-pi/eeprom-bootloader.adoc          |  6 +++---
 .../computers/raspberry-pi/power-supplies.adoc   | 16 ++++++++--------
 11 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/documentation/asciidoc/accessories/monitor/monitor_intro.adoc b/documentation/asciidoc/accessories/monitor/monitor_intro.adoc
index ae747671a..b6d3d2233 100644
--- a/documentation/asciidoc/accessories/monitor/monitor_intro.adoc
+++ b/documentation/asciidoc/accessories/monitor/monitor_intro.adoc
@@ -65,7 +65,7 @@ To switch from Power Saving mode to Full Power mode, press and hold the *increas
 
 [TIP]
 ====
-If the Monitor flashes on and off, your USB power supply is not capable of providing sufficient current to power the monitor. This can happen if you power the Monitor from a Raspberry Pi 5 or Pi 500 which is itself powered by a 5V/3A power supply. Try the following fixes to stop the Monitor from flashing on and off:
+If the Monitor flashes on and off, your USB power supply is not capable of providing sufficient current to power the monitor. This can happen if you power the Monitor from a Raspberry Pi 5, 500, or 500+ which is itself powered by a 5V/3A power supply. Try the following fixes to stop the Monitor from flashing on and off:
 
 * reduce the display brightness and volume (you may have to connect your monitor to another power supply to access the settings)
 * switch to a different power source or cable
diff --git a/documentation/asciidoc/computers/config_txt/boot.adoc b/documentation/asciidoc/computers/config_txt/boot.adoc
index 50aca0aa5..6e7a23091 100644
--- a/documentation/asciidoc/computers/config_txt/boot.adoc
+++ b/documentation/asciidoc/computers/config_txt/boot.adoc
@@ -5,13 +5,13 @@
 These options specify the firmware files transferred to the VideoCore GPU prior to booting.
 
 `start_file` specifies the VideoCore firmware file to use.
-`fixup_file` specifies the file used to fix up memory locations used in the `start_file` to match the GPU memory split. 
+`fixup_file` specifies the file used to fix up memory locations used in the `start_file` to match the GPU memory split.
 
 The `start_file` and the `fixup_file` are a matched pair - using unmatched files will stop the board from booting. This is an advanced option, so we advise that you use `start_x` and `start_debug` rather than this option.
 
 NOTE: Cut-down firmware (`start*cd.elf` and `fixup*cd.dat`) cannot be selected this way - the system will fail to boot.  The only way to enable the cut-down firmware is to specify `gpu_mem=16`. The cut-down firmware removes support for codecs, 3D and debug logging as well as limiting the initial early-boot framebuffer to 1080p @16bpp - although KMS can replace this with up to 32bpp 4K framebuffer(s) at a later stage as with any firmware.
 
-NOTE: The Raspberry Pi 5, Compute Module 5, and Raspberry Pi 500 firmware is self-contained in the bootloader EEPROM.
+NOTE: The Raspberry Pi 5, Compute Module 5, Raspberry Pi 500, and Raspberry Pi 500+ firmware is self-contained in the bootloader EEPROM.
 
 === `cmdline`
 
@@ -21,7 +21,7 @@ NOTE: The Raspberry Pi 5, Compute Module 5, and Raspberry Pi 500 firmware is sel
 
 `kernel` is the alternative filename on the boot partition for loading the kernel. The default value on the Raspberry Pi 1, Zero and Zero W, and Raspberry Pi Compute Module 1 is `kernel.img`. The default value on the Raspberry Pi 2, 3, 3+ and Zero 2 W, and Raspberry Pi Compute Modules 3 and 3+ is `kernel7.img`. The default value on the Raspberry Pi 4 and 400, and Raspberry Pi Compute Module 4 is `kernel8.img`, or `kernel7l.img` if `arm_64bit` is set to 0.
 
-The Raspberry Pi 5, Compute Module 5, and Raspberry Pi 500 firmware defaults to loading `kernel_2712.img` because this image contains optimisations specific to those models (e.g. 16K page-size). If this file is not present, then the common 64-bit kernel (`kernel8.img`) will be loaded instead.
+The Raspberry Pi 5, Compute Module 5, Raspberry Pi 500, and Raspberry Pi 500+ firmware defaults to loading `kernel_2712.img` because this image contains optimisations specific to those models (e.g. 16K page-size). If this file is not present, then the common 64-bit kernel (`kernel8.img`) will be loaded instead.
 
 === `arm_64bit`
 
@@ -56,7 +56,7 @@ Flagship models since Raspberry Pi 5, Compute Modules since CM5, and Keyboard mo
 
 === `ramfsfile`
 
-`ramfsfile` is the optional filename on the boot partition of a `ramfs` to load. 
+`ramfsfile` is the optional filename on the boot partition of a `ramfs` to load.
 
 NOTE: Newer firmware supports the loading of multiple `ramfs` files. You should separate the multiple file names with commas, taking care not to exceed the 80-character line length limit. All the loaded files are concatenated in memory and treated as a single `ramfs` blob. More information is available https://forums.raspberrypi.com/viewtopic.php?f=63&t=10532[on the forums].
 
diff --git a/documentation/asciidoc/computers/config_txt/common.adoc b/documentation/asciidoc/computers/config_txt/common.adoc
index 7f4f89708..66fa8e303 100644
--- a/documentation/asciidoc/computers/config_txt/common.adoc
+++ b/documentation/asciidoc/computers/config_txt/common.adoc
@@ -52,7 +52,7 @@ To disable, set `arm_boost=0`.
 
 ==== `power_force_3v3_pwm`
 
-NOTE: This option applies only to Raspberry Pi 5, Compute Module 5, and Pi 500.
+NOTE: This option applies only to Raspberry Pi 5, Compute Module 5, Raspberry Pi 500, and Raspberry Pi 500+.
 
 Forces PWM on 3.3V output from the GPIO header or CSI connector.
 
diff --git a/documentation/asciidoc/computers/config_txt/conditional.adoc b/documentation/asciidoc/computers/config_txt/conditional.adoc
index 500b721e9..57814d70e 100644
--- a/documentation/asciidoc/computers/config_txt/conditional.adoc
+++ b/documentation/asciidoc/computers/config_txt/conditional.adoc
@@ -32,7 +32,7 @@ The conditional model filters apply according to the following table.
 | Model 4B, Pi 400, Compute Module 4, Compute Module 4S
 
 | `[pi5]`
-| Raspberry Pi 5, Compute Module 5, Pi 500
+| Raspberry Pi 5, Compute Module 5, Pi 500, Pi 500+
 
 | `[pi400]`
 | Pi 400 (also sees `[pi4]` contents)
@@ -40,6 +40,9 @@ The conditional model filters apply according to the following table.
 | `[pi500]`
 | Pi 500 (also sees `[pi5]` contents)
 
+| `[pi500+]`
+| Pi 500+ (also sees `[pi5]` contents)
+
 | `[cm1]`
 | Compute Module 1 (also sees `[pi1]` contents)
 
@@ -365,5 +368,5 @@ Filters of different types can be combined by listing them one after the other,
 # settings here apply to all hardware
 
 ----
- 
+
 Use the `[all]` filter to reset all previous filters and avoid unintentionally combining different filter types.
diff --git a/documentation/asciidoc/computers/configuration/boot_folder.adoc b/documentation/asciidoc/computers/configuration/boot_folder.adoc
index 309b9c3f6..472e35b70 100644
--- a/documentation/asciidoc/computers/configuration/boot_folder.adoc
+++ b/documentation/asciidoc/computers/configuration/boot_folder.adoc
@@ -85,12 +85,12 @@ Various xref:linux_kernel.adoc#kernel[kernel] image files that correspond to Ras
 
 | `kernel8.img`
 | BCM2837, BCM2711, BCM2712
-| Pi Zero 2 W, Pi 2 (later revisions), Pi 3, CM3, Pi 3+, CM3+, Pi 4, CM4, CM4S, Pi 400, CM5, Pi 5, Pi 500
+| Pi Zero 2 W, Pi 2 (later revisions), Pi 3, CM3, Pi 3+, CM3+, Pi 4, CM4, CM4S, Pi 400, CM5, Pi 5, Pi 500, Pi 500+
 | xref:config_txt.adoc#boot-options[64-bit kernel]. Earlier revisions of Raspberry Pi 2 (with BCM2836) do not support 64-bit kernels.
 
 | `kernel_2712.img`
 | BCM2712
-| Pi 5, CM5, Pi 500
+| Pi 5, CM5, Pi 500, Pi 500+
 | Pi 5-optimized xref:config_txt.adoc#boot-options[64-bit kernel].
 |===
 
diff --git a/documentation/asciidoc/computers/configuration/device-tree.adoc b/documentation/asciidoc/computers/configuration/device-tree.adoc
index 561ec68a2..248fd63cf 100644
--- a/documentation/asciidoc/computers/configuration/device-tree.adoc
+++ b/documentation/asciidoc/computers/configuration/device-tree.adoc
@@ -9,7 +9,7 @@ User-provided parameters in `config.txt` are scanned, along with any overlays an
 [[part1]]
 === Device Trees
 
-A Device Tree (DT) is a description of the hardware in a system. It should include the name of the base CPU, its memory configuration, and any peripherals (internal and external). A DT should not be used to describe the software, although by listing the hardware modules it does usually cause driver modules to be loaded. 
+A Device Tree (DT) is a description of the hardware in a system. It should include the name of the base CPU, its memory configuration, and any peripherals (internal and external). A DT should not be used to describe the software, although by listing the hardware modules it does usually cause driver modules to be loaded.
 
 NOTE: It helps to remember that DTs are supposed to be OS-neutral, so anything which is Linux-specific shouldn't be there.
 
@@ -57,13 +57,13 @@ The following is a simple tree in the `.dts` format:
 This tree contains:
 
 * a required header: `/dts-v1/`
-* The inclusion of another DTS file, conventionally named `*.dtsi` and analogous to a `.h` header file in C 
+* The inclusion of another DTS file, conventionally named `*.dtsi` and analogous to a `.h` header file in C
 * a single root node: `/`
 * a couple of child nodes: `node1` and `node2`
 * some children for node1: `child-node1` and `child-node2`
 * a label (`cousin`) and a reference to that label (`&cousin`)
 * several properties scattered through the tree
-* a repeated node (`/node2`) 
+* a repeated node (`/node2`)
 
 Properties are simple key-value pairs where the value can either be empty or contain an arbitrary byte stream. While data types are not encoded in the data structure, there are a few fundamental data representations that can be expressed in a Device Tree source file.
 
@@ -528,7 +528,7 @@ Each node has the name of an overlay that requires special handling. The propert
 
 * `bcm2835` for all Raspberry Pis built around the BCM2835, BCM2836, BCM2837, and RP3A0 SoCs
 * `bcm2711` for Raspberry Pi 4B, CM4, CM4S, and Pi 400
-* `bcm2712` for Raspberry Pi 5, CM5, and Pi 500
+* `bcm2712` for Raspberry Pi 5, CM5, Pi 500, and Pi 500+
 
 A platform name with no value (an empty property) indicates that the current overlay is compatible with the platform; for example, `uart5` is compatible with the `bcm2711` platform. A non-empty value for a platform is the name of an alternative overlay to use in place of the requested one; asking for `disable-bt` on BCM2712 results in `disable-bt-pi5` being loaded instead. Any platform not included in an overlay's node is not compatible with that overlay. Any overlay not mentioned in the map is assumed to be compatible with all platforms.
 
@@ -833,7 +833,7 @@ For a list of supported overlays and parameters, see the https://github.com/rasp
 [[part4]]
 === Firmware parameters
 
-The firmware uses the special https://www.kernel.org/doc/html/latest/devicetree/usage-model.html#runtime-configuration[/chosen] node to pass parameters between the bootloader and/or firmware and the operating system. 
+The firmware uses the special https://www.kernel.org/doc/html/latest/devicetree/usage-model.html#runtime-configuration[/chosen] node to pass parameters between the bootloader and/or firmware and the operating system.
 
 * Each property is stored as a 32-bit unsigned integer unless indicated otherwise.
 * Numbers in device-tree are stored in binary and are big-endian.
diff --git a/documentation/asciidoc/computers/getting-started/setting-up.adoc b/documentation/asciidoc/computers/getting-started/setting-up.adoc
index f68fb8aab..7de722952 100644
--- a/documentation/asciidoc/computers/getting-started/setting-up.adoc
+++ b/documentation/asciidoc/computers/getting-started/setting-up.adoc
@@ -26,7 +26,7 @@ You can use any high-quality power supply that provides the correct power mode.
 |Recommended power supply (voltage/current)
 |Raspberry Pi power supply
 
-|Raspberry Pi 5 and Raspberry Pi 500
+|Raspberry Pi 5, Raspberry Pi 500, and Raspberry Pi 500+
 |5V/5A, 5V/3A limits peripherals to 600mA
 |https://www.raspberrypi.com/products/27w-power-supply/[27W USB-C power supply]
 
@@ -101,7 +101,7 @@ Raspberry Pi models have the following display connectivity:
 |Model
 |Display outputs
 
-|Raspberry Pi 5, Raspberry Pi 400 and Raspberry Pi 500
+|Raspberry Pi 5, Raspberry Pi 400, Raspberry Pi 500, and Raspberry Pi 500+
 |2× micro HDMI
 
 |Raspberry Pi 4 Model B
diff --git a/documentation/asciidoc/computers/linux_kernel/building.adoc b/documentation/asciidoc/computers/linux_kernel/building.adoc
index 6fe3f916f..9497b8685 100644
--- a/documentation/asciidoc/computers/linux_kernel/building.adoc
+++ b/documentation/asciidoc/computers/linux_kernel/building.adoc
@@ -93,7 +93,7 @@ $ cd linux
 $ KERNEL=kernel_2712
 $ make bcm2712_defconfig
 ----
-| Pi 500
+| Pi 500/500+
 | Compute Module 5
 
 .14+^.^| 32-bit
diff --git a/documentation/asciidoc/computers/processors/bcm2712.adoc b/documentation/asciidoc/computers/processors/bcm2712.adoc
index 54f69f283..d9cf3bf84 100644
--- a/documentation/asciidoc/computers/processors/bcm2712.adoc
+++ b/documentation/asciidoc/computers/processors/bcm2712.adoc
@@ -1,10 +1,10 @@
 == BCM2712
 
-Broadcom BCM2712 is the 16nm application processor used in Raspberry Pi 5, Compute Module 5, and Pi 500. It is the successor to the BCM2711 device used in Raspberry Pi 4, and shares many common architectural features with other devices in the BCM27xx family, used on earlier Raspberry Pi products.
+Broadcom BCM2712 is the 16nm application processor used in Raspberry Pi 5, Compute Module 5, Raspberry Pi 500, and Raspberry Pi 500+. It is the successor to the BCM2711 device used in Raspberry Pi 4, and shares many common architectural features with other devices in the BCM27xx family, used on earlier Raspberry Pi products.
 
 Built around a quad-core Arm Cortex-A76 CPU cluster, clocked at up to 2.4GHz, with 512KB per-core L2 caches and a 2MB shared L3 cache, it integrates an improved 12-core VideoCore VII GPU; a hardware video scaler and HDMI controller capable of driving dual 4Kp60 displays; and a Raspberry Pi-developed HEVC decoder and Image Signal Processor. A 32-bit LPDDR4X memory interface provides up to 17GB/s of memory bandwidth, while ×1 and ×4 PCI Express interfaces support high-bandwidth external peripherals; on Raspberry Pi 5 the latter is used to connect to the Raspberry Pi RP1 south bridge, which provides the bulk of the external-facing I/O functionality on the platform.
 
-Headline features include: 
+Headline features include:
 
 * Quad-core Arm Cortex-A76 @ 2.4GHz
 ** ARMv8-A ISA
diff --git a/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc b/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc
index a7a97c515..a2e2981df 100644
--- a/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc
+++ b/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc
@@ -190,7 +190,7 @@ Default: `0`
 [[SD_OVERCURRENT_CHECK]]
 ==== `SD_OVERCURRENT_CHECK`
 
-Raspberry Pi 4, Raspberry Pi 5 and Raspberry Pi 500 only.
+Raspberry Pi 4, Raspberry Pi 5, Raspberry Pi 500, and Raspberry Pi 500+ only.
 
 Before booting, the bootloader checks the SD power switch overcurrent signal. The overcurrent signal occurs if the SD card is damaged and has a short circuit which will cause it to get hot.
 
@@ -334,7 +334,7 @@ MAC_ADDRESS_OTP=0,1
 The first value (row 0 in the example) contains the OUI and the most significant 8 bits of the MAC address. The second value (row 1 in the example) stores the remaining 16-bits of the MAC address.
 This is the same format as used for the Raspberry Pi MAC address programmed at manufacture.
 
-Any two customer rows may be selected and combined in either order. 
+Any two customer rows may be selected and combined in either order.
 
 The `Customer OTP` rows are OTP registers 36 to 43 in the `vcgencmd otp_dump` output so if the first two rows are programmed as follows then `MAC_ADDRESS_OTP=0,1` would give a MAC address of `e4:5f:01:20:24:7e`.
 
@@ -564,7 +564,7 @@ Default: 0
 ==== `PARTITION_WALK`
 This property is designed to improve the reliability of `A/B` boot schemes using `autoboot.txt` by searching for bootable partitions if the specified partition does not appear to be bootable. If `PARTITION_WALK=1` and the requested partition is not bootable and does not have a valid `autoboot.txt` then the bootloader will check each partition in turn (up to 8 and wrapping to 0) to see if it is bootable (contains `start4.elf` on a Pi4, or `config.txt` and a suitable device-tree on Pi 5 or newer).
 
-During the "partition walk" `autoboot.txt` files are not processed to avoid cycling dependencies. It is assumed that the requested boot partition has failed and the system is attempting recovery. 
+During the "partition walk" `autoboot.txt` files are not processed to avoid cycling dependencies. It is assumed that the requested boot partition has failed and the system is attempting recovery.
 
 Default: `0`
 
diff --git a/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc b/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc
index af3bbd6e6..60dcb863d 100644
--- a/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc
+++ b/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc
@@ -85,7 +85,7 @@ All Raspberry Pi models with a PoE-capable Ethernet jack require a HAT to draw p
 | 1.2A
 | 800mA
 
-| Pi 500
+| Pi 500/500+
 | 5.0A
 | 1.6A (600mA if using a 3A power supply)
 | 800mA
@@ -122,15 +122,15 @@ $ vcgencmd get_config usb_max_current_enable
 The following table describes the amount of power (in amps) drawn by different Raspberry Pi models during various workloads:
 
 |===
-| | | Raspberry Pi 1B+ | Raspberry Pi 2B | Raspberry Pi 3B | Raspberry Pi Zero | Raspberry Pi 4B 
+| | | Raspberry Pi 1B+ | Raspberry Pi 2B | Raspberry Pi 3B | Raspberry Pi Zero | Raspberry Pi 4B
 | Boot | Max | 0.26 | 0.40 | 0.75 | 0.20 | 0.85
-| | Avg | 0.22 | 0.22 | 0.35 | 0.15 | 0.7 
+| | Avg | 0.22 | 0.22 | 0.35 | 0.15 | 0.7
 | Idle | Avg | 0.20 | 0.22 | 0.30 | 0.10 | 0.6
-| Video playback (H.264) | Max | 0.30 | 0.36 |0.55 |0.23 | 0.85 
-| | Avg | 0.22 | 0.28 | 0.33 | 0.16 | 0.78 
-| Stress | Max | 0.35 | 0.82 | 1.34 | 0.35 | 1.25 
-| | Avg | 0.32 | 0.75 | 0.85 | 0.23 | 1.2 
-| Halt current | | | | 0.10 | 0.055 | 0.023 
+| Video playback (H.264) | Max | 0.30 | 0.36 |0.55 |0.23 | 0.85
+| | Avg | 0.22 | 0.28 | 0.33 | 0.16 | 0.78
+| Stress | Max | 0.35 | 0.82 | 1.34 | 0.35 | 1.25
+| | Avg | 0.32 | 0.75 | 0.85 | 0.23 | 1.2
+| Halt current | | | | 0.10 | 0.055 | 0.023
 |===
 
 NOTE: These measurements used a standard Raspberry Pi OS image (current as of 26 Feb 2016, or June 2019 for the Raspberry Pi 4), at room temperature, with the Raspberry Pi connected to a HDMI monitor, USB keyboard, and USB mouse. The Raspberry Pi 3 Model B was connected to a wireless LAN access point, the Raspberry Pi 4 was connected to Ethernet. All these power measurements are approximate and do not take into account power consumption from additional USB devices; power consumption can easily exceed these measurements if multiple additional USB devices or a HAT are connected to the Raspberry Pi.

From 7a21e92ecf82a1e6165341bae777e52a1c21eb56 Mon Sep 17 00:00:00 2001
From: Kat Shann <kat.shann@raspberrypi.com>
Date: Thu, 25 Sep 2025 18:19:53 +0100
Subject: [PATCH 3/7] Updates from review.

---
 documentation/asciidoc/computers/config_txt/boot.adoc      | 4 ++--
 documentation/asciidoc/computers/config_txt/common.adoc    | 2 +-
 .../asciidoc/computers/config_txt/conditional.adoc         | 5 +----
 .../asciidoc/computers/getting-started/setting-up.adoc     | 6 +++++-
 documentation/asciidoc/computers/processors/bcm2712.adoc   | 2 +-
 .../asciidoc/computers/raspberry-pi/power-supplies.adoc    | 7 ++++++-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/documentation/asciidoc/computers/config_txt/boot.adoc b/documentation/asciidoc/computers/config_txt/boot.adoc
index 6e7a23091..2eddd43c6 100644
--- a/documentation/asciidoc/computers/config_txt/boot.adoc
+++ b/documentation/asciidoc/computers/config_txt/boot.adoc
@@ -11,7 +11,7 @@ The `start_file` and the `fixup_file` are a matched pair - using unmatched files
 
 NOTE: Cut-down firmware (`start*cd.elf` and `fixup*cd.dat`) cannot be selected this way - the system will fail to boot.  The only way to enable the cut-down firmware is to specify `gpu_mem=16`. The cut-down firmware removes support for codecs, 3D and debug logging as well as limiting the initial early-boot framebuffer to 1080p @16bpp - although KMS can replace this with up to 32bpp 4K framebuffer(s) at a later stage as with any firmware.
 
-NOTE: The Raspberry Pi 5, Compute Module 5, Raspberry Pi 500, and Raspberry Pi 500+ firmware is self-contained in the bootloader EEPROM.
+NOTE: The Raspberry Pi 5, 500, 500+, and Compute Module 5 firmware is self-contained in the bootloader EEPROM.
 
 === `cmdline`
 
@@ -21,7 +21,7 @@ NOTE: The Raspberry Pi 5, Compute Module 5, Raspberry Pi 500, and Raspberry Pi 5
 
 `kernel` is the alternative filename on the boot partition for loading the kernel. The default value on the Raspberry Pi 1, Zero and Zero W, and Raspberry Pi Compute Module 1 is `kernel.img`. The default value on the Raspberry Pi 2, 3, 3+ and Zero 2 W, and Raspberry Pi Compute Modules 3 and 3+ is `kernel7.img`. The default value on the Raspberry Pi 4 and 400, and Raspberry Pi Compute Module 4 is `kernel8.img`, or `kernel7l.img` if `arm_64bit` is set to 0.
 
-The Raspberry Pi 5, Compute Module 5, Raspberry Pi 500, and Raspberry Pi 500+ firmware defaults to loading `kernel_2712.img` because this image contains optimisations specific to those models (e.g. 16K page-size). If this file is not present, then the common 64-bit kernel (`kernel8.img`) will be loaded instead.
+The Raspberry Pi 5, 500, 500+, and Compute Module 5 firmware defaults to loading `kernel_2712.img` because this image contains optimisations specific to those models (e.g. 16K page-size). If this file is not present, then the common 64-bit kernel (`kernel8.img`) will be loaded instead.
 
 === `arm_64bit`
 
diff --git a/documentation/asciidoc/computers/config_txt/common.adoc b/documentation/asciidoc/computers/config_txt/common.adoc
index 66fa8e303..39c4a225e 100644
--- a/documentation/asciidoc/computers/config_txt/common.adoc
+++ b/documentation/asciidoc/computers/config_txt/common.adoc
@@ -52,7 +52,7 @@ To disable, set `arm_boost=0`.
 
 ==== `power_force_3v3_pwm`
 
-NOTE: This option applies only to Raspberry Pi 5, Compute Module 5, Raspberry Pi 500, and Raspberry Pi 500+.
+NOTE: This option applies only to Raspberry Pi 5, 500, 500+, and Compute Module 5.
 
 Forces PWM on 3.3V output from the GPIO header or CSI connector.
 
diff --git a/documentation/asciidoc/computers/config_txt/conditional.adoc b/documentation/asciidoc/computers/config_txt/conditional.adoc
index 57814d70e..bfa43eb3f 100644
--- a/documentation/asciidoc/computers/config_txt/conditional.adoc
+++ b/documentation/asciidoc/computers/config_txt/conditional.adoc
@@ -38,10 +38,7 @@ The conditional model filters apply according to the following table.
 | Pi 400 (also sees `[pi4]` contents)
 
 | `[pi500]`
-| Pi 500 (also sees `[pi5]` contents)
-
-| `[pi500+]`
-| Pi 500+ (also sees `[pi5]` contents)
+| Pi 500/500+ (also sees `[pi5]` contents)
 
 | `[cm1]`
 | Compute Module 1 (also sees `[pi1]` contents)
diff --git a/documentation/asciidoc/computers/getting-started/setting-up.adoc b/documentation/asciidoc/computers/getting-started/setting-up.adoc
index 7de722952..818217aac 100644
--- a/documentation/asciidoc/computers/getting-started/setting-up.adoc
+++ b/documentation/asciidoc/computers/getting-started/setting-up.adoc
@@ -26,7 +26,11 @@ You can use any high-quality power supply that provides the correct power mode.
 |Recommended power supply (voltage/current)
 |Raspberry Pi power supply
 
-|Raspberry Pi 5, Raspberry Pi 500, and Raspberry Pi 500+
+|Raspberry Pi 500+
+|5V/5A
+|https://www.raspberrypi.com/products/27w-power-supply/[27W USB-C power supply]
+
+|Raspberry Pi 5 and Raspberry Pi 500
 |5V/5A, 5V/3A limits peripherals to 600mA
 |https://www.raspberrypi.com/products/27w-power-supply/[27W USB-C power supply]
 
diff --git a/documentation/asciidoc/computers/processors/bcm2712.adoc b/documentation/asciidoc/computers/processors/bcm2712.adoc
index d9cf3bf84..8adae73ed 100644
--- a/documentation/asciidoc/computers/processors/bcm2712.adoc
+++ b/documentation/asciidoc/computers/processors/bcm2712.adoc
@@ -1,6 +1,6 @@
 == BCM2712
 
-Broadcom BCM2712 is the 16nm application processor used in Raspberry Pi 5, Compute Module 5, Raspberry Pi 500, and Raspberry Pi 500+. It is the successor to the BCM2711 device used in Raspberry Pi 4, and shares many common architectural features with other devices in the BCM27xx family, used on earlier Raspberry Pi products.
+Broadcom BCM2712 is the 16nm application processor used in Raspberry Pi 5, 500, 500+, and Compute Module 5. It is the successor to the BCM2711 device used in Raspberry Pi 4, and shares many common architectural features with other devices in the BCM27xx family, used on earlier Raspberry Pi products.
 
 Built around a quad-core Arm Cortex-A76 CPU cluster, clocked at up to 2.4GHz, with 512KB per-core L2 caches and a 2MB shared L3 cache, it integrates an improved 12-core VideoCore VII GPU; a hardware video scaler and HDMI controller capable of driving dual 4Kp60 displays; and a Raspberry Pi-developed HEVC decoder and Image Signal Processor. A 32-bit LPDDR4X memory interface provides up to 17GB/s of memory bandwidth, while ×1 and ×4 PCI Express interfaces support high-bandwidth external peripherals; on Raspberry Pi 5 the latter is used to connect to the Raspberry Pi RP1 south bridge, which provides the bulk of the external-facing I/O functionality on the platform.
 
diff --git a/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc b/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc
index 60dcb863d..52840b75d 100644
--- a/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc
+++ b/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc
@@ -85,11 +85,16 @@ All Raspberry Pi models with a PoE-capable Ethernet jack require a HAT to draw p
 | 1.2A
 | 800mA
 
-| Pi 500/500+
+| Pi 500
 | 5.0A
 | 1.6A (600mA if using a 3A power supply)
 | 800mA
 
+| Pi 500+
+| 5.0A
+| 1.6A
+| 800mA
+
 | Zero
 | 1.2A
 | Limited by PSU, board, and connector ratings only

From ce3b4e5a78b85a9b092077dd1de43b06fe527b05 Mon Sep 17 00:00:00 2001
From: Kat Shann <kat.shann@raspberrypi.com>
Date: Fri, 26 Sep 2025 10:44:14 +0100
Subject: [PATCH 4/7] Clarify the power consumption

---
 .../asciidoc/computers/raspberry-pi/power-supplies.adoc         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc b/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc
index 52840b75d..424595941 100644
--- a/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc
+++ b/documentation/asciidoc/computers/raspberry-pi/power-supplies.adoc
@@ -93,7 +93,7 @@ All Raspberry Pi models with a PoE-capable Ethernet jack require a HAT to draw p
 | Pi 500+
 | 5.0A
 | 1.6A
-| 800mA
+| 800mA (with LEDs off and SSD inactive)
 
 | Zero
 | 1.2A

From 32988374c96b7042d79dfd0c22bca78122067983 Mon Sep 17 00:00:00 2001
From: Kat Shann <kat.shann@raspberrypi.com>
Date: Fri, 26 Sep 2025 11:25:03 +0100
Subject: [PATCH 5/7] Make consistent how models are listed in a table.

---
 .../computers/config_txt/conditional.adoc      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/documentation/asciidoc/computers/config_txt/conditional.adoc b/documentation/asciidoc/computers/config_txt/conditional.adoc
index bfa43eb3f..3cbce087b 100644
--- a/documentation/asciidoc/computers/config_txt/conditional.adoc
+++ b/documentation/asciidoc/computers/config_txt/conditional.adoc
@@ -14,31 +14,31 @@ The `[all]` filter is the most basic filter. It resets all previously set filter
 The conditional model filters apply according to the following table.
 
 |===
-| Filter | Applicable model(s)
+| Filter | Applicable models
 
 | `[pi1]`
-| Model 1A, Model 1B, Model 1A+, Model 1B+, Compute Module 1
+| 1A, 1B, 1A+, 1B+, Compute Module 1
 
 | `[pi2]`
-| Model 2B (BCM2836- or BCM2837-based)
+| 2B (BCM2836- or BCM2837-based)
 
 | `[pi3]`
-| Model 3B, Model 3B+, Model 3A+, Compute Module 3, Compute Module 3+
+| 3B, 3B+, 3A+, Compute Module 3, Compute Module 3+
 
 | `[pi3+]`
-| Model 3A+, Model 3B+ (also sees `[pi3]` contents)
+| 3A+, 3B+ (also sees `[pi3]` contents)
 
 | `[pi4]`
-| Model 4B, Pi 400, Compute Module 4, Compute Module 4S
+| 4B, 400, Compute Module 4, Compute Module 4S
 
 | `[pi5]`
-| Raspberry Pi 5, Compute Module 5, Pi 500, Pi 500+
+| 5, 500, 500+, Compute Module 5
 
 | `[pi400]`
-| Pi 400 (also sees `[pi4]` contents)
+| 400 (also sees `[pi4]` contents)
 
 | `[pi500]`
-| Pi 500/500+ (also sees `[pi5]` contents)
+| 500/500+ (also sees `[pi5]` contents)
 
 | `[cm1]`
 | Compute Module 1 (also sees `[pi1]` contents)

From dabcb87c1b4f2ee760e3643f285629e5c7182bc0 Mon Sep 17 00:00:00 2001
From: Kat Shann <kat.shann@raspberrypi.com>
Date: Fri, 26 Sep 2025 13:29:52 +0100
Subject: [PATCH 6/7] Update table for build config.

---
 .../asciidoc/computers/linux_kernel/building.adoc         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/documentation/asciidoc/computers/linux_kernel/building.adoc b/documentation/asciidoc/computers/linux_kernel/building.adoc
index 9497b8685..ceb79ef8a 100644
--- a/documentation/asciidoc/computers/linux_kernel/building.adoc
+++ b/documentation/asciidoc/computers/linux_kernel/building.adoc
@@ -298,7 +298,7 @@ Enter the following commands to build the sources and Device Tree files:
 |===
 | Target Architecture | Target Model | Command
 
-.10+^.^| 64-bit
+.12+^.^| 64-bit
 | Raspberry Pi 3
 .9+.^| [source,console]
 ----
@@ -316,17 +316,17 @@ $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- bcm2711_defconfig
 | Raspberry Pi Compute Module 4S
 
 .^| Raspberry Pi 5
-.1+.^|
+.3+.^|
 [source,console]
 ----
 $ cd linux
 $ KERNEL=kernel_2712
 $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- bcm2712_defconfig
 ----
-
+| Pi 500/500+
+| Compute Module 5
 
 .14+^.^| 32-bit
-
 | Raspberry Pi 1
 .4+.^| [source,console]
 ----

From 6517e5f9d0ee84a305a80fdc9793633ce13cc875 Mon Sep 17 00:00:00 2001
From: Kat Shann <kat.shann@raspberrypi.com>
Date: Fri, 26 Sep 2025 14:12:52 +0100
Subject: [PATCH 7/7] Updates from comments

---
 .../computers/linux_kernel/building.adoc      | 80 +++++++++----------
 .../raspberry-pi/eeprom-bootloader.adoc       |  2 +-
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/documentation/asciidoc/computers/linux_kernel/building.adoc b/documentation/asciidoc/computers/linux_kernel/building.adoc
index ceb79ef8a..f659797b6 100644
--- a/documentation/asciidoc/computers/linux_kernel/building.adoc
+++ b/documentation/asciidoc/computers/linux_kernel/building.adoc
@@ -64,10 +64,10 @@ To prepare the default configuration, run the appropriate commands from the tabl
 
 [cols="8,<.^20a,60a"]
 |===
-| Architecture | Model | Command
+| Architecture | Raspberry Pi Model | Command
 
 .12+^.^| 64-bit
-| Raspberry Pi 3
+| 3
 .9+.^|
 [source,console]
 ----
@@ -76,16 +76,16 @@ $ KERNEL=kernel8
 $ make bcm2711_defconfig
 ----
 | Compute Module 3
-| Raspberry Pi 3+
+| 3+
 | Compute Module 3+
-| Raspberry Pi Zero 2 W
-| Raspberry Pi 4
-| Pi 400
+| Zero 2 W
+| 4
+| 400
 | Compute Module 4
 | Compute Module 4S
 
 
-.^| Raspberry Pi 5
+.^| 5
 .3+.^|
 [source,console]
 ----
@@ -93,11 +93,11 @@ $ cd linux
 $ KERNEL=kernel_2712
 $ make bcm2712_defconfig
 ----
-| Pi 500/500+
+| 500/500+
 | Compute Module 5
 
 .14+^.^| 32-bit
-| Raspberry Pi 1
+| 1
 .4+.^|
 [source,console]
 ----
@@ -110,7 +110,7 @@ $ make bcmrpi_defconfig
 | Zero W
 
 
-| Raspberry Pi 2
+| 2
 .6+.^|
 [source,console]
 ----
@@ -118,14 +118,14 @@ $ cd linux
 $ KERNEL=kernel7
 $ make bcm2709_defconfig
 ----
-| Raspberry Pi 3
+| 3
 | Compute Module 3
-| Raspberry Pi 3+
+| 3+
 | Compute Module 3+
 | Zero 2 W
 
 
-| Raspberry Pi 4
+| 4
 .4+.^|
 [source,console]
 ----
@@ -133,7 +133,7 @@ $ cd linux
 $ KERNEL=kernel7l
 $ make bcm2711_defconfig
 ----
-| Pi 400
+| 400
 | Compute Module 4
 | Compute Module 4S
 |===
@@ -296,26 +296,26 @@ Enter the following commands to build the sources and Device Tree files:
 
 [cols="8,<.^20a,60a"]
 |===
-| Target Architecture | Target Model | Command
+| Target Architecture | Target Raspberry Pi Model | Command
 
 .12+^.^| 64-bit
-| Raspberry Pi 3
+| 3
 .9+.^| [source,console]
 ----
 $ cd linux
 $ KERNEL=kernel8
 $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- bcm2711_defconfig
 ----
-| Raspberry Pi Compute Module 3
-| Raspberry Pi 3+
-| Raspberry Pi Compute Module 3+
-| Raspberry Pi Zero 2 W
-| Raspberry Pi 4
-| Raspberry Pi 400
-| Raspberry Pi Compute Module 4
-| Raspberry Pi Compute Module 4S
+| Compute Module 3
+| 3+
+| Compute Module 3+
+| Zero 2 W
+| 4
+| 400
+| Compute Module 4
+| Compute Module 4S
 
-.^| Raspberry Pi 5
+.^| 5
 .3+.^|
 [source,console]
 ----
@@ -323,22 +323,22 @@ $ cd linux
 $ KERNEL=kernel_2712
 $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- bcm2712_defconfig
 ----
-| Pi 500/500+
+| 500/500+
 | Compute Module 5
 
 .14+^.^| 32-bit
-| Raspberry Pi 1
+| 1
 .4+.^| [source,console]
 ----
 $ cd linux
 $ KERNEL=kernel
 $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcmrpi_defconfig
 ----
-| Raspberry Pi Compute Module 1
-| Raspberry Pi Zero
-| Raspberry Pi Zero W
+| Compute Module 1
+| Zero
+| Zero W
 
-| Raspberry Pi 2
+| 2
 .6+.^|
 [source,console]
 ----
@@ -346,13 +346,13 @@ $ cd linux
 $ KERNEL=kernel7
 $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2709_defconfig
 ----
-| Raspberry Pi 3
-| Raspberry Pi Compute Module 3
-| Raspberry Pi 3+
-| Raspberry Pi Compute Module 3+
-| Raspberry Pi Zero 2 W
+| 3
+| Compute Module 3
+| 3+
+| Compute Module 3+
+| Zero 2 W
 
-| Raspberry Pi 4
+| 4
 .4+.^|
 [source,console]
 ----
@@ -360,9 +360,9 @@ $ cd linux
 $ KERNEL=kernel7l
 $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2711_defconfig
 ----
-| Raspberry Pi 400
-| Raspberry Pi Compute Module 4
-| Raspberry Pi Compute Module 4S
+| 400
+| Compute Module 4
+| Compute Module 4S
 |===
 
 [[cross-compiled-customisation]]
diff --git a/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc b/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc
index a2e2981df..8be245f72 100644
--- a/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc
+++ b/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc
@@ -190,7 +190,7 @@ Default: `0`
 [[SD_OVERCURRENT_CHECK]]
 ==== `SD_OVERCURRENT_CHECK`
 
-Raspberry Pi 4, Raspberry Pi 5, Raspberry Pi 500, and Raspberry Pi 500+ only.
+Raspberry Pi 4 Model B, Raspberry Pi 5, Raspberry Pi 500, and Raspberry Pi 500+ only.
 
 Before booting, the bootloader checks the SD power switch overcurrent signal. The overcurrent signal occurs if the SD card is damaged and has a short circuit which will cause it to get hot.