From be526ee960e254b3948d387735ff8ab33c8dbd4d Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sat, 8 Dec 2018 02:37:10 -0800
Subject: [PATCH 1/2] Swith to released bootstrap compiler

Also update the Cargo submodule to the 1.32 branch at the same time for
a few beta fixes.
---
 src/stage0.txt  | 4 ++--
 src/tools/cargo | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/stage0.txt b/src/stage0.txt
index 18c92c2502ee7..b0ef7b6d0446d 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -12,7 +12,7 @@
 # source tarball for a stable release you'll likely see `1.x.0` for rustc and
 # `0.x.0` for Cargo where they were released on `date`.
 
-date: 2018-12-03
+date: 2018-12-06
 rustc: 1.31.0
 cargo: 0.32.0
 
@@ -34,4 +34,4 @@ cargo: 0.32.0
 # looking at a beta source tarball and it's uncommented we'll shortly comment it
 # out.
 
-dev: 1
+#dev: 1
diff --git a/src/tools/cargo b/src/tools/cargo
index 5e85ba14aaa20..1b6702f22a0dd 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 5e85ba14aaa20f8133863373404cb0af69eeef2c
+Subproject commit 1b6702f22a0dd54847684f29acd6617dd31a8479

From 3cd32d9d0a2b66421b758e5bac9558d78c22c272 Mon Sep 17 00:00:00 2001
From: Steve Klabnik <steve@steveklabnik.com>
Date: Tue, 4 Dec 2018 16:47:46 -0500
Subject: [PATCH 2/2] build the edition guide

and update it so that links are correct
---
 src/bootstrap/builder.rs | 3 ++-
 src/doc/edition-guide    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 079fdee7e8626..98005f9396104 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -442,7 +442,8 @@ impl<'a> Builder<'a> {
                 doc::RustdocBook,
                 doc::RustByExample,
                 doc::RustcBook,
-                doc::CargoBook
+                doc::CargoBook,
+                doc::EditionGuide,
             ),
             Kind::Dist => describe!(
                 dist::Docs,
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
index 850ea159d0fcf..419edb885ec1a 160000
--- a/src/doc/edition-guide
+++ b/src/doc/edition-guide
@@ -1 +1 @@
-Subproject commit 850ea159d0fcf44dfbff16148faf9b5162481f89
+Subproject commit 419edb885ec1a98c0747b3907003d79e3e6b93a9