From e8bc621f48257d9cde1d7c4ce80c4190220c169a Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 10 Dec 2014 08:50:50 -0800
Subject: [PATCH 1/2] rustc: Fix `make install`

Move a few docblocks from 'ignore' to something that's not rust (e.g. 'text').

Closes #19678
---
 src/librand/chacha.rs           | 2 +-
 src/librustc/metadata/loader.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/librand/chacha.rs b/src/librand/chacha.rs
index ad5884c16c5c1..5cbc5a0a61cc4 100644
--- 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
index 77c0a8abe6466..e364bd8e752d5 100644
--- 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
 //! |     |
 //! |     |

From 65bca024a7f6f7c3b40d8c9315657f2639262939 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 10 Dec 2014 09:47:36 -0800
Subject: [PATCH 2/2] Don't try to dist src/README.md which does not exist

---
 mk/dist.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index 0b9cd86c61fe4..00f6e8617391d 100644
--- 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                                   \