Skip to content

Commit

Permalink
doc: grammar fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
tshepang committed Aug 19, 2014
1 parent 51b901e commit 1f1620e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/doc/complement-design-faq.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
% The Rust Design FAQ

This document describes decisions were arrived at after lengthy discussion and
This document describes decisions that were arrived at after lengthy discussion and
experimenting with alternatives. Please do not propose reversing them unless
you have a new, extremely compelling argument. Note that this document
specifically talks about the *language* and not any library or implementation.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/guide-unsafe.md
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ possible in two ways: the `#[start]` attribute, or overriding the
default shim for the C `main` function with your own.

The function marked `#[start]` is passed the command line parameters
in the same format as a C:
in the same format as C:

```
#![no_std]
Expand Down Expand Up @@ -593,7 +593,7 @@ standard library itself.
# Interacting with the compiler internals

> **Note**: this section is specific to the `rustc` compiler; these
> parts of the language may never be full specified and so details may
> parts of the language may never be fully specified and so details may
> differ wildly between implementations (and even versions of `rustc`
> itself).
>
Expand Down
2 changes: 1 addition & 1 deletion src/libserialize/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ fn main() {
## Using the `ToJson` trait
The examples above use the `ToJson` trait to generate the JSON string, which required
The examples above use the `ToJson` trait to generate the JSON string, which is required
for custom mappings.
### Simple example of `ToJson` usage
Expand Down

5 comments on commit 1f1620e

@bors
Copy link
Contributor

@bors bors commented on 1f1620e Aug 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from steveklabnik
at tshepang@1f1620e

@bors
Copy link
Contributor

@bors bors commented on 1f1620e Aug 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging tshepang/rust/grammar = 1f1620e into auto

@bors
Copy link
Contributor

@bors bors commented on 1f1620e Aug 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tshepang/rust/grammar = 1f1620e merged ok, testing candidate = 655600b

@bors
Copy link
Contributor

@bors bors commented on 1f1620e Aug 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 655600b

Please sign in to comment.