Rollup merge of #23804 - dnwade:patch-1, r=Manishearth

Manishearth · Manishearth · commit 95f4061c499f · 2015-03-28T18:12:06.000+05:30
r? @steveklabnik
diff --git a/src/doc/trpl/traits.md b/src/doc/trpl/traits.md
@@ -479,7 +479,7 @@ impl Foo for OverrideDefault {
 }
 
 let default = UseDefault;
-default.baz(); // prints "We called bar."
+default.baz(); // prints "We called baz."
 
 let over = OverrideDefault;
 over.baz(); // prints "Override baz!"

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ impl Foo for OverrideDefault {`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`let default = UseDefault;`
`482`		`-default.baz(); // prints "We called bar."`
	`482`	`+default.baz(); // prints "We called baz."`
`483`	`483`
`484`	`484`	`let over = OverrideDefault;`
`485`	`485`	`over.baz(); // prints "Override baz!"`