about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-05-09 00:37:43 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-05-09 00:37:43 +0530
commit4b4cb86248ef3540fd531a25d53c13069887a018 (patch)
tree8d050a99a70e579836331f8f8ef7868111cbec07
parent655042052cd45de1b8d9b1f2fb6625be7f8322ba (diff)
parent60c0e75e748dd18917736cdfd36de5a8ed23dce0 (diff)
downloadrust-4b4cb86248ef3540fd531a25d53c13069887a018.tar.gz
rust-4b4cb86248ef3540fd531a25d53c13069887a018.zip
Rollup merge of #25195 - simonkern:master, r=steveklabnik
I deleted one unneccessary 'the' and added the href for [bindings]
-rw-r--r--src/doc/trpl/lifetimes.md2
-rw-r--r--src/doc/trpl/ownership.md5
-rw-r--r--src/doc/trpl/references-and-borrowing.md2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/doc/trpl/lifetimes.md b/src/doc/trpl/lifetimes.md
index 981286c82d7..86164a08a43 100644
--- a/src/doc/trpl/lifetimes.md
+++ b/src/doc/trpl/lifetimes.md
@@ -116,7 +116,7 @@ fn main() {
 }
 ```
 
-[struct]: structs.html
+[structs]: structs.html
 
 As you can see, `struct`s can also have lifetimes. In a similar way to functions,
 
diff --git a/src/doc/trpl/ownership.md b/src/doc/trpl/ownership.md
index 3003156f875..fba5226ca2e 100644
--- a/src/doc/trpl/ownership.md
+++ b/src/doc/trpl/ownership.md
@@ -3,7 +3,7 @@
 This guide is one of three presenting Rust’s ownership system. This is one of
 Rust’s most unique and compelling features, with which Rust developers should
 become quite acquainted. Ownership is how Rust achieves its largest goal,
-memory safety. The there are a few distinct concepts, each with its own
+memory safety. There are a few distinct concepts, each with its own
 chapter:
 
 * ownership, which you’re reading now.
@@ -59,6 +59,7 @@ deterministically, at the end of the scope.
 
 [vect]: ../std/vec/struct.Vec.html
 [heap]: the-stack-and-the-heap.html
+[bindings]: variable-bindings.html
 
 # Move semantics
 
@@ -122,7 +123,7 @@ let v2 = v;
 
 The first line creates some data for the vector on the [stack][sh], `v`. The
 vector’s data, however, is stored on the [heap][sh], and so it contains a
-pointer to that data. When we move `v` to `v2`, it creates a copy of that data,
+pointer to that data. When we move `v` to `v2`, it creates a copy of that pointer,
 for `v2`. Which would mean two pointers to the contents of the vector on the
 heap. That would be a problem: it would violate Rust’s safety guarantees by
 introducing a data race. Therefore, Rust forbids using `v` after we’ve done the
diff --git a/src/doc/trpl/references-and-borrowing.md b/src/doc/trpl/references-and-borrowing.md
index 21feff73342..8bb3f94760b 100644
--- a/src/doc/trpl/references-and-borrowing.md
+++ b/src/doc/trpl/references-and-borrowing.md
@@ -3,7 +3,7 @@
 This guide is one of three presenting Rust’s ownership system. This is one of
 Rust’s most unique and compelling features, with which Rust developers should
 become quite acquainted. Ownership is how Rust achieves its largest goal,
-memory safety. The there are a few distinct concepts, each with its own
+memory safety. There are a few distinct concepts, each with its own
 chapter:
 
 * [ownership][ownership], ownership, the key concept