about summary refs log tree commit diff
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2013-05-23 17:58:30 -0700
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2013-05-23 17:58:30 -0700
commitcc4fabcb4361d0daada096f5e6ac19eb6ed21d33 (patch)
treeaba02724b023cd26fb2ce61348cef9910ae8b8b3
parent21c3cf02f056e66d492a5a324e047ae1fec0c7d8 (diff)
downloadrust-cc4fabcb4361d0daada096f5e6ac19eb6ed21d33.tar.gz
rust-cc4fabcb4361d0daada096f5e6ac19eb6ed21d33.zip
Fix some std/extra language in the tutorial
-rw-r--r--doc/tutorial.md11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/tutorial.md b/doc/tutorial.md
index ad9431ef60c..91a41cb9b85 100644
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@@ -1480,7 +1480,6 @@ This code creates a closure that adds a given string to its argument,
 returns it from a function, and then calls it:
 
 ~~~~
-# extern mod std;
 fn mk_appender(suffix: ~str) -> @fn(~str) -> ~str {
     // The compiler knows that we intend this closure to be of type @fn
     return |s| s + suffix;
@@ -2292,7 +2291,7 @@ let nonsense = mycircle.radius() * mycircle.area();
 
 ## Deriving implementations for traits
 
-A small number of traits in `std` and `std` can have implementations
+A small number of traits in `std` and `extra` can have implementations
 that can be automatically derived. These instances are specified by
 placing the `deriving` attribute on a data type declaration. For
 example, the following will mean that `Circle` has an implementation
@@ -2541,9 +2540,9 @@ as well as an inscrutable string of alphanumerics. These are both
 part of Rust's library versioning scheme. The alphanumerics are
 a hash representing the crate metadata.
 
-## The std library
+## The standard library
 
-The Rust std library provides runtime features required by the language,
+The Rust standard library provides runtime features required by the language,
 including the task scheduler and memory allocators, as well as library
 support for Rust built-in types, platform abstractions, and other commonly
 used features.
@@ -2559,7 +2558,7 @@ I/O abstractions ([`io`]), [containers] like [`hashmap`],
 common traits ([`kinds`], [`ops`], [`cmp`], [`num`],
 [`to_str`], [`clone`]), and complete bindings to the C standard library ([`libc`]).
 
-### Core injection and the Rust prelude
+### Standard Library injection and the Rust prelude
 
 `std` is imported at the topmost level of every crate by default, as
 if the first line of each crate was
@@ -2571,7 +2570,7 @@ with the `std::` path prefix, as in `use std::vec`, `use std::task::spawn`,
 etc.
 
 Additionally, `std` contains a `prelude` module that reexports many of the
-most common std modules, types and traits. The contents of the prelude are
+most common standard modules, types and traits. The contents of the prelude are
 imported into every *module* by default.  Implicitly, all modules behave as if
 they contained the following prologue: