Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache

1 files changed, 3 insertions, 3 deletions

diff --git a/docs/base-css.html b/docs/base-css.html
index 7fe561b97..4a3e8459a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -190,7 +190,7 @@
 
 
           <h2 id="abbreviations">Abbreviations</h2>
-          <p>Stylized implemenation of HTML's <code>&lt;abbr&gt;</code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.</p>
+          <p>Stylized implementation of HTML's <code>&lt;abbr&gt;</code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.</p>
 
           <h3><code>&lt;abbr&gt;</code></h3>
           <p>For expanded text on long hover of an abbreviation, include the <code>title</code> attribute.</p>
@@ -224,7 +224,7 @@
             </address>
             <address>
               <strong>Full Name</strong><br>
-              <a href="mailto:#">[email protected]</a>
+              <a href="mailto:#">[email protected]</a>
             </address>
           </div>
 <pre class="prettyprint linenums">
@@ -237,7 +237,7 @@
 
 &lt;address&gt;
   &lt;strong&gt;Full Name&lt;/strong&gt;&lt;br&gt;
-  &lt;a href="mailto:#"&gt;[email protected]&lt;/a&gt;
+  &lt;a href="mailto:#"&gt;[email protected]&lt;/a&gt;
 &lt;/address&gt;
 </pre>