Updates from review.

Author: katshann-raspberry

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`
 

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.
 

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)

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]
 

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.
 

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