From b7f8847dde4fa17bdf28702ee6cfcf2a160b69a6 Mon Sep 17 00:00:00 2001
From: steveklabnik <steve@steveklabnik.com>
Date: Wed, 21 Feb 2018 12:09:58 -0500
Subject: [PATCH 1/2] Second edition is now the definitive edition

* Remove warning about draft from second edition
* Add warning about first edition draft being older
* Change overview page to better state today's situation
---
 first-edition/book.toml                   |   3 +
 first-edition/src/theme/first-edition.css |  56 +++++
 first-edition/src/theme/header.hbs        |  27 +++
 index.md                                  |  30 ++-
 second-edition/theme/index.hbs            | 276 ----------------------
 5 files changed, 108 insertions(+), 284 deletions(-)
 create mode 100644 first-edition/src/theme/first-edition.css
 create mode 100644 first-edition/src/theme/header.hbs
 delete mode 100644 second-edition/theme/index.hbs

diff --git a/first-edition/book.toml b/first-edition/book.toml
index 3a3189c4d7..d365a01cfb 100644
--- a/first-edition/book.toml
+++ b/first-edition/book.toml
@@ -1,3 +1,6 @@
 [book]
 title = "The Rust Programming Language"
 author = "The Rust Project Developers"
+
+[output.html]
+additional-css = ["src/theme/first-edition.css"]
diff --git a/first-edition/src/theme/first-edition.css b/first-edition/src/theme/first-edition.css
new file mode 100644
index 0000000000..6ff716b48d
--- /dev/null
+++ b/first-edition/src/theme/first-edition.css
@@ -0,0 +1,56 @@
+.warning {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: rgb(242, 222, 222);
+    border-bottom-color: rgb(238, 211, 215);
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-bottom-style: solid;
+    border-bottom-width: 0.666667px;
+    border-image-outset: 0 0 0 0;
+    border-image-repeat: stretch stretch;
+    border-image-slice: 100% 100% 100% 100%;
+    border-image-source: none;
+    border-image-width: 1 1 1 1;
+    border-left-color: rgb(238, 211, 215);
+    border-left-style: solid;
+    border-left-width: 0.666667px;
+    border-right-color: rgb(238, 211, 215);
+    border-right-style: solid;
+    border-right-width: 0.666667px;
+    border-top-color: rgb(238, 211, 215);
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-top-style: solid;
+    border-top-width: 0.666667px;
+    color: rgb(185, 74, 72);
+    margin-bottom: 0px;
+    margin-left: 0px;
+    margin-right: 0px;
+    margin-top: 30px;
+    padding-bottom: 8px;
+    padding-left: 14px;
+    padding-right: 35px;
+    padding-right: 14px;
+    padding-top: 8px;
+}
+.warning strong {
+    color: rgb(185, 74, 72)
+}
+.warning a {
+    color: rgb(0, 136, 204)
+}
+.warning .message {
+    margin-right: 14px;
+}
+.warning .message:last-child {
+    margin-right: 21px;
+}
+.warning .button {
+    border: none;
+    background: none;
+    color: inherit;
+    cursor: pointer;
+    font-size: 14px;
+}
diff --git a/first-edition/src/theme/header.hbs b/first-edition/src/theme/header.hbs
new file mode 100644
index 0000000000..77a747868a
--- /dev/null
+++ b/first-edition/src/theme/header.hbs
@@ -0,0 +1,27 @@
+<div id="draft-warning" class="warning">
+    <span class="message">You are reading an <strong>outdated</strong> edition of TRPL. For more, go <a href="../index.html">here</a>.</span>
+    <button type="button" id="hide-draft-warning" title="Hide draft warning" class="button">
+        <i class="fa fa-times"></i>
+    </button>
+</div>
+<!-- Hide / unhide warning before it is displayed -->
+<script type="text/javascript">
+var warning = localStorage.getItem('trpl-first-edition-draft-warning');
+
+if (warning === 'hidden') {
+    Array
+    .from(document.querySelectorAll('#page-wrapper'))
+    .forEach(function(block) { block.classList.remove('has-warning'); });
+    var elem = document.getElementById("draft-warning");
+    elem.parentNode.removeChild(elem);
+}
+
+document.addEventListener("DOMContentLoaded", function(event) { 
+    document.getElementById("hide-draft-warning").addEventListener("click", function(e) {
+        var elem = document.getElementById("draft-warning");
+        elem.parentNode.removeChild(elem);
+
+        localStorage.setItem('trpl-first-edition-draft-warning', 'hidden');
+    });
+});
+</script>
diff --git a/index.md b/index.md
index 634f78c758..a06b837a3a 100644
--- a/index.md
+++ b/index.md
@@ -1,11 +1,25 @@
-% The Rust Programming Language
+# The Rust Programming Language
 
-There are two editions of "The Rust Programming Language":
+The current edition of "The Rust Programming Language" is the second
+edition, which you can [read here](second-edition/index.html).
 
-* [First edition](first-edition/index.html)
-* [Second edition](second-edition/index.html)
+The source for all editions lives [on GitHub](https://github.com/rust-lang/book).
+Please open issues with any questions, concerns, or tweaks.
 
-The second edition is a complete re-write. It is still under construction,
-though it is far enough along to learn most of Rust. We suggest reading the
-second edition and then checking out the first edition later to pick up some of
-the more esoteric parts of the language.
+## Notes
+
+The second edition is still receiving some minor edits, but is effectively
+complete. It will be [available in dead-tree form through NoStarch
+Press](https://nostarch.com/Rust) once these final edits are complete.
+
+The second edition is a complete re-write of TRPL, from the ground up,
+and is therefore very different from the first edition.
+
+## Other editions
+
+We keep older editions of TRPL online for history's sake. 
+
+### First Edition
+
+YOu can [read the first edition of "The Rust Programming Language"
+here](first-edition/index.html).
diff --git a/second-edition/theme/index.hbs b/second-edition/theme/index.hbs
deleted file mode 100644
index bb06bf7476..0000000000
--- a/second-edition/theme/index.hbs
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="{{ language }}">
-    <head>
-        <meta charset="UTF-8">
-        <title>{{ title }}</title>
-        <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-        <meta name="description" content="{{ description }}">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <base href="{{ path_to_root }}">
-
-        <link rel="stylesheet" href="book.css">
-        <link href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
-        <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500" rel="stylesheet" type="text/css">
-
-        <link rel="shortcut icon" href="{{ favicon }}">
-
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-
-        <link rel="stylesheet" href="highlight.css">
-        <link rel="stylesheet" href="tomorrow-night.css">
-        <link rel="stylesheet" href="ayu-highlight.css">
-
-        <!-- Custom theme -->
-        {{#each additional_css}}
-        <link rel="stylesheet" href="{{this}}">
-        {{/each}}
-
-        <style>
-            .page-wrapper.has-warning > .nav-chapters {
-              /* add height for warning content & margin */
-              top: 120px;
-            }
-
-            .warning {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                background-color: rgb(242, 222, 222);
-                border-bottom-color: rgb(238, 211, 215);
-                border-bottom-left-radius: 4px;
-                border-bottom-right-radius: 4px;
-                border-bottom-style: solid;
-                border-bottom-width: 0.666667px;
-                border-image-outset: 0 0 0 0;
-                border-image-repeat: stretch stretch;
-                border-image-slice: 100% 100% 100% 100%;
-                border-image-source: none;
-                border-image-width: 1 1 1 1;
-                border-left-color: rgb(238, 211, 215);
-                border-left-style: solid;
-                border-left-width: 0.666667px;
-                border-right-color: rgb(238, 211, 215);
-                border-right-style: solid;
-                border-right-width: 0.666667px;
-                border-top-color: rgb(238, 211, 215);
-                border-top-left-radius: 4px;
-                border-top-right-radius: 4px;
-                border-top-style: solid;
-                border-top-width: 0.666667px;
-                color: rgb(185, 74, 72);
-                margin-bottom: 0px;
-                margin-left: 0px;
-                margin-right: 0px;
-                margin-top: 30px;
-                padding-bottom: 8px;
-                padding-left: 14px;
-                padding-right: 14px;
-                padding-top: 8px;
-            }
-            .warning strong {
-                color: rgb(185, 74, 72)
-            }
-            .warning a {
-                color: rgb(0, 136, 204)
-            }
-            .warning .message {
-                margin-right: 14px;
-            }
-            .warning .message:last-child {
-                margin-right: 21px;
-            }
-            .warning .button {
-                border: none;
-                background: none;
-                color: inherit;
-                cursor: pointer;
-                font-size: 14px;
-            }
-
-            a .hljs {
-                color: #4183c4;
-            }
-
-            .rust .content a .hljs,
-            .coal .content a .hljs,
-            .navy .content a .hljs {
-                color: #2b79a2;
-            }
-
-            a:hover .hljs {
-                text-decoration: underline;
-            }
-
-            /* Styles keystrokes such as ctrl-C */
-            .keystroke {
-                font-variant: small-caps;
-            }
-        </style>
-
-        {{#if mathjax_support}}
-        <!-- MathJax -->
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-        {{/if}}
-
-        <!-- Fetch Clipboard.js from CDN but have a local fallback -->
-        <script src="https://cdn.jsdelivr.net/clipboard.js/1.6.1/clipboard.min.js"></script>
-        <script>
-            if (typeof Clipboard == 'undefined') {
-                document.write(unescape("%3Cscript src='clipboard.min.js'%3E%3C/script%3E"));
-            }
-        </script>
-
-        <!-- Fetch JQuery from CDN but have a local fallback -->
-        <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined') {
-                document.write(unescape("%3Cscript src='jquery.js'%3E%3C/script%3E"));
-            }
-        </script>
-
-        <!-- Fetch store.js from local - TODO add CDN when 2.x.x is available on cdnjs -->
-        <script src="store.js"></script>
-
-        <!-- Custom JS script -->
-        {{#each additional_js}}
-        <script type="text/javascript" src="{{this}}"></script>
-        {{/each}}
-
-    </head>
-    <body class="light">
-        <!-- Set the theme before any content is loaded, prevents flash -->
-        <script type="text/javascript">
-            var theme = store.get('mdbook-theme');
-            if (theme === null || theme === undefined) { theme = 'light'; }
-            $('body').removeClass().addClass(theme);
-        </script>
-
-        <!-- Hide / unhide sidebar before it is displayed -->
-        <script type="text/javascript">
-            var sidebar = store.get('mdbook-sidebar');
-            if (sidebar === "hidden") { $("html").addClass("sidebar-hidden") }
-            else if (sidebar === "visible") { $("html").addClass("sidebar-visible") }
-        </script>
-
-        <div id="sidebar" class="sidebar">
-            {{#toc}}{{/toc}}
-        </div>
-
-        <div id="page-wrapper" class="page-wrapper has-warning">
-
-            <div class="page" tabindex="-1">
-                <header>
-                    <div id="draft-warning" class="warning">
-                        <span class="message">You are reading a <strong>draft</strong> of the next edition of TRPL. For more, go <a href="../index.html">here</a>.</span>
-                        <button type="button" id="hide-draft-warning" title="Hide draft warning" class="button">
-                            <i class="fa fa-times"></i>
-                        </button>
-                    </div>
-                    <!-- Hide / unhide warning before it is displayed -->
-                    <script type="text/javascript">
-                        var warning = store.get('mdbook-draft-warning');
-                        if (warning === 'hidden') {
-                            $('#page-wrapper').removeClass('has-warning');
-                            $('#draft-warning').remove();
-                        }
-                        $(document).ready(function() {
-                            $('#hide-draft-warning').click(function(e) {
-                                $('#draft-warning').remove();
-                                store.set('mdbook-draft-warning', 'hidden');
-                            });
-                        });
-                    </script>
-                </header>
-                <div id="menu-bar" class="menu-bar">
-                    <div class="left-buttons">
-                        <i id="sidebar-toggle" class="fa fa-bars"></i>
-                        <i id="theme-toggle" class="fa fa-paint-brush"></i>
-                    </div>
-
-                    <h1 class="menu-title">{{ book_title }}</h1>
-
-                    <div class="right-buttons">
-                        <a href="print.html">
-                            <i id="print-button" class="fa fa-print" title="Print this book"></i>
-                        </a>
-                    </div>
-                </div>
-
-                <div id="content" class="content">
-                    {{{ content }}}
-                </div>
-
-                <!-- Mobile navigation buttons -->
-                {{#previous}}
-                    <a rel="prev" href="{{link}}" class="mobile-nav-chapters previous">
-                        <i class="fa fa-angle-left"></i>
-                    </a>
-                {{/previous}}
-
-                {{#next}}
-                    <a rel="next" href="{{link}}" class="mobile-nav-chapters next">
-                        <i class="fa fa-angle-right"></i>
-                    </a>
-                {{/next}}
-
-            </div>
-
-            {{#previous}}
-                <a href="{{link}}" class="nav-chapters previous" title="You can navigate through the chapters using the arrow keys">
-                    <i class="fa fa-angle-left"></i>
-                </a>
-            {{/previous}}
-
-            {{#next}}
-                <a href="{{link}}" class="nav-chapters next" title="You can navigate through the chapters using the arrow keys">
-                    <i class="fa fa-angle-right"></i>
-                </a>
-            {{/next}}
-
-        </div>
-
-
-        <!-- Local fallback for Font Awesome -->
-        <script>
-            if ($(".fa").css("font-family") !== "FontAwesome") {
-                $('<link rel="stylesheet" type="text/css" href="_FontAwesome/css/font-awesome.css">').prependTo('head');
-            }
-        </script>
-
-        <!-- Livereload script (if served using the cli tool) -->
-        {{{livereload}}}
-
-        {{#if google_analytics}}
-        <script>
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-        ga('create', '{{google_analytics}}', 'auto');
-        ga('send', 'pageview');
-        </script>
-        {{/if}}
-
-        {{#if playpens_editable}}
-        <script src="{{ ace_js }}" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ editor_js }}" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ mode_rust_js }}" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ theme_dawn_js }}" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ theme_tomorrow_night_js }}" type="text/javascript" charset="utf-8"></script>
-        {{/if}}
-
-        {{#if is_print}}
-        <script>
-            $(document).ready(function() {
-                window.print();
-            })
-        </script>
-        {{/if}}
-
-        <script src="highlight.js"></script>
-        <script src="book.js"></script>
-    </body>
-</html>

From ccf4bfe87c8d2f73985d902e11b8abe28003eefd Mon Sep 17 00:00:00 2001
From: "Carol (Nichols || Goulding)" <carol.nichols@gmail.com>
Date: Wed, 21 Feb 2018 13:02:26 -0500
Subject: [PATCH 2/2] Fix typo

---
 index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.md b/index.md
index a06b837a3a..359267d84b 100644
--- a/index.md
+++ b/index.md
@@ -17,9 +17,9 @@ and is therefore very different from the first edition.
 
 ## Other editions
 
-We keep older editions of TRPL online for history's sake. 
+We keep older editions of TRPL online for history's sake.
 
 ### First Edition
 
-YOu can [read the first edition of "The Rust Programming Language"
+You can [read the first edition of "The Rust Programming Language"
 here](first-edition/index.html).