Merging upstream version 1.67.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 6 insertions, 7 deletions

diff --git a/src/doc/embedded-book/src/intro/install/linux.md b/src/doc/embedded-book/src/intro/install/linux.md
index f8684d0a8..1c0b0edfa 100644
--- a/src/doc/embedded-book/src/intro/install/linux.md
+++ b/src/doc/embedded-book/src/intro/install/linux.md
@@ -39,16 +39,13 @@ sudo apt install gdb-arm-none-eabi openocd qemu-system-arm
 
 - Fedora 27 or newer
 
-> **NOTE** `arm-none-eabi-gdb` is the GDB command you'll use to debug your ARM
-> Cortex-M programs
-
 <!-- Fedora 27 -->
 <!-- GDB 7.6 (!) -->
 <!-- OpenOCD 0.10.0 -->
 <!-- QEMU 2.10.2 -->
 
 ``` console
-sudo dnf install arm-none-eabi-gdb openocd qemu-system-arm
+sudo dnf install gdb openocd qemu-system-arm
 ```
 
 - Arch Linux
diff --git a/src/doc/embedded-book/src/intro/no-std.md b/src/doc/embedded-book/src/intro/no-std.md
index 35bfc1adc..93aadf65d 100644
--- a/src/doc/embedded-book/src/intro/no-std.md
+++ b/src/doc/embedded-book/src/intro/no-std.md
@@ -47,7 +47,7 @@ bootstrapping (stage 0) code like bootloaders, firmware or kernels.
 | feature                                                   | no\_std | std |
 |-----------------------------------------------------------|--------|-----|
 | heap (dynamic memory)                                     |   *    |  ✓  |
-| collections (Vec, HashMap, etc)                           |  **    |  ✓  |
+| collections (Vec, BTreeMap, etc)                          |  **    |  ✓  |
 | stack overflow protection                                 |   ✘    |  ✓  |
 | runs init code before main                                |   ✘    |  ✓  |
 | libstd available                                          |   ✘    |  ✓  |
@@ -58,6 +58,8 @@ bootstrapping (stage 0) code like bootloaders, firmware or kernels.
 
 \** Only if you use the `collections` crate and configure a global default allocator.
 
+\** HashMap and HashSet are not available due to a lack of a secure random number generator.
+
 [alloc-cortex-m]: https://github.com/rust-embedded/alloc-cortex-m
 
 ## See Also
diff --git a/src/doc/embedded-book/src/peripherals/singletons.md b/src/doc/embedded-book/src/peripherals/singletons.md
index 840a98665..3f04aa170 100644
--- a/src/doc/embedded-book/src/peripherals/singletons.md
+++ b/src/doc/embedded-book/src/peripherals/singletons.md
@@ -25,7 +25,7 @@ But this has a few problems. It is a mutable global variable, and in Rust, these
 
 ## How do we do this in Rust?
 
-Instead of just making our peripheral a global variable, we might instead decide to make a global variable, in this case called `PERIPHERALS`, which contains an `Option<T>` for each of our peripherals.
+Instead of just making our peripheral a global variable, we might instead decide to make a structure, in this case called `PERIPHERALS`, which contains an `Option<T>` for each of our peripherals.
 
 ```rust,ignore
 struct Peripherals {
diff --git a/src/doc/embedded-book/src/start/hardware.md b/src/doc/embedded-book/src/start/hardware.md
index f1eee3163..8166e62e5 100644
--- a/src/doc/embedded-book/src/start/hardware.md
+++ b/src/doc/embedded-book/src/start/hardware.md
@@ -272,7 +272,7 @@ Quit anyway? (y or n)
 ```
 
 Debugging now requires a few more steps so we have packed all those steps into a
-single GDB script named `openocd.gdb`. The file was created during the `cargo generate` step, and should work without any modifications. Let's have a peak:
+single GDB script named `openocd.gdb`. The file was created during the `cargo generate` step, and should work without any modifications. Let's have a peek:
 
 ``` console
 cat openocd.gdb