Merge branch 'master' into web/10614-temporary-terminology

Conflicts:
	wiki/src/install/inc/stylesheets/assistant.css

wiki/src/install/inc/steps/bittorrent_verification.inline.html

-<p>You can download the Torrent file from this link protected by HTTPS.
-Your BitTorrent client verifies your download automatically based on a
+<p>Your BitTorrent client verifies your download automatically based on a
 cryptographic checksum in the Torrent file.</p>

wiki/src/install/inc/steps/download.inline.html

@@ -92,14 +92,12 @@ two techniques to do this verification automatically.
     <div id="install">
       <p>We detected that you are running Firefox or Tor Browser.</p>
       <p>You can download the ISO image via our Firefox add-on. The add-on
-      verifies your download automatically.
-      [[!toggle id="extension-verification" text="How?"]]</p>
+      verifies your download [[!toggle id="extension-verification" text="automatically"]].</p>
 
       [[!toggleable id="extension-verification" text="""
-      [[!toggle id="extension-verification" text="Close"]]
+      [[!toggle id="extension-verification" text="X"]]
 
-      <p>The add-on verifies your download automatically based on a cryptography
-      checksum downloaded from our website.</p>
+      <p>The verification is based on a cryptographic checksum downloaded from our website.</p>
       """]]
 
       <a id="install-button" href="https://addons.mozilla.org/firefox/downloads/latest-beta/673020/addon-673020-latest.xpi" class="btn btn-lg btn-primary clearfix">
@@ -118,7 +116,7 @@ two techniques to do this verification automatically.
     <p id="bittorrent-minor">or [[!toggle id="bittorrent-verification" text="Download and verify via BitTorrent"]]</p>
 
     [[!toggleable id="bittorrent-verification" text="""
-    [[!toggle id="bittorrent-verification" text="Close"]]
+    [[!toggle id="bittorrent-verification" text="X"]]
 
     [[!inline pages="install/inc/steps/bittorrent_verification.inline" raw="yes"]]
 

wiki/src/install/inc/stylesheets/assistant.css

@@ -101,6 +101,7 @@ h1 {
 
 h1 strong {
   font-weight: 800;
+  -webkit-box-shadow: 0px -10px #0A0 inset;
   box-shadow: 0px -10px #0A0 inset;
 }
 
@@ -211,3 +212,30 @@ ul {
 .upgrade, .upgrade-clone, .upgrade-tails {
   display: none;
 }
+
+/* TOGGLE */
+
+#pagebody div.toggleable {
+  background: white !important;
+  border: 1px solid #0A0;
+  -webkit-box-shadow: 5px 5px #0A0;
+  box-shadow: 5px 5px #0A0;
+  padding: 10px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: -15px;
+  width: 80%;
+}
+
+#pagebody #content a.toggle  {
+  border-bottom: 1px dashed black !important;
+  cursor: help;
+  display: inline-block;
+  text-decoration: none !important;
+}
+
+#pagebody #content div.toggleable a.toggle {
+  border: none !important;
+  cursor: pointer;
+  float: right;
+}