Rollup merge of #25865 - azerupi:patch-2, r=alexcrichton

steveklabnik · steveklabnik · commit 6da2a76b979c · 2015-05-28T20:17:26.000-04:00
"workd" corrected to "world"
diff --git a/src/doc/trpl/traits.md b/src/doc/trpl/traits.md
@@ -285,7 +285,7 @@ fn bar<T, K>(x: T, y: K) where T: Clone, K: Clone + Debug {
 
 fn main() {
     foo("Hello", "world");
-    bar("Hello", "workd");
+    bar("Hello", "world");
 }
 ```
 

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ fn bar<T, K>(x: T, y: K) where T: Clone, K: Clone + Debug {`
`285`	`285`
`286`	`286`	`fn main() {`
`287`	`287`	`foo("Hello", "world");`
`288`		`- bar("Hello", "workd");`
	`288`	`+ bar("Hello", "world");`
`289`	`289`	`}`
`290`	`290`	```
`291`	`291`