auto merge of #10825 : octurion/rust/master, r=alexcrichton

Author: bors

src/libstd/num/int_macros.rs

@@ -270,7 +270,7 @@ impl Integer for $T {
         }
     }
 
-    /// Calculates `div` (`\`) and `rem` (`%`) simultaneously
+    /// Calculates `div` (`/`) and `rem` (`%`) simultaneously
     #[inline]
     fn div_rem(&self, other: &$T) -> ($T,$T) {
         (*self / *other, *self % *other)

src/libstd/num/uint_macros.rs

@@ -123,7 +123,7 @@ impl Neg<$T> for $T {
 impl Unsigned for $T {}
 
 impl Integer for $T {
-    /// Calculates `div` (`\`) and `rem` (`%`) simultaneously
+    /// Calculates `div` (`/`) and `rem` (`%`) simultaneously
     #[inline]
     fn div_rem(&self, other: &$T) -> ($T,$T) {
         (*self / *other, *self % *other)