Skip to content

Commit

Permalink
auto merge of #989 : jbcrail/cargo/fix-doc-spelling, r=steveklabnik
Browse files Browse the repository at this point in the history
I just made minor corrections.
  • Loading branch information
bors committed Dec 6, 2014
2 parents 70f5205 + 817e308 commit 5d9098f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions src/doc/build-script.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Some example use cases of the build command are:
* Building a bundled C library.
* Finding a C library on the host system.
* Generating a Rust module from a specification.
* Performing any platform-specific configuration neeeded for the crate.
* Performing any platform-specific configuration needed for the crate.

Each of these use cases will be detailed in full below to give examples of how
the build command works.
Expand Down Expand Up @@ -203,7 +203,7 @@ authors = ["you@example.com"]
build = "build.rs"
```

Here we can se we've got a build script specified which we'll use to generate
Here we can see we've got a build script specified which we'll use to generate
some code. Let's see what's inside the build script:

```rust,no_run
Expand All @@ -225,10 +225,10 @@ fn main() {

There's a couple of points of note here:

* The script uses the `OUT_DIR` environment variable to discover where the ouput
files should be located. It can use the process's current working directory to
find where the input files should be located, but in this case we don't have
any input files.
* The script uses the `OUT_DIR` environment variable to discover where the
output files should be located. It can use the process's current working
directory to find where the input files should be located, but in this case we
don't have any input files.
* This script is relatively simple as it just writes out a small generated file.
One could imagine that other more fanciful operations could take place such as
generating a Rust module from a C header file or another language definition,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ rev = "bf739419e2d31050615c1ba1a395b474269a4"

Now, our builds will be the same. But, there's a big drawback: now we have to
manually think about SHA-1s every time we want to update our library. This is
both tedius and error prone.
both tedious and error prone.

Enter the `Cargo.lock`. Because of its existence, we don't need to manually
keep track of the exact revisions: Cargo will do it for us. When we have a
Expand Down
2 changes: 1 addition & 1 deletion src/doc/pkgid-spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ registry at `crates.io`

## Brevity of Specifications

The goal of this is to enable both succinct and exhausitive syntaxes for
The goal of this is to enable both succinct and exhaustive syntaxes for
referring to packages in a dependency graph. Ambiguous references may refer to
one or more packages. Most commands generate an error if more than one package
could be referred to with the same specification.

0 comments on commit 5d9098f

Please sign in to comment.