Skip to content

Commit a2f2a64

Browse files
committed
Auto merge of #26238 - Manishearth:rollup, r=Manishearth
- Successful merges: #24495, #26229, #26231 - Failed merges:
2 parents 69db64f + a9ea380 commit a2f2a64

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

src/doc/complement-lang-faq.md

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Yes. For example (incomplete):
3737
* [wit.ai](https://github.com/wit-ai/witd)
3838
* [Codius](https://codius.org/blog/codius-rust/)
3939
* [MaidSafe](http://maidsafe.net/)
40+
* [Terminal.com](https://terminal.com)
4041

4142
## Does it run on Windows?
4243

src/doc/trpl/hello-cargo.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ To start a new project with Cargo, use `cargo new`:
145145
$ cargo new hello_world --bin
146146
```
147147

148-
We’re passing `--bin` because we're making a binary program: if we were making
149-
a library, we'd leave it off.
148+
We’re passing `--bin` because our goal is to get straight to making an executable application, as opposed to a library. Executables are often called ‘binaries.’ (as in `/usr/bin`, if you’re on a Unix system)
150149

151150
Let's check out what Cargo has generated for us:
152151

src/doc/trpl/installing-rust.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ $ sh rustup.sh
2424

2525
[insecurity]: http://curlpipesh.tumblr.com
2626

27-
If you're on Windows, please download either the [32-bit installer][win32] or
28-
the [64-bit installer][win64] and run it.
27+
If you're on Windows, please download the appropriate [installer][install-page].
2928

30-
[win32]: https://static.rust-lang.org/dist/rust-1.0.0-i686-pc-windows-gnu.msi
31-
[win64]: https://static.rust-lang.org/dist/rust-1.0.0-x86_64-pc-windows-gnu.msi
29+
[install-page]: http://www.rust-lang.org/install.html
3230

3331
## Uninstalling
3432

@@ -51,7 +49,6 @@ documentation on [building Rust from Source][from-source], or [the official
5149
binary downloads][install-page].
5250

5351
[from-source]: https://github.com/rust-lang/rust#building-from-source
54-
[install-page]: http://www.rust-lang.org/install.html
5552

5653
Oh, we should also mention the officially supported platforms:
5754

@@ -75,10 +72,11 @@ If you've got Rust installed, you can open up a shell, and type this:
7572
$ rustc --version
7673
```
7774

78-
You should see the version number, commit hash, commit date and build date:
75+
You should see the version number, commit hash, and commit date. If you just
76+
installed version 1.0.0, you should see:
7977

8078
```bash
81-
rustc 1.0.0 (a59de37e9 2015-05-13) (built 2015-05-14)
79+
rustc 1.0.0 (a59de37e9 2015-05-13)
8280
```
8381

8482
If you did, Rust has been installed successfully! Congrats!

0 commit comments

Comments
 (0)