---

yaml
---
r: 225974
b: refs/heads/stable
c: 00e115d
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 98205afe0b09b22e9d88968ed61095b15fcfb1e3
+refs/heads/stable: 00e115d090180c9fe13856500576978ff3007cda
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/src/librustc_typeck/diagnostics.rs

@@ -212,8 +212,8 @@ http://doc.rust-lang.org/reference.html#trait-objects
 "##,
 
 E0036: r##"
-This error occurred when you pass too many or not enough type parameters to a
-method. Example:
+This error occurrs when you pass too many or not enough type parameters to
+a method. Example:
 
 ```
 struct Test;