Auto merge of #28945 - shama:doc-typos, r=steveklabnik

Just a few typos found in the docs. Thanks!
This commit is contained in:
bors 2015-10-10 16:40:05 +00:00
commit 1302187673
6 changed files with 6 additions and 6 deletions

View file

@ -259,7 +259,7 @@ symbol : "::" | "->"
```
Symbols are a general class of printable [tokens](#tokens) that play structural
roles in a variety of grammar productions. They are catalogued here for
roles in a variety of grammar productions. They are cataloged here for
completeness as the set of remaining miscellaneous printable tokens that do not
otherwise appear as [unary operators](#unary-operator-expressions), [binary
operators](#binary-operator-expressions), or [keywords](#keywords).

View file

@ -1,4 +1,4 @@
% Concurrency and Paralellism
% Concurrency and Parallelism
Rust as a language doesn't *really* have an opinion on how to do concurrency or
parallelism. The standard library exposes OS threads and blocking sys-calls

View file

@ -53,7 +53,7 @@ impl<T> Drop for Box<T> {
and this works fine because when Rust goes to drop the `ptr` field it just sees
a [Unique] that has no actual `Drop` implementation. Similarly nothing can
use-after-free the `ptr` because when drop exits, it becomes inacessible.
use-after-free the `ptr` because when drop exits, it becomes inaccessible.
However this wouldn't work:

View file

@ -195,7 +195,7 @@ println!("{}", x);
The problem here is is bit more subtle and interesting. We want Rust to
reject this program for the following reason: We have a live shared reference `x`
to a descendent of `data` when we try to take a mutable reference to `data`
to a descendant of `data` when we try to take a mutable reference to `data`
to `push`. This would create an aliased mutable reference, which would
violate the *second* rule of references.

View file

@ -419,7 +419,7 @@ The two values of the boolean type are written `true` and `false`.
### Symbols
Symbols are a general class of printable [tokens](#tokens) that play structural
roles in a variety of grammar productions. They are catalogued here for
roles in a variety of grammar productions. They are cataloged here for
completeness as the set of remaining miscellaneous printable tokens that do not
otherwise appear as [unary operators](#unary-operator-expressions), [binary
operators](#binary-operator-expressions), or [keywords][keywords].

View file

@ -45,7 +45,7 @@ Now, lets imagine this sequence of events:
6. ... ? All the forks are taken, but nobody can eat!
There are different ways to solve this problem. Well get to our solution in
the tutorial itself. For now, lets get started modelling the problem itself.
the tutorial itself. For now, lets get started modeling the problem itself.
Well start with the philosophers:
```rust