auto merge of #19705 : brson/rust/fix-install, r=alexcrichton

rust-lang · Dec 10, 2014 · c38e73f · c38e73f
2 parents bc486dc + 65bca02
commit c38e73f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/mk/dist.mk b/mk/dist.mk
@@ -48,7 +48,6 @@ PKG_FILES := \
     $(S)configure $(S)Makefile.in              \
     $(S)man                                    \
     $(addprefix $(S)src/,                      \
-      README.md                                \
       compiletest                              \
       doc                                      \
       driver                                   \

diff --git a/src/librand/chacha.rs b/src/librand/chacha.rs
@@ -117,7 +117,7 @@ impl ChaChaRng {
     /// security proof for a more involved example of this.
     ///
     /// The modified word layout is:
-    /// ```ignore
+    /// ```text
     /// constant constant constant constant
     /// key      key      key      key
     /// key      key      key      key

diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs
@@ -120,7 +120,7 @@
 //!
 //! The compiler accepts a flag of this form a number of times:
 //!
-//! ```ignore
+//! ```text
 //! --extern crate-name=path/to/the/crate.rlib
 //! ```
 //!
@@ -152,7 +152,7 @@
 //!
 //! and the compiler would be invoked as:
 //!
-//! ```ignore
+//! ```text
 //! rustc a.rs --extern b1=path/to/libb1.rlib --extern b2=path/to/libb2.rlib
 //! ```
 //!
@@ -178,7 +178,7 @@
 //! dependencies, not the upstream transitive dependencies. Consider this
 //! dependency graph:
 //!
-//! ```ignore
+//! ```text
 //! A.1   A.2
 //! |     |
 //! |     |