rollup merge of rust-lang#18696 : tshakah/patch-1

alexcrichton · alexcrichton · commit 0047b84a00c2 · 2014-11-06T13:53:26.000-08:00
diff --git a/src/doc/guide.md b/src/doc/guide.md
@@ -1149,7 +1149,7 @@ enum StringResult {
 }
 ```
 Where a `StringResult` is either an `StringOK`, with the result of a computation, or an
-`ErrorReason` with a `String` explaining what caused the computation to fail. This kind of
+`ErrorReason` with a `String` explaining what caused the computation to fail. These kinds of
 `enum`s are actually very useful and are even part of the standard library.
 
 As you can see `enum`s with values are quite a powerful tool for data representation,

Original file line number	Diff line number	Diff line change
`@@ -1149,7 +1149,7 @@ enum StringResult {`
`1149`	`1149`	`}`
`1150`	`1150`	```
`1151`	`1151`	Where a `StringResult` is either an `StringOK`, with the result of a computation, or an
`1152`		-`ErrorReason` with a `String` explaining what caused the computation to fail. This kind of
	`1152`	+`ErrorReason` with a `String` explaining what caused the computation to fail. These kinds of
`1153`	`1153`	`enum`s are actually very useful and are even part of the standard library.
`1154`	`1154`
`1155`	`1155`	As you can see `enum`s with values are quite a powerful tool for data representation,