Skip to content

Commit 88350bd

Browse files
committed
Rollup merge of #34699 - phlogisticfugu:master, r=steveklabnik
enhancewindows documentation in getting-started - minor pronoun fix We -> You - PATH troubleshooting - dir output is vertical (but did not include timestamps) - executables not in %PATH% require .\ r? @steveklabnik
2 parents 793db8f + 1f99c29 commit 88350bd

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/doc/book/getting-started.md

+9-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ an Internet connection to run the commands in this section, as we’ll be
1111
downloading Rust from the Internet.
1212

1313
We’ll be showing off a number of commands using a terminal, and those lines all
14-
start with `$`. We don't need to type in the `$`s, they are there to indicate
14+
start with `$`. You don't need to type in the `$`s, they are there to indicate
1515
the start of each command. We’ll see many tutorials and examples around the web
1616
that follow this convention: `$` for commands run as our regular user, and `#`
1717
for commands we should be running as an administrator.
@@ -159,9 +159,11 @@ You should see the version number, commit hash, and commit date.
159159
If you do, Rust has been installed successfully! Congrats!
160160

161161
If you don't and you're on Windows, check that Rust is in your %PATH% system
162-
variable. If it isn't, run the installer again, select "Change" on the "Change,
163-
repair, or remove installation" page and ensure "Add to PATH" is installed on
164-
the local hard drive.
162+
variable: `$ echo %PATH%`. If it isn't, run the installer again, select "Change"
163+
on the "Change, repair, or remove installation" page and ensure "Add to PATH" is
164+
installed on the local hard drive. If you need to configure your path manually,
165+
you can find the Rust executables in a directory like
166+
`"C:\Program Files\Rust stable GNU 1.x\bin"`.
165167

166168
Rust does not do its own linking, and so you’ll need to have a linker
167169
installed. Doing so will depend on your specific system, consult its
@@ -339,15 +341,16 @@ On Windows, you'd enter:
339341

340342
```bash
341343
$ dir
342-
main.exe main.rs
344+
main.exe
345+
main.rs
343346
```
344347

345348
This shows we have two files: the source code, with an `.rs` extension, and the
346349
executable (`main.exe` on Windows, `main` everywhere else). All that's left to
347350
do from here is run the `main` or `main.exe` file, like this:
348351

349352
```bash
350-
$ ./main # or main.exe on Windows
353+
$ ./main # or .\main.exe on Windows
351354
```
352355

353356
If *main.rs* were your "Hello, world!" program, this would print `Hello,

0 commit comments

Comments
 (0)