about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-14 13:42:59 +0000
committerbors <bors@rust-lang.org>2016-01-14 13:42:59 +0000
commit02fbf31fb26e0b5eccf34cef8a5f8becef6f3ada (patch)
tree554d5d05b0c5f4baee9180cdec5fffd98c10239b /src/doc
parent5b3a75fe560362b812f2c4947d449558a9472496 (diff)
parenta964c86d45577f089507a8ecf3e1dc6486166ac2 (diff)
downloadrust-02fbf31fb26e0b5eccf34cef8a5f8becef6f3ada.tar.gz
rust-02fbf31fb26e0b5eccf34cef8a5f8becef6f3ada.zip
Auto merge of #30897 - Manishearth:rollup, r=Manishearth
- Successful merges: #30821, #30869, #30871, #30874, #30879, #30886, #30892
- Failed merges: #30864
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/book/bibliography.md2
-rw-r--r--src/doc/book/unsafe.md4
-rw-r--r--src/doc/reference.md16
3 files changed, 11 insertions, 11 deletions
diff --git a/src/doc/book/bibliography.md b/src/doc/book/bibliography.md
index ba02053b6b8..d32b1a91944 100644
--- a/src/doc/book/bibliography.md
+++ b/src/doc/book/bibliography.md
@@ -33,7 +33,7 @@ Rust, as well as publications about Rust.
 * [Non-blocking steal-half work queues](http://www.cs.bgu.ac.il/%7Ehendlerd/papers/p280-hendler.pdf)
 * [Reagents: expressing and composing fine-grained concurrency](http://www.mpi-sws.org/~turon/reagents.pdf)
 * [Algorithms for scalable synchronization of shared-memory multiprocessors](https://www.cs.rochester.edu/u/scott/papers/1991_TOCS_synch.pdf)
-* [Epoc-based reclamation](https://www.cl.cam.ac.uk/techreports/UCAM-CL-TR-579.pdf).
+* [Epoch-based reclamation](https://www.cl.cam.ac.uk/techreports/UCAM-CL-TR-579.pdf).
 
 ### Others
 
diff --git a/src/doc/book/unsafe.md b/src/doc/book/unsafe.md
index eb464986af3..ecd196a9f0d 100644
--- a/src/doc/book/unsafe.md
+++ b/src/doc/book/unsafe.md
@@ -41,8 +41,8 @@ unsafe impl Scary for i32 {}
 ```
 
 It’s important to be able to explicitly delineate code that may have bugs that
-cause big problems. If a Rust program segfaults, you can be sure it’s somewhere
-in the sections marked `unsafe`.
+cause big problems. If a Rust program segfaults, you can be sure the cause is
+related to something marked `unsafe`.
 
 # What does ‘safe’ mean?
 
diff --git a/src/doc/reference.md b/src/doc/reference.md
index 5f71ee44379..87104b4526f 100644
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -3677,10 +3677,10 @@ sites are:
 
 * `let` statements where an explicit type is given.
 
-   For example, `128` is coerced to have type `i8` in the following:
+   For example, `42` is coerced to have type `i8` in the following:
 
    ```rust
-   let _: i8 = 128;
+   let _: i8 = 42;
    ```
 
 * `static` and `const` statements (similar to `let` statements).
@@ -3690,36 +3690,36 @@ sites are:
   The value being coerced is the actual parameter, and it is coerced to
   the type of the formal parameter.
 
-  For example, `128` is coerced to have type `i8` in the following:
+  For example, `42` is coerced to have type `i8` in the following:
 
   ```rust
   fn bar(_: i8) { }
 
   fn main() {
-      bar(128);
+      bar(42);
   }
   ```
 
 * Instantiations of struct or variant fields
 
-  For example, `128` is coerced to have type `i8` in the following:
+  For example, `42` is coerced to have type `i8` in the following:
 
   ```rust
   struct Foo { x: i8 }
 
   fn main() {
-      Foo { x: 128 };
+      Foo { x: 42 };
   }
   ```
 
 * Function results, either the final line of a block if it is not
   semicolon-terminated or any expression in a `return` statement
 
-  For example, `128` is coerced to have type `i8` in the following:
+  For example, `42` is coerced to have type `i8` in the following:
 
   ```rust
   fn foo() -> i8 {
-      128
+      42
   }
   ```