Merge branch 'master' into labels-readme

4 files changed, 11 insertions, 10 deletions

diff --git a/docs/_includes/nav/components.html b/docs/_includes/nav/components.html
index bf52d0e59..9c5f5126f 100644
--- a/docs/_includes/nav/components.html
+++ b/docs/_includes/nav/components.html
@@ -10,7 +10,7 @@
   <a href="#dropdowns">Dropdowns</a>
   <ul class="nav">
     <li><a href="#dropdowns-example">Example</a></li>
-    <li><a href="#dropdowns-alignment">Alignment options</a></li>
+    <li><a href="#dropdowns-alignment">Alignment</a></li>
     <li><a href="#dropdowns-headers">Headers</a></li>
     <li><a href="#dropdowns-divider">Divider</a></li>
     <li><a href="#dropdowns-disabled">Disabled menu items</a></li>
@@ -24,7 +24,7 @@
     <li><a href="#btn-groups-sizing">Sizing</a></li>
     <li><a href="#btn-groups-nested">Nesting</a></li>
     <li><a href="#btn-groups-vertical">Vertical variation</a></li>
-    <li><a href="#btn-groups-justified">Justified link variation</a></li>
+    <li><a href="#btn-groups-justified">Justified button groups</a></li>
   </ul>
 </li>
 <li>
@@ -52,7 +52,7 @@
   <ul class="nav">
     <li><a href="#nav-tabs">Tabs</a></li>
     <li><a href="#nav-pills">Pills</a></li>
-    <li><a href="#nav-justified">Justified nav</a></li>
+    <li><a href="#nav-justified">Justified</a></li>
     <li><a href="#nav-disabled-links">Disabled links</a></li>
     <li><a href="#nav-dropdowns">Using dropdowns</a></li>
   </ul>
diff --git a/docs/_includes/nav/css.html b/docs/_includes/nav/css.html
index ac86dffce..fad72a615 100644
--- a/docs/_includes/nav/css.html
+++ b/docs/_includes/nav/css.html
@@ -16,8 +16,8 @@
     <li><a href="#grid-options">Grid options</a></li>
     <li><a href="#grid-example-basic">Ex: Stacked-to-horizontal</a></li>
     <li><a href="#grid-example-fluid">Ex: Fluid container</a></li>
-    <li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li>
-    <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li>
+    <li><a href="#grid-example-mixed">Ex: Mobile and desktop</a></li>
+    <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktop</a></li>
     <li><a href="#grid-example-wrapping">Ex: Column wrapping</a></li>
     <li><a href="#grid-responsive-resets">Responsive column resets</a></li>
     <li><a href="#grid-offsetting">Offsetting columns</a></li>
@@ -43,9 +43,9 @@
 <li>
   <a href="#code">Code</a>
   <ul class="nav">
-    <li><a href="#code-inline">Inline code</a></li>
+    <li><a href="#code-inline">Inline</a></li>
     <li><a href="#code-user-input">User input</a></li>
-    <li><a href="#code-block">Blocks of code</a></li>
+    <li><a href="#code-block">Basic block</a></li>
     <li><a href="#code-variables">Variables</a></li>
     <li><a href="#code-sample-output">Sample output</a></li>
   </ul>
@@ -106,7 +106,7 @@
     <li><a href="#helper-classes-center">Center content blocks</a></li>
     <li><a href="#helper-classes-clearfix">Clearfix</a></li>
     <li><a href="#helper-classes-show-hide">Showing and hiding content</a></li>
-    <li><a href="#helper-classes-screen-readers">Screen reader content</a></li>
+    <li><a href="#helper-classes-screen-readers">Screen reader and keyboard navigation content</a></li>
     <li><a href="#helper-classes-image-replacement">Image replacement</a></li>
   </ul>
 </li>
@@ -131,6 +131,6 @@
   <a href="#sass">Using Sass</a>
   <ul class="nav">
     <li><a href="#sass-contents">What's included</a></li>
-    <li><a href="#sass-installation">Rails install</a></li>
+    <li><a href="#sass-installation">Installation</a></li>
   </ul>
 </li>
diff --git a/docs/_includes/nav/getting-started.html b/docs/_includes/nav/getting-started.html
index d858b2e55..b06dcce9b 100644
--- a/docs/_includes/nav/getting-started.html
+++ b/docs/_includes/nav/getting-started.html
@@ -56,7 +56,7 @@
     <li><a href="#support-safari-percentages">Safari percent rounding</a></li>
     <li><a href="#support-fixed-position-keyboards">Modals, navbars, and virtual keyboards</a></li>
     <li><a href="#support-browser-zooming">Browser zooming</a></li>
-    <li><a href="#support-printing">Printer viewports</a></li>
+    <li><a href="#support-printing">Printing</a></li>
     <li><a href="#support-android-stock-browser">Android stock browser</a></li>
     <li><a href="#support-validators">Validators</a></li>
   </ul>
diff --git a/docs/_includes/nav/javascript.html b/docs/_includes/nav/javascript.html
index 3459bb1e4..a1695bce8 100644
--- a/docs/_includes/nav/javascript.html
+++ b/docs/_includes/nav/javascript.html
@@ -17,6 +17,7 @@
     <li><a href="#modals-examples">Examples</a></li>
     <li><a href="#modals-sizes">Sizes</a></li>
     <li><a href="#modals-remove-animation">Remove animation</a></li>
+    <li><a href="#modals-related-target">Varying content based on trigger button</a></li>
     <li><a href="#modals-usage">Usage</a></li>
   </ul>
 </li>