Skip to content

Commit f0213d8

Browse files
committed
Merge pull request #25361 from steveklabnik/final_backport
Final backport
2 parents 6e2106d + 98fef7b commit f0213d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+6812
-2215
lines changed

src/doc/grammar.md

+117-93
Large diffs are not rendered by default.

src/doc/index.md

+16-12
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ to jump to any particular section.
55

66
# Getting Started
77

8-
If you haven't seen Rust at all yet, the first thing you should read is the [30
9-
minute intro](intro.html). It will give you an overview of the basic ideas of Rust
10-
at a high level.
8+
If you haven't seen Rust at all yet, the first thing you should read is the
9+
introduction to [The Rust Programming Language](book/index.html). It'll give
10+
you a good idea of what Rust is like.
1111

12-
Once you know you really want to learn Rust, the next step is reading [The
13-
Rust Programming Language](book/index.html). It is a lengthy explanation of
14-
Rust, its syntax, and its concepts. Upon completing the book, you'll be an
15-
intermediate Rust developer, and will have a good grasp of the fundamental
16-
ideas behind Rust.
12+
The book provides a lengthy explanation of Rust, its syntax, and its
13+
concepts. Upon completing the book, you'll be an intermediate Rust
14+
developer, and will have a good grasp of the fundamental ideas behind
15+
Rust.
1716

1817
[Rust By Example][rbe] was originally a community resource, but was then
1918
donated to the Rust project. As the name implies, it teaches you Rust through a
@@ -24,7 +23,7 @@ series of small examples.
2423
# Community & Getting Help
2524

2625
If you need help with something, or just want to talk about Rust with others,
27-
there's a few places you can do that:
26+
there are a few places you can do that:
2827

2928
The Rust IRC channels on [irc.mozilla.org](http://irc.mozilla.org/) are the
3029
fastest way to get help.
@@ -59,7 +58,7 @@ the language in as much detail as possible is in [the reference](reference.html)
5958

6059
# Tools
6160

62-
Rust's still a young language, so there isn't a ton of tooling yet, but the
61+
Rust is still a young language, so there isn't a ton of tooling yet, but the
6362
tools we have are really nice.
6463

6564
[Cargo](http://crates.io) is Rust's package manager, and its website contains
@@ -69,16 +68,21 @@ lots of good documentation.
6968

7069
# FAQs
7170

72-
There are questions that are asked quite often, and so we've made FAQs for them:
71+
There are questions that are asked quite often, so we've made FAQs for them:
7372

7473
* [Language Design FAQ](complement-design-faq.html)
7574
* [Language FAQ](complement-lang-faq.html)
7675
* [Project FAQ](complement-project-faq.html)
7776
* [How to submit a bug report](https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports)
7877

79-
# The standard library
78+
# The Standard Library
8079

8180
We have [API documentation for the entire standard
8281
library](std/index.html). There's a list of crates on the left with more
8382
specific sections, or you can use the search bar at the top to search for
8483
something if you know its name.
84+
85+
# The Error Index
86+
87+
If you encounter an error while compiling your code you may be able to look it
88+
up in the [Rust Compiler Error Index](error-index.html).

0 commit comments

Comments
 (0)