Skip to content

Commit

Permalink
Merge pull request #25361 from steveklabnik/final_backport
Browse files Browse the repository at this point in the history
Final backport
  • Loading branch information
steveklabnik committed May 13, 2015
2 parents 6e2106d + 98fef7b commit f0213d8
Show file tree
Hide file tree
Showing 70 changed files with 6,812 additions and 2,215 deletions.
210 changes: 117 additions & 93 deletions src/doc/grammar.md

Large diffs are not rendered by default.

28 changes: 16 additions & 12 deletions src/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ to jump to any particular section.

# Getting Started

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

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

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

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

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

# Tools

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

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

# FAQs

There are questions that are asked quite often, and so we've made FAQs for them:
There are questions that are asked quite often, so we've made FAQs for them:

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

# The standard library
# The Standard Library

We have [API documentation for the entire standard
library](std/index.html). There's a list of crates on the left with more
specific sections, or you can use the search bar at the top to search for
something if you know its name.

# The Error Index

If you encounter an error while compiling your code you may be able to look it
up in the [Rust Compiler Error Index](error-index.html).
Loading

0 comments on commit f0213d8

Please # to comment.