Skip to content

doc: fixing typos #28945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/doc/grammar.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion src/doc/nomicon/concurrency.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/doc/nomicon/destructors.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion src/doc/nomicon/lifetimes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion src/doc/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down
2 changes: 1 addition & 1 deletion src/doc/trpl/dining-philosophers.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Now, let’s imagine this sequence of events:
6. ... ? All the forks are taken, but nobody can eat!

There are different ways to solve this problem. We’ll get to our solution in
the tutorial itself. For now, let’s get started modelling the problem itself.
the tutorial itself. For now, let’s get started modeling the problem itself.
We’ll start with the philosophers:

```rust
Expand Down