Skip to content

Commit b386d62

Browse files
committed
---
yaml --- r: 206805 b: refs/heads/beta c: fc6372e h: refs/heads/master i: 206803: 7c374df v: v3
1 parent a8e11f5 commit b386d62

34 files changed

+677
-1573
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2929
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3030
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3131
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
32-
refs/heads/beta: 704fb9c2c98912ee1c2123a33470ecfce6d6dfa0
32+
refs/heads/beta: fc6372ea1f3ab98ab1a0252843a93a7045e95849
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3535
refs/heads/tmp: 579e31929feff51dcaf8d444648eff8de735f91a

branches/beta/README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,9 @@ fetch snapshots, and an OS that can execute the available snapshot binaries.
8787

8888
Snapshot binaries are currently built and tested on several platforms:
8989

90-
| Platform \ Architecture | x86 | x86_64 |
91-
|--------------------------------|-----|--------|
92-
| Windows (7, 8, Server 2008 R2) |||
93-
| Linux (2.6.18 or later) |||
94-
| OSX (10.7 Lion or later) |||
90+
* Windows (7, 8, Server 2008 R2), x86 and x86-64 (64-bit support added in Rust 0.12.0)
91+
* Linux (2.6.18 or later, various distributions), x86 and x86-64
92+
* OSX 10.7 (Lion) or greater, x86 and x86-64
9593

9694
You may find that other platforms work, but these are our officially
9795
supported build environments that are most likely to work.

branches/beta/src/doc/index.md

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ 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
9-
introduction to [The Rust Programming Language](book/index.html). It'll give
10-
you a good idea of what Rust is like.
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.
1111

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.
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.
1617

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

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

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

5960
# Tools
6061

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

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

6970
# FAQs
7071

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

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

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

8081
We have [API documentation for the entire standard
8182
library](std/index.html). There's a list of crates on the left with more
8283
specific sections, or you can use the search bar at the top to search for
8384
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)