summary refs log tree commit diff
path: root/src/doc/tutorial.md
diff options
context:
space:
mode:
authorSean Gillespie <sean.william.g@gmail.com>2014-05-25 21:54:49 -0700
committerSean Gillespie <sean.william.g@gmail.com>2014-05-25 21:54:49 -0700
commitb3fb258406289cb7f59fdd9619d419bb9749a2a0 (patch)
tree7ef1ad22a26326f7f1eeb23f032a38848e9b291d /src/doc/tutorial.md
parent3d6337079fcd9299a1a9966d1ef51bd66bcaa814 (diff)
downloadrust-b3fb258406289cb7f59fdd9619d419bb9749a2a0.tar.gz
rust-b3fb258406289cb7f59fdd9619d419bb9749a2a0.zip
Update tutorial, see issue #13578
Diffstat (limited to 'src/doc/tutorial.md')
-rw-r--r--src/doc/tutorial.md31
1 files changed, 19 insertions, 12 deletions
diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md
index 7a0a1662742..b1149df5a91 100644
--- a/src/doc/tutorial.md
+++ b/src/doc/tutorial.md
@@ -57,13 +57,24 @@ they don't contain references to names that aren't actually defined.
 
 # Getting started
 
-> *Warning:* The tarball and installer links are for the most recent
-> release, not master. To use master, you **must** build from [git].
+There are two ways to install the Rust compiler: by building from source or
+by downloading prebuilt binaries or installers for your platform. The
+[install page][rust-install] contains links to download binaries for both
+the nightly build and the most current Rust major release. For Windows and
+OS X, the install page provides links to native installers. 
 
-The Rust compiler currently must be built from a [tarball] or [git], unless
-you are on Windows, in which case using the [installer][win-exe] is
-recommended. There is a list of community-maintained nightly builds and
-packages [on the wiki][wiki-packages].
+> *Note:* Windows users should read the detailed
+> [Getting started][wiki-start] notes on the wiki. Even when using
+> the binary installer, the Windows build requires a MinGW installation,
+> the precise details of which are not discussed here.
+
+For Linux and OS X, the install page provides links to binary tarballs.
+To install the Rust compiler from the from a binary tarball, download 
+the binary package, extract it, and execute the `install.sh` script in 
+the root directory of the package.
+
+To build the Rust compiler from source, you will need to obtain the source through
+[Git][git] or by downloading the source package from the [install page][rust-install].
 
 Since the Rust compiler is written in Rust, it must be built by
 a precompiled "snapshot" version of itself (made in an earlier state
@@ -79,13 +90,9 @@ Snapshot binaries are currently built and tested on several platforms:
 You may find that other platforms work, but these are our "tier 1"
 supported build environments that are most likely to work.
 
-> *Note:* Windows users should read the detailed
-> [Getting started][wiki-start] notes on the wiki. Even when using
-> the binary installer, the Windows build requires a MinGW installation,
-> the precise details of which are not discussed here.
-
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
 [git]: https://github.com/mozilla/rust.git
+[rust-install]: http://www.rust-lang.org/install.html
 
 To build from source you will also need the following prerequisite
 packages:
@@ -1710,7 +1717,7 @@ it's possible to use *dynamic* mutability via types like `std::cell::Cell` where
 via dynamic checks and can fail at runtime.
 
 The `Rc` and `Gc` types are not sendable, so they cannot be used to share memory between tasks. Safe
-immutable and mutable shared memory is provided by the `extra::arc` module.
+immutable and mutable shared memory is provided by the `sync::arc` module.
 
 # Closures