about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-10-19 17:41:49 -0700
committerGitHub <noreply@github.com>2016-10-19 17:41:49 -0700
commitdfd98ebd3e862d6fe23519fc6605d03a1c146914 (patch)
treec55534ab1c084f6aa36529c6b28c316c4f79e35f /src/doc
parentd337f345ca8b3bb4aac988ace1c0676abc5310a0 (diff)
parentdd3a014ed9e61ba9d2f86e00ef299edf285e276c (diff)
downloadrust-dfd98ebd3e862d6fe23519fc6605d03a1c146914.tar.gz
rust-dfd98ebd3e862d6fe23519fc6605d03a1c146914.zip
Auto merge of #37289 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 7 pull requests

- Successful merges: #37165, #37187, #37241, #37283, #37285, #37287, #37288
- Failed merges:
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/book/testing.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/book/testing.md b/src/doc/book/testing.md
index 86729147ed0..3bdf1b7b7f2 100644
--- a/src/doc/book/testing.md
+++ b/src/doc/book/testing.md
@@ -380,9 +380,9 @@ the `tests` directory.
 
 # The `tests` directory
 
-Each file in `tests/*.rs` directory is treated as individual crate.
-So, to write an integration test, let's make a `tests` directory, and
-put a `tests/integration_test.rs` file inside, with this as its contents:
+Each file in `tests/*.rs` directory is treated as an individual crate.
+To write an integration test, let's make a `tests` directory and
+put a `tests/integration_test.rs` file inside with this as its contents:
 
 ```rust,ignore
 extern crate adder;