Skip to content

Commit 1302187

Browse files
committed
Auto merge of #28945 - shama:doc-typos, r=steveklabnik
Just a few typos found in the docs. Thanks!
2 parents e3cd872 + a6aa645 commit 1302187

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

src/doc/grammar.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ symbol : "::" | "->"
259259
```
260260

261261
Symbols are a general class of printable [tokens](#tokens) that play structural
262-
roles in a variety of grammar productions. They are catalogued here for
262+
roles in a variety of grammar productions. They are cataloged here for
263263
completeness as the set of remaining miscellaneous printable tokens that do not
264264
otherwise appear as [unary operators](#unary-operator-expressions), [binary
265265
operators](#binary-operator-expressions), or [keywords](#keywords).

src/doc/nomicon/concurrency.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Concurrency and Paralellism
1+
% Concurrency and Parallelism
22

33
Rust as a language doesn't *really* have an opinion on how to do concurrency or
44
parallelism. The standard library exposes OS threads and blocking sys-calls

src/doc/nomicon/destructors.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl<T> Drop for Box<T> {
5353

5454
and this works fine because when Rust goes to drop the `ptr` field it just sees
5555
a [Unique] that has no actual `Drop` implementation. Similarly nothing can
56-
use-after-free the `ptr` because when drop exits, it becomes inacessible.
56+
use-after-free the `ptr` because when drop exits, it becomes inaccessible.
5757

5858
However this wouldn't work:
5959

src/doc/nomicon/lifetimes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ println!("{}", x);
195195

196196
The problem here is is bit more subtle and interesting. We want Rust to
197197
reject this program for the following reason: We have a live shared reference `x`
198-
to a descendent of `data` when we try to take a mutable reference to `data`
198+
to a descendant of `data` when we try to take a mutable reference to `data`
199199
to `push`. This would create an aliased mutable reference, which would
200200
violate the *second* rule of references.
201201

src/doc/reference.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ The two values of the boolean type are written `true` and `false`.
419419
### Symbols
420420

421421
Symbols are a general class of printable [tokens](#tokens) that play structural
422-
roles in a variety of grammar productions. They are catalogued here for
422+
roles in a variety of grammar productions. They are cataloged here for
423423
completeness as the set of remaining miscellaneous printable tokens that do not
424424
otherwise appear as [unary operators](#unary-operator-expressions), [binary
425425
operators](#binary-operator-expressions), or [keywords][keywords].

src/doc/trpl/dining-philosophers.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Now, let’s imagine this sequence of events:
4545
6. ... ? All the forks are taken, but nobody can eat!
4646

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

5151
```rust

0 commit comments

Comments
 (0)