New upstream version 1.69.0+dfsg1

[rustc.git] / src / doc / embedded-book / src / intro / install / verify.md

diff --git a/src/doc/embedded-book/src/intro/install/verify.md b/src/doc/embedded-book/src/intro/install/verify.md
index ad58c003ad881f7e02278cb794c938929816d962..e60911dc383a8ca2eb6e06e11987b3972390c096 100644 (file)
--- a/src/doc/embedded-book/src/intro/install/verify.md
+++ b/src/doc/embedded-book/src/intro/install/verify.md
@@ -8,7 +8,7 @@ discovery board has two USB connectors; use the one labeled "USB ST-LINK" that
 sits on the center of the edge of the board.
 
 Also check that the ST-LINK header is populated. See the picture below; the
-ST-LINK header is circled in red.
+ST-LINK header is highlighted.
 
 <p align="center">
 <img title="Connected discovery board" src="../../assets/verify.jpeg">
@@ -17,9 +17,13 @@ ST-LINK header is circled in red.
 Now run the following command:
 
 ``` console
-$ openocd -f interface/stlink-v2-1.cfg -f target/stm32f3x.cfg
+openocd -f interface/stlink.cfg -f target/stm32f3x.cfg
 ```
 
+> **NOTE**: Old versions of openocd, including the 0.10.0 release from 2017, do
+> not contain the new (and preferable) `interface/stlink.cfg` file; instead you
+> may need to use `interface/stlink-v2.cfg` or `interface/stlink-v2-1.cfg`.
+
 You should get the following output and the program should block the console:
 
 ``` text
@@ -47,18 +51,22 @@ and move to the [next section].
 
 [next section]: ../../start/index.md
 
-If you didn't get the "breakpoints" line then try the following command.
+If you didn't get the "breakpoints" line then try one of the following commands.
+
+``` console
+openocd -f interface/stlink-v2.cfg -f target/stm32f3x.cfg
+```
 
 ``` console
-$ openocd -f interface/stlink-v2.cfg -f target/stm32f3x.cfg
+openocd -f interface/stlink-v2-1.cfg -f target/stm32f3x.cfg
 ```
 
-If that command works that means you got an old hardware revision of the
+If one of those commands works it means you got an old hardware revision of the
 discovery board. That won't be a problem but commit that fact to memory as
 you'll need to configure things a bit differently later on. You can move to the
 [next section].
 
-If neither command worked as a normal user then try to run them with root
+If none of the commands work as a normal user then try to run them with root
 permission (e.g. `sudo openocd ..`). If the commands do work with root
 permission then check that the [udev rules] have been correctly set.