Merge branch 'master' into text-emphasis-variant

6 files changed, 21 insertions, 11 deletions

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 0b4429d72..89fb39dec 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -131,7 +131,7 @@
   <div class="bs-customizer-input">
     <label for="input-@line-height-computed">@line-height-computed</label>
     <input id="input-@line-height-computed" type="text" value="floor((@font-size-base * @line-height-base))" data-var="@line-height-computed" class="form-control"/>
-    <p class="help-block">Computed &quot;line-height&quot; (<code>font-size</code> &amp;times; <code>line-height</code>) for use with <code>margin</code>, <code>padding</code>, etc.</p>
+    <p class="help-block">Computed &quot;line-height&quot; (<code>font-size</code> * <code>line-height</code>) for use with <code>margin</code>, <code>padding</code>, etc.</p>
   </div>
   <div class="bs-customizer-input">
     <label for="input-@headings-font-family">@headings-font-family</label>
@@ -1117,7 +1117,7 @@
   <div class="bs-customizer-input">
     <label for="input-@modal-content-fallback-border-color">@modal-content-fallback-border-color</label>
     <input id="input-@modal-content-fallback-border-color" type="text" value="#999" data-var="@modal-content-fallback-border-color" class="form-control"/>
-    <p class="help-block">Modal content border color &lt;strong&gt;for IE8&lt;/strong&gt;</p>
+    <p class="help-block">Modal content border color <strong>for IE8</strong></p>
   </div>
   <div class="bs-customizer-input">
     <label for="input-@modal-backdrop-bg">@modal-backdrop-bg</label>
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 99aed2273..341dc3410 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -21,6 +21,10 @@
       <li><a href="{{ site.expo }}">Expo</a></li>
       <li>&middot;</li>
       <li><a href="{{ site.blog }}">Blog</a></li>
+      <li>&middot;</li>
+      <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
+      <li>&middot;</li>
+      <li><a href="{{ site.repo }}/releases">Releases</a></li>
     </ul>
   </div>
 </footer>
diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html
index 4f5d031db..409f18136 100644
--- a/docs/_includes/nav-css.html
+++ b/docs/_includes/nav-css.html
@@ -23,7 +23,7 @@
     <li><a href="#grid-offsetting">Offsetting columns</a></li>
     <li><a href="#grid-nesting">Nesting columns</a></li>
     <li><a href="#grid-column-ordering">Column ordering</a></li>
-    <li><a href="#grid-less">LESS mixins and variables</a></li>
+    <li><a href="#grid-less">Less mixins and variables</a></li>
   </ul>
 </li>
 <li>
diff --git a/docs/_includes/nav-customize.html b/docs/_includes/nav-customize.html
index 661a2607e..363a5db8b 100644
--- a/docs/_includes/nav-customize.html
+++ b/docs/_includes/nav-customize.html
@@ -1,11 +1,11 @@
 <li>
-  <a href="#less">LESS components</a>
+  <a href="#less">Less components</a>
 </li>
 <li>
   <a href="#plugins">jQuery plugins</a>
 </li>
 <li>
-  <a href="#less-variables">LESS variables</a>
+  <a href="#less-variables">Less variables</a>
   <ul class="nav">
     <li><a href="#variables-basics">Basics</a></li>
     <li><a href="#variables-buttons">Buttons</a></li>
diff --git a/docs/_includes/nav-getting-started.html b/docs/_includes/nav-getting-started.html
index 77419b65c..0ec76e749 100644
--- a/docs/_includes/nav-getting-started.html
+++ b/docs/_includes/nav-getting-started.html
@@ -28,12 +28,6 @@
 </li>
 <li>
   <a href="#migration">Migrating from 2.x to 3.0</a>
-  <ul class="nav">
-    <li><a href="#migration-classes">Major class changes</a></li>
-    <li><a href="#migration-new">What's new</a></li>
-    <li><a href="#migration-dropped">What's removed</a></li>
-    <li><a href="#migration-notes">Additional notes</a></li>
-  </ul>
 </li>
 <li>
   <a href="#support">Browser and device support</a>
diff --git a/docs/_includes/nav-migration.html b/docs/_includes/nav-migration.html
new file mode 100644
index 000000000..10128a87e
--- /dev/null
+++ b/docs/_includes/nav-migration.html
@@ -0,0 +1,12 @@
+<li>
+  <a href="#classes">Major class changes</a>
+</li>
+<li>
+  <a href="#new">What's new</a>
+</li>
+<li>
+  <a href="#dropped">What's removed</a>
+</li>
+<li>
+  <a href="#notes">Additional notes</a>
+</li>