Merge pull request #3825 from raspberrypi/develop

Roll out latest fixes to production
raspberrypi · Aug 19, 2024 · d19583e · d19583e
2 parents cc58705 + 7da0f90
commit d19583e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/documentation/asciidoc/computers/raspberry-pi/introduction.adoc b/documentation/asciidoc/computers/raspberry-pi/introduction.adoc
@@ -338,29 +338,29 @@ Models with the *H* suffix have header pins pre-soldered to the GPIO header. Mod
 a|
 .Raspberry Pi Pico
 image::images/pico.png[alt="Raspberry Pi Pico"]
-| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | 40-pin GPIO header (unpopulated) ^| none
+| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | two 20-pin GPIO headers (unpopulated) ^| none
 a|
 .Raspberry Pi Pico H
 image::images/pico-h.png[alt="Raspberry Pi Pico H"]
-| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | 40-pin GPIO header (unpopulated) ^| none
+| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | two 20-pin GPIO headers ^| none
 a|
 .Raspberry Pi Pico W
 image::images/pico-w.png[alt="Raspberry Pi Pico W"]
-| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | 40-pin GPIO header (unpopulated)
+| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | two 20-pin GPIO headers (unpopulated)
 a|
 * 2.4GHz single-band 802.11n Wi-Fi (10Mb/s)
 * Bluetooth 5.2, Bluetooth Low Energy (BLE)
 a|
 .Raspberry Pi Pico WH
 image::images/pico-wh.png[alt="Raspberry Pi Pico WH"]
-| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | 40-pin GPIO header
+| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | two 20-pin GPIO headers
 a|
 * 2.4GHz single-band 802.11n Wi-Fi (10Mb/s)
 * Bluetooth 5.2, Bluetooth Low Energy (BLE)
 a|
 .Raspberry Pi Pico 2
 image::images/pico-2.png[alt="Raspberry Pi Pico 2"]
-| xref:../microcontrollers/silicon.adoc#rp2350[RP2350] | 520KB | 2MB | 40-pin GPIO header (unpopulated) ^| none
+| xref:../microcontrollers/silicon.adoc#rp2350[RP2350] | 520KB | 4MB | two 20-pin GPIO headers (unpopulated) ^| none
 
 |===
 

diff --git a/documentation/asciidoc/computers/raspberry-pi/revision-codes.adoc b/documentation/asciidoc/computers/raspberry-pi/revision-codes.adoc
@@ -575,7 +575,7 @@ NOTE: This list is not exhaustive - there may be codes in use that are not in th
 | Sony UK
 
 | c03130
-| Pi 400
+| 400
 | 1.0
 | 4GB
 | Sony UK
@@ -610,6 +610,12 @@ NOTE: This list is not exhaustive - there may be codes in use that are not in th
 | 512MB
 | Sony UK
 
+| b04170
+| 5
+| 1.0
+| 2GB
+| Sony UK
+
 | c04170
 | 5
 | 1.0

diff --git a/documentation/htaccess_extra.txt b/documentation/htaccess_extra.txt
@@ -28,5 +28,6 @@ RedirectMatch 302 "^/documentation/computers/raspberry-pi-5.html" "/documentatio
 RedirectMatch 302 "^/documentation/microcontrollers/rp1.html" "/documentation/microcontrollers/silicon.html"
 RedirectMatch 302 "^/documentation/microcontrollers/rp2040.html" "/documentation/microcontrollers/silicon.html"
 RedirectMatch 302 "^/documentation/microcontrollers/raspberry-pi-pico.html" "/documentation/microcontrollers/pico-series.html"
+RedirectMatch 302 "^/documentation/microcontrollers/pico.html" "/documentation/microcontrollers/pico-series.html"
 </IfModule>