Merge branch 'rust-lang:master' into zh

src/conversion/from_into.md

@@ -69,7 +69,7 @@ fn main() {
 }
 ```
 
-## `From` and `Into` are interchangable
+## `From` and `Into` are interchangeable
 
 `From` and `Into` are designed to be complementary.
 We do not need to provide an implementation for both traits.

src/custom_types/structs.md

@@ -47,15 +47,15 @@ fn main() {
     println!("{:?}", peter);
 
     // Instantiate a `Point`
-    let point: Point = Point { x: 10.3, y: 0.4 };
-    let another_point: Point = Point { x: 5.2, y: 0.2 };
+    let point: Point = Point { x: 5.2, y: 0.4 };
+    let another_point: Point = Point { x: 10.3, y: 0.2 };
 
     // Access the fields of the point
     println!("point coordinates: ({}, {})", point.x, point.y);
 
     // Make a new point by using struct update syntax to use the fields of our
     // other one
-    let bottom_right = Point { x: 5.2, ..another_point };
+    let bottom_right = Point { x: 10.3, ..another_point };
 
     // `bottom_right.y` will be the same as `another_point.y` because we used that field
     // from `another_point`