auto merge of #16621 : tshepang/rust/grammar, r=steveklabnik

This commit is contained in:
bors 2014-08-20 13:55:52 +00:00
commit 655600b01b
3 changed files with 4 additions and 4 deletions

View File

@ -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.

View File

@ -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]
@ -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).
>

View File

@ -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