Auto merge of rust-lang#27853 - seckar:master, r=steveklabnik

alexcrichton · Aug 16, 2015 · bef7d90 · bef7d90
2 parents 9165a4e + ab45e51
commit bef7d90
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/librustc_unicode/char.rs b/src/librustc_unicode/char.rs
@@ -476,7 +476,7 @@ impl char {
     /// it maps one Unicode character to its uppercase equivalent
     /// according to the Unicode database [1]
     /// and the additional complex mappings [`SpecialCasing.txt`].
-    /// Conditional mappings (based on context or language) are not considerd here.
+    /// Conditional mappings (based on context or language) are not considered here.
     ///
     /// A full reference can be found here [2].
     ///