raspberrypi · aallan · Feb 28, 2022 · Feb 17, 2022 · Feb 17, 2022 · Feb 17, 2022
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -50,13 +50,13 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.2)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)

diff --git a/documentation/asciidoc/accessories/build-hat/py-motors.adoc b/documentation/asciidoc/accessories/build-hat/py-motors.adoc
@@ -54,7 +54,7 @@ from buildhat import Motor
 
 motor_a = Motor('A')
 
-While True:
+while True:
     print("Position: ", motor_a.get_aposition())
 ----
 

diff --git a/documentation/asciidoc/accessories/camera/camera_hardware.adoc b/documentation/asciidoc/accessories/camera/camera_hardware.adoc
@@ -231,6 +231,8 @@ The maximum exposure times of the three official Raspberry Pi cameras are given
 
 === Mechanical Drawings
 
+image:images/RPi-S5-conn.png[camera connector]
+
 * Camera Module v2 https://datasheets.raspberrypi.com/camera/camera-v2-mechanical-drawing.pdf[PDF]
 * HQ Camera Module https://datasheets.raspberrypi.com/hq-camera/hq-camera-mechanical-drawing.pdf[PDF]
 * HQ Camera Module lens mount https://datasheets.raspberrypi.com/hq-camera/hq-camera-lensmount-drawing.pdf[PDF]

diff --git a/documentation/asciidoc/accessories/camera/images/RPi-S5-conn.png b/documentation/asciidoc/accessories/camera/images/RPi-S5-conn.png
diff --git a/...ntation/asciidoc/accessories/camera/libcamera_apps_post_processing_writing.adoc b/...ntation/asciidoc/accessories/camera/libcamera_apps_post_processing_writing.adoc
@@ -6,7 +6,7 @@ We are keen to accept and distribute interesting post-processing stages contribu
 
 ==== Basic Post-Processing Stages
 
-Post-processing stages have a simple API, and users can create their own by deriving from the `PostProcessingStage` class. The member functions that must be implemented are listed below, though note that some be be unnecessary for simple stages.
+Post-processing stages have a simple API, and users can create their own by deriving from the `PostProcessingStage` class. The member functions that must be implemented are listed below, though note that some may be unnecessary for simple stages.
 
 [cols=",^"]
 |===

diff --git a/documentation/asciidoc/computers/config_txt/boot.adoc b/documentation/asciidoc/computers/config_txt/boot.adoc
@@ -37,15 +37,15 @@ Set the `disable_commandline_tags` command to `1` to stop `start.elf` from filli
 
 === `kernel`
 
-`kernel` is the alternative filename on the boot partition to use when loading the kernel. The default value on the Pi 1, Pi Zero, and Compute Module is `kernel.img`, and on the Pi 2, Pi 3, and Compute Module 3 it is `kernel7.img`. On the Pi4, it is `kernel7l.img`.
+`kernel` is the alternative filename on the boot partition to use when 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 `kernel7l.img`.
 
 === `arm_64bit`
 
 If set to non-zero, forces the kernel loading system to assume a 64-bit kernel, starts the processors up in 64-bit mode, and sets `kernel8.img` to be the kernel image loaded, unless there is an explicit `kernel` option defined in which case that is used instead. Defaults to 0 on all platforms. 
 
 NOTE: 64-bit kernels may be uncompressed image files or a gzip archive of an image (which can still be called kernel8.img; the bootloader will recognize the archive from the signature bytes at the beginning).
 
-NOTE: The 64-bit kernel will only work on the Raspberry Pi 4, 3, and 2B rev 1.2 boards with latest firmware.
+NOTE: The 64-bit kernel will only work on the Raspberry Pi 3, 3+, 4, 400, Zero 2 W and 2B rev 1.2, and Raspberry Pi Compute Modules 3, 3+ and 4.
 
 === `arm_control`
 
@@ -154,7 +154,7 @@ Pi 4B and Pi 400 (not CM4 or CM4IO) add a high performance USB 3 controller, att
 
 `otg_mode=1` requests that a more capable XHCI USB 2 controller is used as another host controller on that USB-C connector. 
 
-NOTE: Because CM4 and CM4IO don't include the external USB 3 controller RaspberryPi OS images set `otg_mode=1` on CM4 for better performance.
+NOTE: Because CM4 and CM4IO don't include the external USB 3 controller, Raspberry Pi OS images set `otg_mode=1` on CM4 for better performance.
 
 [[overlay_prefix]]
 === `overlay_prefix`

diff --git a/documentation/asciidoc/computers/config_txt/camera.adoc b/documentation/asciidoc/computers/config_txt/camera.adoc
@@ -6,4 +6,4 @@ Setting `disable_camera_led` to `1` prevents the red camera LED from turning on
 
 === `awb_auto_is_greyworld`
 
-Setting `awb_auto_is_greyworld` to `1` allows libraries or applications that do not support the greyworld option internally to capture valid images and videos with NoIR cameras. It switches "auto" awb mode to use the "greyworld" algorithm. This should only be be needed for NoIR cameras, or when the High Quality camera has had its xref:../accessories/camera.adoc#raspberry-pi-hq-camera-filter-removal[IR filter removed].
+Setting `awb_auto_is_greyworld` to `1` allows libraries or applications that do not support the greyworld option internally to capture valid images and videos with NoIR cameras. It switches "auto" awb mode to use the "greyworld" algorithm. This should only be needed for NoIR cameras, or when the High Quality camera has had its xref:../accessories/camera.adoc#raspberry-pi-hq-camera-filter-removal[IR filter removed].
diff --git a/documentation/asciidoc/computers/config_txt/overclocking.adoc b/documentation/asciidoc/computers/config_txt/overclocking.adoc
@@ -97,9 +97,9 @@ WARNING: Setting any overclocking parameters to values other than those used by
 
 This table gives the default values for the options on various Raspberry Pi Models, all frequencies are stated in MHz.
 
-[cols=",^,^,^,^,^,^,^,^"]
+[cols=",^,^,^,^,^,^,^,^,^"]
 |===
-| Option | Pi 0/W | Pi1 | Pi2 | Pi3 | Pi3A+/Pi3B+ | CM4 & Pi4B <= R1.3 | Pi4B R1.4 | Pi 400
+| Option | Pi 0/W | Pi1 | Pi2 | Pi3 | Pi3A+/Pi3B+ | CM4 & Pi4B <= R1.3 | Pi4B R1.4 | Pi 400 | Pi Zero 2 W
 
 | arm_freq
 | 1000
@@ -110,6 +110,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 1500
 | 1500 or 1800 if arm_boost=1
 | 1800
+| 1000
 
 | core_freq
 | 400
@@ -120,6 +121,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 500
 | 500
 | 500
+| 400
 
 | h264_freq
 | 300
@@ -130,6 +132,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 500
 | 500
 | 500
+| 300
 
 | isp_freq
 | 300
@@ -140,6 +143,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 500
 | 500
 | 500
+| 300
 
 | v3d_freq
 | 300
@@ -150,6 +154,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 500
 | 500
 | 500
+| 300
 
 | hevc_freq
 | N/A
@@ -160,6 +165,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 500
 | 500
 | 500
+| N/A
 
 | sdram_freq
 | 450
@@ -170,6 +176,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 3200
 | 3200
 | 3200
+| 450
 
 | arm_freq_min
 | 700
@@ -180,6 +187,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 600
 | 600
 | 600
+| 600
 
 | core_freq_min
 | 250
@@ -190,6 +198,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 200
 | 200
 | 200
+| 250
 
 | gpu_freq_min
 | 250
@@ -200,6 +209,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 250
 | 250
 | 250
+| 250
 
 | h264_freq_min
 | 250
@@ -210,6 +220,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 250
 | 250
 | 250
+| 250
 
 | isp_freq_min
 | 250
@@ -220,6 +231,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 250
 | 250
 | 250
+| 250
 
 | v3d_freq_min
 | 250
@@ -230,6 +242,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 250
 | 250
 | 250
+| 250
 
 | sdram_freq_min
 | 400
@@ -240,6 +253,7 @@ This table gives the default values for the options on various Raspberry Pi Mode
 | 3200
 | 3200
 | 3200
+| 400
 |===
 
 This table gives defaults for options that are the same across all models.

diff --git a/documentation/asciidoc/computers/configuration/hdmi-config.adoc b/documentation/asciidoc/computers/configuration/hdmi-config.adoc
@@ -1,6 +1,6 @@
 == HDMI Configuration
 
-In the vast majority of cases, simply plugging your HDMI-equipped monitor into the Raspberry Pi using a standard HDMI cable will automatically lead to the Pi using the best resolution the monitor supports. The Raspberry Pi Zero uses a mini HDMI port, so you will need a mini-HDMI-to-full-size-HDMI lead or adapter. On the Raspberry Pi 4 there are two micro HDMI ports, so you will need either one or two micro-HDMI-to-full-size-HDMI leads or adapters, depending on how many displays you wish to attach. You should connect any HDMI leads before turning on the Raspberry Pi.
+In the vast majority of cases, simply plugging your HDMI-equipped monitor into the Raspberry Pi using a standard HDMI cable will automatically result in the Raspberry Pi using the best resolution the monitor supports. The Raspberry Pi Zero, Zero W and Zero 2 W use a mini HDMI port, so you will need a mini-HDMI-to-full-size-HDMI lead or adapter. On the Raspberry Pi 4 and Raspberry Pi 400 there are two micro HDMI ports, so you will need a micro-HDMI-to-full-size-HDMI lead or adapter for each display you wish to attach. You should connect any HDMI leads before turning on the Raspberry Pi.
 
 The Raspberry Pi 4 can drive up to two displays, with a resolution up to 1080p at a 60Hz refresh rate. At 4K resolution, if you connect two displays then you are limited to a 30Hz refresh rate. You can also drive a single display at 4K with a 60Hz refresh rate: this requires that the display is attached to the HDMI port adjacent to the USB-C power input (labelled HDMI0). You must also enable 4Kp60 output by setting the `hdmi_enable_4kp60=1` flag in config.txt. This flag can also be set using the 'Raspberry Pi Configuration' tool within the desktop environment.
 
@@ -39,7 +39,7 @@ You can specify which display `tvservice` uses by adding `-v <display id>` to th
 
 Setting a specific mode is done using the `hdmi_group` and `hdmi_mode` config.txt entries. The group entry selects between CEA or DMT, and the mode selects the resolution and frame rate. You can find tables of modes on the config.txt xref:config_txt.adoc#video-options[Video Configuration] page, but you should use the `tvservice` command described above to find out exactly which modes your device supports.
 
-On the Pi 4, to specify the HDMI port, add an index identifier to the `hdmi_group` or `hdmi_mode` entry in config.txt, e.g. `hdmi_mode:0` or `hdmi_group:1`.
+On the Raspberry Pi 4 and Raspberry Pi 400 to specify the HDMI port, add an index identifier to the `hdmi_group` or `hdmi_mode` entry in config.txt, e.g. `hdmi_mode:0` or `hdmi_group:1`.
 
 === Setting a Custom HDMI Mode
 
@@ -140,7 +140,7 @@ hdmi_timings=<h_active_pixels> <h_sync_polarity> <h_front_porch> <h_sync_pulse>
 | 8
 |===
 
-For the Pi4, to specify the HDMI port, you can add an index identifier to the config.txt. e.g. `+hdmi_cvt:0=...+` or `+hdmi_timings:1=...+`. If no port identifier is specified, the settings are applied to port 0.
+For the Raspberry Pi 4 and Raspberry Pi 400 to specify the HDMI port, you can add an index identifier to the config.txt. e.g. `+hdmi_cvt:0=...+` or `+hdmi_timings:1=...+`. If no port identifier is specified, the settings are applied to port 0.
 
 === Troubleshooting your HDMI
 

diff --git a/documentation/asciidoc/computers/configuration/raspi-config.adoc b/documentation/asciidoc/computers/configuration/raspi-config.adoc
@@ -90,7 +90,7 @@ Enable/disable 2x2 pixel mapping.
 
 ===== Composite Video
 
-On the Raspberry Pi4, enable composite video. On models prior to the Raspberry Pi4, composite video is enabled by default so this option is not displayed.
+On the Raspberry Pi 4, enable composite video. On models prior to the Raspberry Pi 4, composite video is enabled by default so this option is not displayed.
 
 ===== Screen Blanking
 
@@ -232,11 +232,11 @@ Configure the network's proxy settings.
 
 ===== Boot Order
 
-On the Raspberry Pi4, you can specify whether to boot from USB or network if the SD card isn't inserted. See xref:raspberry-pi.adoc#raspberry-pi-4-bootloader-configuration[this page] for more information.
+On the Raspberry Pi 4, you can specify whether to boot from USB or network if the SD card isn't inserted. See xref:raspberry-pi.adoc#raspberry-pi-4-bootloader-configuration[this page] for more information.
 
 ===== Bootloader Version
 
-On the Raspberry Pi4, you can tell the system to use the very latest boot ROM software, or default to the factory default if the latest version causes problems.
+On the Raspberry Pi 4, you can tell the system to use the very latest boot ROM software, or revert to the factory default if the latest version causes problems.
 
 [[update]]
 ==== Update

diff --git a/documentation/asciidoc/computers/linux_kernel/about-kernel.adoc b/documentation/asciidoc/computers/linux_kernel/about-kernel.adoc
@@ -19,5 +19,5 @@ Initially, you should fork the https://github.com/raspberrypi/linux[Linux reposi
 
 Next, depending upon whether the code is Raspberry Pi-specific or not:
 
-* For Pi-specific changes or bug fixes, submit a pull request to the kernel.
+* For Raspberry Pi-specific changes or bug fixes, submit a pull request to the kernel.
 * For general Linux kernel changes (i.e. a new driver), these need to be submitted upstream first. Once they've been submitted upstream and accepted, submit the pull request and we'll receive it.
diff --git a/documentation/asciidoc/computers/processors/rp3a0.adoc b/documentation/asciidoc/computers/processors/rp3a0.adoc
@@ -6,7 +6,7 @@ It is used by the xref:raspberry-pi.adoc#raspberry-pi-zero-2-w[Raspberry Pi Zero
 
 image:images/RP3A0-crosssection.png[width="70%"]
 
-The RP3A0 is a Quad-core 64-bit Arm Cortex A53 CPU clocked at 1 GHz, although with a heat sink or other cooling solution in place, the chip can be be potentially overclocked to 1.2 GHz.
+The RP3A0 is a Quad-core 64-bit Arm Cortex A53 CPU clocked at 1 GHz, although with a heat sink or other cooling solution in place, the chip can be potentially overclocked to 1.2 GHz.
 
 Please refer to the following BCM2836 document for details on the ARM peripherals specification, which also applies to the BCM2837 and RP3A0.
 

diff --git a/documentation/asciidoc/computers/raspberry-pi/bcm2711-bootloader.adoc b/documentation/asciidoc/computers/raspberry-pi/bcm2711-bootloader.adoc
@@ -204,7 +204,7 @@ Default: `Raspberry Pi Boot`
 
 In earlier releases the client GUID (Option97) was just the serial number repeated 4 times. By default, the new GUID format is
 the concatenation of the fourcc for RPi4 (0x34695052 - little endian), the board revision (e.g. 0x00c03111) (4-bytes), the least significant 4 bytes of the mac address and the 4-byte serial number.
-This is intended to be unique but also provide structured information to the DHCP server, allowing Raspberry Pi4 computers to be identified without relying upon the Ethernet MAC OUID.
+This is intended to be unique but also provide structured information to the DHCP server, allowing Raspberry Pi 4 computers to be identified without relying upon the Ethernet MAC OUID.
 
 Specify DHCP_OPTION97=0 to revert the old behaviour or a non-zero hex-value to specify a custom 4-byte prefix.
 

diff --git a/documentation/asciidoc/computers/raspberry-pi/bootflow-legacy.adoc b/documentation/asciidoc/computers/raspberry-pi/bootflow-legacy.adoc
@@ -1,6 +1,6 @@
 == Boot sequence
 
-IMPORTANT: The following boot sequence applies to the BCM2837 and BCM2837B0 based models of Raspberry Pi only. On models prior to this, the Raspberry Pi will try SD card boot, followed by xref:raspberry-pi.adoc#usb-device-boot-mode[USB device mode boot]. For the Raspberry Pi4 boot sequence please see the xref:raspberry-pi.adoc#raspberry-pi-4-boot-flow[Raspberry Pi 4 boot flow] section.
+IMPORTANT: The following boot sequence applies to the BCM2837 and BCM2837B0 based models of Raspberry Pi only. On models prior to this, the Raspberry Pi will try SD card boot, followed by xref:raspberry-pi.adoc#usb-device-boot-mode[USB device mode boot]. For the Raspberry Pi 4 boot sequence please see the xref:raspberry-pi.adoc#raspberry-pi-4-boot-flow[Raspberry Pi 4 boot flow] section.
 
 USB boot defaults on the Raspberry Pi 3 will depend on which version is being used. See this xref:raspberry-pi.adoc#usb-mass-storage-boot[page] for information on enabling USB boot modes when not enabled by default.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ Setting `disable_camera_led` to `1` prevents the red camera LED from turning on

		=== `awb_auto_is_greyworld`

		Setting `awb_auto_is_greyworld` to `1` allows libraries or applications that do not support the greyworld option internally to capture valid images and videos with NoIR cameras. It switches "auto" awb mode to use the "greyworld" algorithm. This should only be be needed for NoIR cameras, or when the High Quality camera has had its xref:../accessories/camera.adoc#raspberry-pi-hq-camera-filter-removal[IR filter removed].
		Setting `awb_auto_is_greyworld` to `1` allows libraries or applications that do not support the greyworld option internally to capture valid images and videos with NoIR cameras. It switches "auto" awb mode to use the "greyworld" algorithm. This should only be needed for NoIR cameras, or when the High Quality camera has had its xref:../accessories/camera.adoc#raspberry-pi-hq-camera-filter-removal[IR filter removed].