Merge pull request #4001 from raspberrypi/develop

Release latest changes to production
raspberrypi · Jan 9, 2025 · a29024e · a29024e
2 parents e9c35a7 + 79be505
commit a29024e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/Gemfile b/Gemfile
@@ -35,7 +35,7 @@ end
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.2.0", :install_if => Gem.win_platform?
 
-gem "nokogiri", "~> 1.17"
+gem "nokogiri", "~> 1.18"
 
 # So we can add custom element templates
 gem 'slim', '~> 5.2.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -62,7 +62,7 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    nokogiri (1.17.2)
+    nokogiri (1.18.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pathutil (0.16.2)
@@ -105,7 +105,7 @@ DEPENDENCIES
   jekyll-asciidoc
   jekyll-feed (~> 0.17)
   minima (~> 2.5)
-  nokogiri (~> 1.17)
+  nokogiri (~> 1.18)
   slim (~> 5.2.1)
   thread_safe (~> 0.3.5)
   tzinfo (~> 2.0)

diff --git a/documentation/asciidoc/computers/compute-module/introduction.adoc b/documentation/asciidoc/computers/compute-module/introduction.adoc
@@ -16,7 +16,7 @@ Compute Modules use the following Raspberry Pi SoCs:
 .Compute Module 5
 image::images/cm5.png[alt="Compute Module 5", width="60%"]
 
-The Compute Module 5 (CM5) combines the internals of a Raspberry Pi 5 (the BCM2712 processor and 2GB, 4GB, or 8GB of RAM) with optional 0GB (Lite), 16GB, 32GB or 64GB of eMMC flash storage.
+The Compute Module 5 (CM5) combines the internals of a Raspberry Pi 5 (the BCM2712 processor and 2GB, 4GB, 8GB, or 16GB of RAM) with optional 0GB (Lite), 16GB, 32GB or 64GB of eMMC flash storage.
 
 CM5 uses the same form factor as CM4, featuring two 100-pin high density connectors.
 

diff --git a/documentation/asciidoc/computers/configuration/headless.adoc b/documentation/asciidoc/computers/configuration/headless.adoc
@@ -33,7 +33,7 @@ For more information, see xref:remote-access.adoc#ssh[set up an SSH server]. Onc
 [[configuring-a-user]]
 ==== Configure a user manually
 
-At the root of the first partion of your SD card (the filesystem labeled `bootfs`), create a file named `userconf.txt`.
+At the root of the first partition of your SD card (the filesystem labeled `bootfs`), create a file named `userconf.txt`.
 
 This file should contain a single line of text, consisting of `<username>:<password>`: your desired username, followed immediately by a colon, followed immediately by an *encrypted* representation of the password you want to use.
 

diff --git a/documentation/asciidoc/computers/raspberry-pi/introduction.adoc b/documentation/asciidoc/computers/raspberry-pi/introduction.adoc
@@ -162,13 +162,15 @@ a|
 ^.^a|
 .Raspberry Pi 5
 image::images/5.jpg[alt="Raspberry Pi 5"]
-| xref:processors.adoc#bcm2712[BCM2712] (2GB version uses xref:processors.adoc#bcm2712[BCM2712D0])
+| xref:processors.adoc#bcm2712[BCM2712]
 a|
 2GB
 
 4GB
 
-8GB | 40-pin GPIO header
+8GB
+
+16GB | 40-pin GPIO header
 a|
 * 2× micro HDMI
 * 2× USB 2.0

diff --git a/jekyll-assets/css/style.css b/jekyll-assets/css/style.css
@@ -1487,7 +1487,7 @@ input:not(:checked) ~ li ~ .itemcontents .sectlevel1 {
   }
 
   #mobile-toggle:checked ~ #docs-content .toc {
-    height: 100vh;
+    height: 93vh;
     max-width: 100vw;
   }
 
@@ -1778,4 +1778,4 @@ ul#tab-container li.selected a {
     display: block;
     width: 100%;
   }
-}
+}