From a7f58a83567af5be9ad8530379978a1d78b19a12 Mon Sep 17 00:00:00 2001
From: Heinrich Fenkart <hnrch02@gmail.com>
Date: Wed, 29 Oct 2014 04:30:31 +0100
Subject: grunt

---
 docs/_includes/customizer-variables.html | 306 +++++++++++++++----------------
 1 file changed, 153 insertions(+), 153 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 89edc603d..fc5f63d02 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -1,7 +1,7 @@
 
 <!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
 <h2 id="colors">Colors</h2>
-<p>Gray and brand colors for use across Bootstrap.</p>
+<p>Gray and brand colors for use across Bootstrap</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@gray-base">@gray-base</label>
@@ -52,37 +52,37 @@
   </div>
 </div>
 <h2 id="scaffolding">Scaffolding</h2>
-<p>Settings for some of the most global styles.</p>
+<p>Settings for some of the most global styles</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@body-bg">@body-bg</label>
     <input id="input-@body-bg" type="text" value="#fff" data-var="@body-bg" class="form-control"/>
-    <p class="help-block">Background color for <code>&lt;body&gt;</code>.</p>
+    <p class="help-block">Background color for <code>&lt;body&gt;</code></p>
   </div>
   <div class="col-xs-4">
     <label for="input-@text-color">@text-color</label>
     <input id="input-@text-color" type="text" value="@gray-dark" data-var="@text-color" class="form-control"/>
-    <p class="help-block">Global text color on <code>&lt;body&gt;</code>.</p>
+    <p class="help-block">Global text color on <code>&lt;body&gt;</code></p>
   </div>
   <div class="col-xs-4">
     <label for="input-@link-color">@link-color</label>
     <input id="input-@link-color" type="text" value="@brand-primary" data-var="@link-color" class="form-control"/>
-    <p class="help-block">Global textual link color.</p>
+    <p class="help-block">Global textual link color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@link-hover-color">@link-hover-color</label>
     <input id="input-@link-hover-color" type="text" value="darken(@link-color, 15%)" data-var="@link-hover-color" class="form-control"/>
-    <p class="help-block">Link hover color set via <code>darken()</code> function.</p>
+    <p class="help-block">Link hover color set via <code>darken()</code> function</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@link-hover-decoration">@link-hover-decoration</label>
     <input id="input-@link-hover-decoration" type="text" value="underline" data-var="@link-hover-decoration" class="form-control"/>
-    <p class="help-block">Link hover decoration.</p>
+    <p class="help-block">Link hover decoration</p>
   </div>
 </div>
 <h2 id="typography">Typography</h2>
-<p>Font, line-height, and color for body text, headings, and more.</p>
+<p>Font, line-height, and color for body text, headings, and more</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@font-family-sans-serif">@font-family-sans-serif</label>
@@ -95,7 +95,7 @@
   <div class="col-xs-4">
     <label for="input-@font-family-monospace">@font-family-monospace</label>
     <input id="input-@font-family-monospace" type="text" value="Menlo, Monaco, Consolas, &quot;Courier New&quot;, monospace" data-var="@font-family-monospace" class="form-control"/>
-    <p class="help-block">Default monospace fonts for <code>&lt;code&gt;</code>, <code>&lt;kbd&gt;</code>, and <code>&lt;pre&gt;</code>.</p>
+    <p class="help-block">Default monospace fonts for <code>&lt;code&gt;</code>, <code>&lt;kbd&gt;</code>, and <code>&lt;pre&gt;</code></p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
@@ -144,18 +144,18 @@
   <div class="col-xs-4">
     <label for="input-@line-height-base">@line-height-base</label>
     <input id="input-@line-height-base" type="text" value="1.428571429" data-var="@line-height-base" class="form-control"/>
-    <p class="help-block">Unit-less <code>line-height</code> for use in components like buttons.</p>
+    <p class="help-block">Unit-less <code>line-height</code> for use in components like buttons</p>
   </div>
   <div class="col-xs-4">
     <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> * <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="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@headings-font-family">@headings-font-family</label>
     <input id="input-@headings-font-family" type="text" value="inherit" data-var="@headings-font-family" class="form-control"/>
-    <p class="help-block">By default, this inherits from the <code>&lt;body&gt;</code>.</p>
+    <p class="help-block">By default, this inherits from the <code>&lt;body&gt;</code></p>
   </div>
   <div class="col-xs-4">
     <label for="input-@headings-font-weight">@headings-font-weight</label>
@@ -172,26 +172,26 @@
   </div>
 </div>
 <h2 id="iconography">Iconography</h2>
-<p>Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.</p>
+<p>Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@icon-font-path">@icon-font-path</label>
     <input id="input-@icon-font-path" type="text" value="&quot;../fonts/&quot;" data-var="@icon-font-path" class="form-control"/>
-    <p class="help-block">Load fonts from this directory.</p>
+    <p class="help-block">Load fonts from this directory</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@icon-font-name">@icon-font-name</label>
     <input id="input-@icon-font-name" type="text" value="&quot;glyphicons-halflings-regular&quot;" data-var="@icon-font-name" class="form-control"/>
-    <p class="help-block">File name for all font files.</p>
+    <p class="help-block">File name for all font files</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@icon-font-svg-id">@icon-font-svg-id</label>
     <input id="input-@icon-font-svg-id" type="text" value="&quot;glyphicons_halflingsregular&quot;" data-var="@icon-font-svg-id" class="form-control"/>
-    <p class="help-block">Element ID within SVG icon file.</p>
+    <p class="help-block">Element ID within SVG icon file</p>
   </div>
 </div>
 <h2 id="components">Components</h2>
-<p>Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).</p>
+<p>Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start)</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@padding-base-vertical">@padding-base-vertical</label>
@@ -252,53 +252,53 @@
   <div class="col-xs-4">
     <label for="input-@component-active-color">@component-active-color</label>
     <input id="input-@component-active-color" type="text" value="#fff" data-var="@component-active-color" class="form-control"/>
-    <p class="help-block">Global color for active items (e.g., navs or dropdowns).</p>
+    <p class="help-block">Global color for active items (e.g., navs or dropdowns)</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@component-active-bg">@component-active-bg</label>
     <input id="input-@component-active-bg" type="text" value="@brand-primary" data-var="@component-active-bg" class="form-control"/>
-    <p class="help-block">Global background color for active items (e.g., navs or dropdowns).</p>
+    <p class="help-block">Global background color for active items (e.g., navs or dropdowns)</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@caret-width-base">@caret-width-base</label>
     <input id="input-@caret-width-base" type="text" value="4px" data-var="@caret-width-base" class="form-control"/>
-    <p class="help-block">Width of the <code>border</code> for generating carets that indicator dropdowns.</p>
+    <p class="help-block">Width of the <code>border</code> for generating carets that indicator dropdowns</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@caret-width-large">@caret-width-large</label>
     <input id="input-@caret-width-large" type="text" value="5px" data-var="@caret-width-large" class="form-control"/>
-    <p class="help-block">Carets increase slightly in size for larger components.</p>
+    <p class="help-block">Carets increase slightly in size for larger components</p>
   </div>
 </div>
 <h2 id="tables">Tables</h2>
-<p>Customizes the <code>.table</code> component with basic values, each used across all table variations.</p>
+<p>Customizes the <code>.table</code> component with basic values, each used across all table variations</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@table-cell-padding">@table-cell-padding</label>
     <input id="input-@table-cell-padding" type="text" value="8px" data-var="@table-cell-padding" class="form-control"/>
-    <p class="help-block">Padding for <code>&lt;th&gt;</code>s and <code>&lt;td&gt;</code>s.</p>
+    <p class="help-block">Padding for <code>&lt;th&gt;</code>s and <code>&lt;td&gt;</code>s</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@table-condensed-cell-padding">@table-condensed-cell-padding</label>
     <input id="input-@table-condensed-cell-padding" type="text" value="5px" data-var="@table-condensed-cell-padding" class="form-control"/>
-    <p class="help-block">Padding for cells in <code>.table-condensed</code>.</p>
+    <p class="help-block">Padding for cells in <code>.table-condensed</code></p>
   </div>
   <div class="col-xs-4">
     <label for="input-@table-bg">@table-bg</label>
     <input id="input-@table-bg" type="text" value="transparent" data-var="@table-bg" class="form-control"/>
-    <p class="help-block">Default background color used for all tables.</p>
+    <p class="help-block">Default background color used for all tables</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@table-bg-accent">@table-bg-accent</label>
     <input id="input-@table-bg-accent" type="text" value="#f9f9f9" data-var="@table-bg-accent" class="form-control"/>
-    <p class="help-block">Background color used for <code>.table-striped</code>.</p>
+    <p class="help-block">Background color used for <code>.table-striped</code></p>
   </div>
   <div class="col-xs-4">
     <label for="input-@table-bg-hover">@table-bg-hover</label>
     <input id="input-@table-bg-hover" type="text" value="#f5f5f5" data-var="@table-bg-hover" class="form-control"/>
-    <p class="help-block">Background color used for <code>.table-hover</code>.</p>
+    <p class="help-block">Background color used for <code>.table-hover</code></p>
   </div>
   <div class="col-xs-4">
     <label for="input-@table-bg-active">@table-bg-active</label>
@@ -308,11 +308,11 @@
   <div class="col-xs-4">
     <label for="input-@table-border-color">@table-border-color</label>
     <input id="input-@table-border-color" type="text" value="#ddd" data-var="@table-border-color" class="form-control"/>
-    <p class="help-block">Border color for table and cell borders.</p>
+    <p class="help-block">Border color for table and cell borders</p>
   </div>
 </div>
 <h2 id="buttons">Buttons</h2>
-<p>For each of Bootstrap's buttons, define text, background and border color.</p>
+<p>For each of Bootstrap's buttons, define text, background and border color</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@btn-font-weight">@btn-font-weight</label>
@@ -406,65 +406,65 @@
   <div class="col-xs-4">
     <label for="input-@input-bg">@input-bg</label>
     <input id="input-@input-bg" type="text" value="#fff" data-var="@input-bg" class="form-control"/>
-    <p class="help-block"><code>&lt;input&gt;</code> background color</p>
+    <p class="help-block"><code>&lt;input&gt;</code> background colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-bg-disabled">@input-bg-disabled</label>
     <input id="input-@input-bg-disabled" type="text" value="@gray-lighter" data-var="@input-bg-disabled" class="form-control"/>
-    <p class="help-block"><code>&lt;input disabled&gt;</code> background color</p>
+    <p class="help-block"><code>&lt;input disabled&gt;</code> background colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-color">@input-color</label>
     <input id="input-@input-color" type="text" value="@gray" data-var="@input-color" class="form-control"/>
-    <p class="help-block">Text color for <code>&lt;input&gt;</code>s</p>
+    <p class="help-block">Text color for <code>&lt;input&gt;</code></p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@input-border">@input-border</label>
     <input id="input-@input-border" type="text" value="#ccc" data-var="@input-border" class="form-control"/>
-    <p class="help-block"><code>&lt;input&gt;</code> border color</p>
+    <p class="help-block"><code>&lt;input&gt;</code> border colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-border-radius">@input-border-radius</label>
     <input id="input-@input-border-radius" type="text" value="@border-radius-base" data-var="@input-border-radius" class="form-control"/>
-    <p class="help-block">Default <code>.form-control</code> border radius</p>
+    <p class="help-block">Default <code>.form-control</code> border radiu</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-border-radius-large">@input-border-radius-large</label>
     <input id="input-@input-border-radius-large" type="text" value="@border-radius-large" data-var="@input-border-radius-large" class="form-control"/>
-    <p class="help-block">Large <code>.form-control</code> border radius</p>
+    <p class="help-block">Large <code>.form-control</code> border radiu</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@input-border-radius-small">@input-border-radius-small</label>
     <input id="input-@input-border-radius-small" type="text" value="@border-radius-small" data-var="@input-border-radius-small" class="form-control"/>
-    <p class="help-block">Small <code>.form-control</code> border radius</p>
+    <p class="help-block">Small <code>.form-control</code> border radiu</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-border-focus">@input-border-focus</label>
     <input id="input-@input-border-focus" type="text" value="#66afe9" data-var="@input-border-focus" class="form-control"/>
-    <p class="help-block">Border color for inputs on focus</p>
+    <p class="help-block">Border color for inputs on focu</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-color-placeholder">@input-color-placeholder</label>
     <input id="input-@input-color-placeholder" type="text" value="#999" data-var="@input-color-placeholder" class="form-control"/>
-    <p class="help-block">Placeholder text color</p>
+    <p class="help-block">Placeholder text colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@input-height-base">@input-height-base</label>
     <input id="input-@input-height-base" type="text" value="(@line-height-computed + (@padding-base-vertical * 2) + 2)" data-var="@input-height-base" class="form-control"/>
-    <p class="help-block">Default <code>.form-control</code> height</p>
+    <p class="help-block">Default <code>.form-control</code> heigh</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-height-large">@input-height-large</label>
     <input id="input-@input-height-large" type="text" value="(ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2)" data-var="@input-height-large" class="form-control"/>
-    <p class="help-block">Large <code>.form-control</code> height</p>
+    <p class="help-block">Large <code>.form-control</code> heigh</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-height-small">@input-height-small</label>
     <input id="input-@input-height-small" type="text" value="(floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2)" data-var="@input-height-small" class="form-control"/>
-    <p class="help-block">Small <code>.form-control</code> height</p>
+    <p class="help-block">Small <code>.form-control</code> heigh</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
@@ -478,105 +478,105 @@
   <div class="col-xs-4">
     <label for="input-@input-group-addon-bg">@input-group-addon-bg</label>
     <input id="input-@input-group-addon-bg" type="text" value="@gray-lighter" data-var="@input-group-addon-bg" class="form-control"/>
-    <p class="help-block">Background color for textual input addons</p>
+    <p class="help-block">Background color for textual input addon</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@input-group-addon-border-color">@input-group-addon-border-color</label>
     <input id="input-@input-group-addon-border-color" type="text" value="@input-border" data-var="@input-group-addon-border-color" class="form-control"/>
-    <p class="help-block">Border color for textual input addons</p>
+    <p class="help-block">Border color for textual input addon</p>
   </div>
 </div>
 <h2 id="dropdowns">Dropdowns</h2>
-<p>Dropdown menu container and contents.</p>
+<p>Dropdown menu container and contents</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@dropdown-bg">@dropdown-bg</label>
     <input id="input-@dropdown-bg" type="text" value="#fff" data-var="@dropdown-bg" class="form-control"/>
-    <p class="help-block">Background for the dropdown menu.</p>
+    <p class="help-block">Background for the dropdown menu</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-border">@dropdown-border</label>
     <input id="input-@dropdown-border" type="text" value="rgba(0,0,0,.15)" data-var="@dropdown-border" class="form-control"/>
-    <p class="help-block">Dropdown menu <code>border-color</code>.</p>
+    <p class="help-block">Dropdown menu <code>border-color</code></p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-fallback-border">@dropdown-fallback-border</label>
     <input id="input-@dropdown-fallback-border" type="text" value="#ccc" data-var="@dropdown-fallback-border" class="form-control"/>
-    <p class="help-block">Dropdown menu <code>border-color</code> <strong>for IE8</strong>.</p>
+    <p class="help-block">Dropdown menu <code>border-color</code> <strong>for IE8</strong></p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@dropdown-divider-bg">@dropdown-divider-bg</label>
     <input id="input-@dropdown-divider-bg" type="text" value="#e5e5e5" data-var="@dropdown-divider-bg" class="form-control"/>
-    <p class="help-block">Divider color for between dropdown items.</p>
+    <p class="help-block">Divider color for between dropdown items</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-color">@dropdown-link-color</label>
     <input id="input-@dropdown-link-color" type="text" value="@gray-dark" data-var="@dropdown-link-color" class="form-control"/>
-    <p class="help-block">Dropdown link text color.</p>
+    <p class="help-block">Dropdown link text color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-hover-color">@dropdown-link-hover-color</label>
     <input id="input-@dropdown-link-hover-color" type="text" value="darken(@gray-dark, 5%)" data-var="@dropdown-link-hover-color" class="form-control"/>
-    <p class="help-block">Hover color for dropdown links.</p>
+    <p class="help-block">Hover color for dropdown links</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-hover-bg">@dropdown-link-hover-bg</label>
     <input id="input-@dropdown-link-hover-bg" type="text" value="#f5f5f5" data-var="@dropdown-link-hover-bg" class="form-control"/>
-    <p class="help-block">Hover background for dropdown links.</p>
+    <p class="help-block">Hover background for dropdown links</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-active-color">@dropdown-link-active-color</label>
     <input id="input-@dropdown-link-active-color" type="text" value="@component-active-color" data-var="@dropdown-link-active-color" class="form-control"/>
-    <p class="help-block">Active dropdown menu item text color.</p>
+    <p class="help-block">Active dropdown menu item text color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-active-bg">@dropdown-link-active-bg</label>
     <input id="input-@dropdown-link-active-bg" type="text" value="@component-active-bg" data-var="@dropdown-link-active-bg" class="form-control"/>
-    <p class="help-block">Active dropdown menu item background color.</p>
+    <p class="help-block">Active dropdown menu item background color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-disabled-color">@dropdown-link-disabled-color</label>
     <input id="input-@dropdown-link-disabled-color" type="text" value="@gray-light" data-var="@dropdown-link-disabled-color" class="form-control"/>
-    <p class="help-block">Disabled dropdown menu item background color.</p>
+    <p class="help-block">Disabled dropdown menu item background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-header-color">@dropdown-header-color</label>
     <input id="input-@dropdown-header-color" type="text" value="@gray-light" data-var="@dropdown-header-color" class="form-control"/>
-    <p class="help-block">Text color for headers within dropdown menus.</p>
+    <p class="help-block">Text color for headers within dropdown menus</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-caret-color">@dropdown-caret-color</label>
     <input id="input-@dropdown-caret-color" type="text" value="#000" data-var="@dropdown-caret-color" class="form-control"/>
-    <p class="help-block">Deprecated <code>@dropdown-caret-color</code> as of v3.1.0</p>
+    <p class="help-block">Deprecated <code>@dropdown-caret-color</code> as of v3.1.</p>
   </div>
 </div>
 <h2 id="media-queries-breakpoints">Media queries breakpoints</h2>
-<p>Define the breakpoints at which your layout will change, adapting to different screen sizes.</p>
+<p>Define the breakpoints at which your layout will change, adapting to different screen sizes</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@screen-xs">@screen-xs</label>
     <input id="input-@screen-xs" type="text" value="480px" data-var="@screen-xs" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-xs</code> as of v3.0.1</p>
+    <p class="help-block">Deprecated <code>@screen-xs</code> as of v3.0.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@screen-xs-min">@screen-xs-min</label>
     <input id="input-@screen-xs-min" type="text" value="@screen-xs" data-var="@screen-xs-min" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-xs-min</code> as of v3.2.0</p>
+    <p class="help-block">Deprecated <code>@screen-xs-min</code> as of v3.2.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@screen-phone">@screen-phone</label>
     <input id="input-@screen-phone" type="text" value="@screen-xs-min" data-var="@screen-phone" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-phone</code> as of v3.0.1</p>
+    <p class="help-block">Deprecated <code>@screen-phone</code> as of v3.0.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@screen-sm">@screen-sm</label>
     <input id="input-@screen-sm" type="text" value="768px" data-var="@screen-sm" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-sm</code> as of v3.0.1</p>
+    <p class="help-block">Deprecated <code>@screen-sm</code> as of v3.0.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@screen-sm-min">@screen-sm-min</label>
@@ -585,13 +585,13 @@
   <div class="col-xs-4">
     <label for="input-@screen-tablet">@screen-tablet</label>
     <input id="input-@screen-tablet" type="text" value="@screen-sm-min" data-var="@screen-tablet" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-tablet</code> as of v3.0.1</p>
+    <p class="help-block">Deprecated <code>@screen-tablet</code> as of v3.0.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@screen-md">@screen-md</label>
     <input id="input-@screen-md" type="text" value="992px" data-var="@screen-md" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-md</code> as of v3.0.1</p>
+    <p class="help-block">Deprecated <code>@screen-md</code> as of v3.0.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@screen-md-min">@screen-md-min</label>
@@ -600,13 +600,13 @@
   <div class="col-xs-4">
     <label for="input-@screen-desktop">@screen-desktop</label>
     <input id="input-@screen-desktop" type="text" value="@screen-md-min" data-var="@screen-desktop" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-desktop</code> as of v3.0.1</p>
+    <p class="help-block">Deprecated <code>@screen-desktop</code> as of v3.0.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@screen-lg">@screen-lg</label>
     <input id="input-@screen-lg" type="text" value="1200px" data-var="@screen-lg" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-lg</code> as of v3.0.1</p>
+    <p class="help-block">Deprecated <code>@screen-lg</code> as of v3.0.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@screen-lg-min">@screen-lg-min</label>
@@ -615,7 +615,7 @@
   <div class="col-xs-4">
     <label for="input-@screen-lg-desktop">@screen-lg-desktop</label>
     <input id="input-@screen-lg-desktop" type="text" value="@screen-lg-min" data-var="@screen-lg-desktop" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-lg-desktop</code> as of v3.0.1</p>
+    <p class="help-block">Deprecated <code>@screen-lg-desktop</code> as of v3.0.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
@@ -632,32 +632,32 @@
   </div>
 </div>
 <h2 id="grid-system">Grid system</h2>
-<p>Define your custom responsive grid.</p>
+<p>Define your custom responsive grid</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@grid-columns">@grid-columns</label>
     <input id="input-@grid-columns" type="text" value="12" data-var="@grid-columns" class="form-control"/>
-    <p class="help-block">Number of columns in the grid.</p>
+    <p class="help-block">Number of columns in the grid</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@grid-gutter-width">@grid-gutter-width</label>
     <input id="input-@grid-gutter-width" type="text" value="30px" data-var="@grid-gutter-width" class="form-control"/>
-    <p class="help-block">Padding between columns. Gets divided in half for the left and right.</p>
+    <p class="help-block">Padding between columns. Gets divided in half for the left and right</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@grid-float-breakpoint">@grid-float-breakpoint</label>
     <input id="input-@grid-float-breakpoint" type="text" value="@screen-sm-min" data-var="@grid-float-breakpoint" class="form-control"/>
-    <p class="help-block">Point at which the navbar becomes uncollapsed.</p>
+    <p class="help-block">Point at which the navbar becomes uncollapsed</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@grid-float-breakpoint-max">@grid-float-breakpoint-max</label>
     <input id="input-@grid-float-breakpoint-max" type="text" value="(@grid-float-breakpoint - 1)" data-var="@grid-float-breakpoint-max" class="form-control"/>
-    <p class="help-block">Point at which the navbar begins collapsing.</p>
+    <p class="help-block">Point at which the navbar begins collapsing</p>
   </div>
 </div>
 <h2 id="container-sizes">Container sizes</h2>
-<p>Define the maximum width of <code>.container</code> for different screen sizes.</p>
+<p>Define the maximum width of <code>.container</code> for different screen sizes</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@container-tablet">@container-tablet</label>
@@ -666,7 +666,7 @@
   <div class="col-xs-4">
     <label for="input-@container-sm">@container-sm</label>
     <input id="input-@container-sm" type="text" value="@container-tablet" data-var="@container-sm" class="form-control"/>
-    <p class="help-block">For <code>@screen-sm-min</code> and up.</p>
+    <p class="help-block">For <code>@screen-sm-min</code> and up</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@container-desktop">@container-desktop</label>
@@ -676,7 +676,7 @@
   <div class="col-xs-4">
     <label for="input-@container-md">@container-md</label>
     <input id="input-@container-md" type="text" value="@container-desktop" data-var="@container-md" class="form-control"/>
-    <p class="help-block">For <code>@screen-md-min</code> and up.</p>
+    <p class="help-block">For <code>@screen-md-min</code> and up</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@container-large-desktop">@container-large-desktop</label>
@@ -685,7 +685,7 @@
   <div class="col-xs-4">
     <label for="input-@container-lg">@container-lg</label>
     <input id="input-@container-lg" type="text" value="@container-large-desktop" data-var="@container-lg" class="form-control"/>
-    <p class="help-block">For <code>@screen-lg-min</code> and up.</p>
+    <p class="help-block">For <code>@screen-lg-min</code> and up</p>
   </div>
 </div>
 <h2 id="navbar">Navbar</h2>
@@ -1036,7 +1036,7 @@
   </div>
 </div>
 <h2 id="form-states-and-alerts">Form states and alerts</h2>
-<p>Define colors for form feedback states and, by default, alerts.</p>
+<p>Define colors for form feedback states and, by default, alerts</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@state-success-text">@state-success-text</label>
@@ -1095,17 +1095,17 @@
   <div class="col-xs-4">
     <label for="input-@tooltip-max-width">@tooltip-max-width</label>
     <input id="input-@tooltip-max-width" type="text" value="200px" data-var="@tooltip-max-width" class="form-control"/>
-    <p class="help-block">Tooltip max width</p>
+    <p class="help-block">Tooltip max widt</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@tooltip-color">@tooltip-color</label>
     <input id="input-@tooltip-color" type="text" value="#fff" data-var="@tooltip-color" class="form-control"/>
-    <p class="help-block">Tooltip text color</p>
+    <p class="help-block">Tooltip text colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@tooltip-bg">@tooltip-bg</label>
     <input id="input-@tooltip-bg" type="text" value="#000" data-var="@tooltip-bg" class="form-control"/>
-    <p class="help-block">Tooltip background color</p>
+    <p class="help-block">Tooltip background colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
@@ -1115,12 +1115,12 @@
   <div class="col-xs-4">
     <label for="input-@tooltip-arrow-width">@tooltip-arrow-width</label>
     <input id="input-@tooltip-arrow-width" type="text" value="5px" data-var="@tooltip-arrow-width" class="form-control"/>
-    <p class="help-block">Tooltip arrow width</p>
+    <p class="help-block">Tooltip arrow widt</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@tooltip-arrow-color">@tooltip-arrow-color</label>
     <input id="input-@tooltip-arrow-color" type="text" value="@tooltip-bg" data-var="@tooltip-arrow-color" class="form-control"/>
-    <p class="help-block">Tooltip arrow color</p>
+    <p class="help-block">Tooltip arrow colo</p>
   </div>
 </div>
 <h2 id="popovers">Popovers</h2>
@@ -1128,55 +1128,55 @@
   <div class="col-xs-4">
     <label for="input-@popover-bg">@popover-bg</label>
     <input id="input-@popover-bg" type="text" value="#fff" data-var="@popover-bg" class="form-control"/>
-    <p class="help-block">Popover body background color</p>
+    <p class="help-block">Popover body background colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-max-width">@popover-max-width</label>
     <input id="input-@popover-max-width" type="text" value="276px" data-var="@popover-max-width" class="form-control"/>
-    <p class="help-block">Popover maximum width</p>
+    <p class="help-block">Popover maximum widt</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-border-color">@popover-border-color</label>
     <input id="input-@popover-border-color" type="text" value="rgba(0,0,0,.2)" data-var="@popover-border-color" class="form-control"/>
-    <p class="help-block">Popover border color</p>
+    <p class="help-block">Popover border colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@popover-fallback-border-color">@popover-fallback-border-color</label>
     <input id="input-@popover-fallback-border-color" type="text" value="#ccc" data-var="@popover-fallback-border-color" class="form-control"/>
-    <p class="help-block">Popover fallback border color</p>
+    <p class="help-block">Popover fallback border colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-title-bg">@popover-title-bg</label>
     <input id="input-@popover-title-bg" type="text" value="darken(@popover-bg, 3%)" data-var="@popover-title-bg" class="form-control"/>
-    <p class="help-block">Popover title background color</p>
+    <p class="help-block">Popover title background colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-arrow-width">@popover-arrow-width</label>
     <input id="input-@popover-arrow-width" type="text" value="10px" data-var="@popover-arrow-width" class="form-control"/>
-    <p class="help-block">Popover arrow width</p>
+    <p class="help-block">Popover arrow widt</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@popover-arrow-color">@popover-arrow-color</label>
     <input id="input-@popover-arrow-color" type="text" value="@popover-bg" data-var="@popover-arrow-color" class="form-control"/>
-    <p class="help-block">Popover arrow color</p>
+    <p class="help-block">Popover arrow colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-arrow-outer-width">@popover-arrow-outer-width</label>
     <input id="input-@popover-arrow-outer-width" type="text" value="(@popover-arrow-width + 1)" data-var="@popover-arrow-outer-width" class="form-control"/>
-    <p class="help-block">Popover outer arrow width</p>
+    <p class="help-block">Popover outer arrow widt</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-arrow-outer-color">@popover-arrow-outer-color</label>
     <input id="input-@popover-arrow-outer-color" type="text" value="fadein(@popover-border-color, 5%)" data-var="@popover-arrow-outer-color" class="form-control"/>
-    <p class="help-block">Popover outer arrow color</p>
+    <p class="help-block">Popover outer arrow colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@popover-arrow-outer-fallback-color">@popover-arrow-outer-fallback-color</label>
     <input id="input-@popover-arrow-outer-fallback-color" type="text" value="darken(@popover-fallback-border-color, 20%)" data-var="@popover-arrow-outer-fallback-color" class="form-control"/>
-    <p class="help-block">Popover outer arrow fallback color</p>
+    <p class="help-block">Popover outer arrow fallback colo</p>
   </div>
 </div>
 <h2 id="labels">Labels</h2>
@@ -1184,44 +1184,44 @@
   <div class="col-xs-4">
     <label for="input-@label-default-bg">@label-default-bg</label>
     <input id="input-@label-default-bg" type="text" value="@gray-light" data-var="@label-default-bg" class="form-control"/>
-    <p class="help-block">Default label background color</p>
+    <p class="help-block">Default label background colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@label-primary-bg">@label-primary-bg</label>
     <input id="input-@label-primary-bg" type="text" value="@brand-primary" data-var="@label-primary-bg" class="form-control"/>
-    <p class="help-block">Primary label background color</p>
+    <p class="help-block">Primary label background colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@label-success-bg">@label-success-bg</label>
     <input id="input-@label-success-bg" type="text" value="@brand-success" data-var="@label-success-bg" class="form-control"/>
-    <p class="help-block">Success label background color</p>
+    <p class="help-block">Success label background colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@label-info-bg">@label-info-bg</label>
     <input id="input-@label-info-bg" type="text" value="@brand-info" data-var="@label-info-bg" class="form-control"/>
-    <p class="help-block">Info label background color</p>
+    <p class="help-block">Info label background colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@label-warning-bg">@label-warning-bg</label>
     <input id="input-@label-warning-bg" type="text" value="@brand-warning" data-var="@label-warning-bg" class="form-control"/>
-    <p class="help-block">Warning label background color</p>
+    <p class="help-block">Warning label background colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@label-danger-bg">@label-danger-bg</label>
     <input id="input-@label-danger-bg" type="text" value="@brand-danger" data-var="@label-danger-bg" class="form-control"/>
-    <p class="help-block">Danger label background color</p>
+    <p class="help-block">Danger label background colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@label-color">@label-color</label>
     <input id="input-@label-color" type="text" value="#fff" data-var="@label-color" class="form-control"/>
-    <p class="help-block">Default label text color</p>
+    <p class="help-block">Default label text colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@label-link-hover-color">@label-link-hover-color</label>
     <input id="input-@label-link-hover-color" type="text" value="#fff" data-var="@label-link-hover-color" class="form-control"/>
-    <p class="help-block">Default text color of a linked label</p>
+    <p class="help-block">Default text color of a linked labe</p>
   </div>
 </div>
 <h2 id="modals">Modals</h2>
@@ -1229,55 +1229,55 @@
   <div class="col-xs-4">
     <label for="input-@modal-inner-padding">@modal-inner-padding</label>
     <input id="input-@modal-inner-padding" type="text" value="15px" data-var="@modal-inner-padding" class="form-control"/>
-    <p class="help-block">Padding applied to the modal body</p>
+    <p class="help-block">Padding applied to the modal bod</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-title-padding">@modal-title-padding</label>
     <input id="input-@modal-title-padding" type="text" value="15px" data-var="@modal-title-padding" class="form-control"/>
-    <p class="help-block">Padding applied to the modal title</p>
+    <p class="help-block">Padding applied to the modal titl</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-title-line-height">@modal-title-line-height</label>
     <input id="input-@modal-title-line-height" type="text" value="@line-height-base" data-var="@modal-title-line-height" class="form-control"/>
-    <p class="help-block">Modal title line-height</p>
+    <p class="help-block">Modal title line-heigh</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@modal-content-bg">@modal-content-bg</label>
     <input id="input-@modal-content-bg" type="text" value="#fff" data-var="@modal-content-bg" class="form-control"/>
-    <p class="help-block">Background color of modal content area</p>
+    <p class="help-block">Background color of modal content are</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-content-border-color">@modal-content-border-color</label>
     <input id="input-@modal-content-border-color" type="text" value="rgba(0,0,0,.2)" data-var="@modal-content-border-color" class="form-control"/>
-    <p class="help-block">Modal content border color</p>
+    <p class="help-block">Modal content border colo</p>
   </div>
   <div class="col-xs-4">
     <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 <strong>for IE8</strong></p>
+    <p class="help-block">Modal content border color *<em>for IE8</em></p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@modal-backdrop-bg">@modal-backdrop-bg</label>
     <input id="input-@modal-backdrop-bg" type="text" value="#000" data-var="@modal-backdrop-bg" class="form-control"/>
-    <p class="help-block">Modal backdrop background color</p>
+    <p class="help-block">Modal backdrop background colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-backdrop-opacity">@modal-backdrop-opacity</label>
     <input id="input-@modal-backdrop-opacity" type="text" value=".5" data-var="@modal-backdrop-opacity" class="form-control"/>
-    <p class="help-block">Modal backdrop opacity</p>
+    <p class="help-block">Modal backdrop opacit</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-header-border-color">@modal-header-border-color</label>
     <input id="input-@modal-header-border-color" type="text" value="#e5e5e5" data-var="@modal-header-border-color" class="form-control"/>
-    <p class="help-block">Modal header border color</p>
+    <p class="help-block">Modal header border colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@modal-footer-border-color">@modal-footer-border-color</label>
     <input id="input-@modal-footer-border-color" type="text" value="@modal-header-border-color" data-var="@modal-footer-border-color" class="form-control"/>
-    <p class="help-block">Modal footer border color</p>
+    <p class="help-block">Modal footer border colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-lg">@modal-lg</label>
@@ -1294,7 +1294,7 @@
   </div>
 </div>
 <h2 id="alerts">Alerts</h2>
-<p>Define alert colors, border radius, and padding.</p>
+<p>Define alert colors, border radius, and padding</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@alert-padding">@alert-padding</label>
@@ -1366,44 +1366,44 @@
   <div class="col-xs-4">
     <label for="input-@progress-bg">@progress-bg</label>
     <input id="input-@progress-bg" type="text" value="#f5f5f5" data-var="@progress-bg" class="form-control"/>
-    <p class="help-block">Background color of the whole progress component</p>
+    <p class="help-block">Background color of the whole progress componen</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-color">@progress-bar-color</label>
     <input id="input-@progress-bar-color" type="text" value="#fff" data-var="@progress-bar-color" class="form-control"/>
-    <p class="help-block">Progress bar text color</p>
+    <p class="help-block">Progress bar text colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@progress-border-radius">@progress-border-radius</label>
     <input id="input-@progress-border-radius" type="text" value="@border-radius-base" data-var="@progress-border-radius" class="form-control"/>
-    <p class="help-block">Variable for setting rounded corners on progress bar.</p>
+    <p class="help-block">Variable for setting rounded corners on progress bar</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-bg">@progress-bar-bg</label>
     <input id="input-@progress-bar-bg" type="text" value="@brand-primary" data-var="@progress-bar-bg" class="form-control"/>
-    <p class="help-block">Default progress bar color</p>
+    <p class="help-block">Default progress bar colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-success-bg">@progress-bar-success-bg</label>
     <input id="input-@progress-bar-success-bg" type="text" value="@brand-success" data-var="@progress-bar-success-bg" class="form-control"/>
-    <p class="help-block">Success progress bar color</p>
+    <p class="help-block">Success progress bar colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-warning-bg">@progress-bar-warning-bg</label>
     <input id="input-@progress-bar-warning-bg" type="text" value="@brand-warning" data-var="@progress-bar-warning-bg" class="form-control"/>
-    <p class="help-block">Warning progress bar color</p>
+    <p class="help-block">Warning progress bar colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-danger-bg">@progress-bar-danger-bg</label>
     <input id="input-@progress-bar-danger-bg" type="text" value="@brand-danger" data-var="@progress-bar-danger-bg" class="form-control"/>
-    <p class="help-block">Danger progress bar color</p>
+    <p class="help-block">Danger progress bar colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-info-bg">@progress-bar-info-bg</label>
     <input id="input-@progress-bar-info-bg" type="text" value="@brand-info" data-var="@progress-bar-info-bg" class="form-control"/>
-    <p class="help-block">Info progress bar color</p>
+    <p class="help-block">Info progress bar colo</p>
   </div>
 </div>
 <h2 id="list-group">List group</h2>
@@ -1411,60 +1411,60 @@
   <div class="col-xs-4">
     <label for="input-@list-group-bg">@list-group-bg</label>
     <input id="input-@list-group-bg" type="text" value="#fff" data-var="@list-group-bg" class="form-control"/>
-    <p class="help-block">Background color on <code>.list-group-item</code></p>
+    <p class="help-block">Background color on `.list-group-item</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-border">@list-group-border</label>
     <input id="input-@list-group-border" type="text" value="#ddd" data-var="@list-group-border" class="form-control"/>
-    <p class="help-block"><code>.list-group-item</code> border color</p>
+    <p class="help-block"><code>.list-group-item</code> border colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-border-radius">@list-group-border-radius</label>
     <input id="input-@list-group-border-radius" type="text" value="@border-radius-base" data-var="@list-group-border-radius" class="form-control"/>
-    <p class="help-block">List group border radius</p>
+    <p class="help-block">List group border radiu</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@list-group-hover-bg">@list-group-hover-bg</label>
     <input id="input-@list-group-hover-bg" type="text" value="#f5f5f5" data-var="@list-group-hover-bg" class="form-control"/>
-    <p class="help-block">Background color of single list items on hover</p>
+    <p class="help-block">Background color of single list items on hove</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-active-color">@list-group-active-color</label>
     <input id="input-@list-group-active-color" type="text" value="@component-active-color" data-var="@list-group-active-color" class="form-control"/>
-    <p class="help-block">Text color of active list items</p>
+    <p class="help-block">Text color of active list item</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-active-bg">@list-group-active-bg</label>
     <input id="input-@list-group-active-bg" type="text" value="@component-active-bg" data-var="@list-group-active-bg" class="form-control"/>
-    <p class="help-block">Background color of active list items</p>
+    <p class="help-block">Background color of active list item</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@list-group-active-border">@list-group-active-border</label>
     <input id="input-@list-group-active-border" type="text" value="@list-group-active-bg" data-var="@list-group-active-border" class="form-control"/>
-    <p class="help-block">Border color of active list elements</p>
+    <p class="help-block">Border color of active list element</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-active-text-color">@list-group-active-text-color</label>
     <input id="input-@list-group-active-text-color" type="text" value="lighten(@list-group-active-bg, 40%)" data-var="@list-group-active-text-color" class="form-control"/>
-    <p class="help-block">Text color for content within active list items</p>
+    <p class="help-block">Text color for content within active list item</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-disabled-color">@list-group-disabled-color</label>
     <input id="input-@list-group-disabled-color" type="text" value="@gray-light" data-var="@list-group-disabled-color" class="form-control"/>
-    <p class="help-block">Text color of disabled list items</p>
+    <p class="help-block">Text color of disabled list item</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@list-group-disabled-bg">@list-group-disabled-bg</label>
     <input id="input-@list-group-disabled-bg" type="text" value="@gray-lighter" data-var="@list-group-disabled-bg" class="form-control"/>
-    <p class="help-block">Background color of disabled list items</p>
+    <p class="help-block">Background color of disabled list item</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-disabled-text-color">@list-group-disabled-text-color</label>
     <input id="input-@list-group-disabled-text-color" type="text" value="@list-group-disabled-color" data-var="@list-group-disabled-text-color" class="form-control"/>
-    <p class="help-block">Text color for content within disabled list items</p>
+    <p class="help-block">Text color for content within disabled list item</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-link-color">@list-group-link-color</label>
@@ -1506,7 +1506,7 @@
   <div class="col-xs-4">
     <label for="input-@panel-inner-border">@panel-inner-border</label>
     <input id="input-@panel-inner-border" type="text" value="#ddd" data-var="@panel-inner-border" class="form-control"/>
-    <p class="help-block">Border color for elements within panels</p>
+    <p class="help-block">Border color for elements within panel</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
@@ -1597,33 +1597,33 @@
   <div class="col-xs-4">
     <label for="input-@thumbnail-padding">@thumbnail-padding</label>
     <input id="input-@thumbnail-padding" type="text" value="4px" data-var="@thumbnail-padding" class="form-control"/>
-    <p class="help-block">Padding around the thumbnail image</p>
+    <p class="help-block">Padding around the thumbnail imag</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@thumbnail-bg">@thumbnail-bg</label>
     <input id="input-@thumbnail-bg" type="text" value="@body-bg" data-var="@thumbnail-bg" class="form-control"/>
-    <p class="help-block">Thumbnail background color</p>
+    <p class="help-block">Thumbnail background colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@thumbnail-border">@thumbnail-border</label>
     <input id="input-@thumbnail-border" type="text" value="#ddd" data-var="@thumbnail-border" class="form-control"/>
-    <p class="help-block">Thumbnail border color</p>
+    <p class="help-block">Thumbnail border colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@thumbnail-border-radius">@thumbnail-border-radius</label>
     <input id="input-@thumbnail-border-radius" type="text" value="@border-radius-base" data-var="@thumbnail-border-radius" class="form-control"/>
-    <p class="help-block">Thumbnail border radius</p>
+    <p class="help-block">Thumbnail border radiu</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@thumbnail-caption-color">@thumbnail-caption-color</label>
     <input id="input-@thumbnail-caption-color" type="text" value="@text-color" data-var="@thumbnail-caption-color" class="form-control"/>
-    <p class="help-block">Custom text color for thumbnail captions</p>
+    <p class="help-block">Custom text color for thumbnail caption</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@thumbnail-caption-padding">@thumbnail-caption-padding</label>
     <input id="input-@thumbnail-caption-padding" type="text" value="9px" data-var="@thumbnail-caption-padding" class="form-control"/>
-    <p class="help-block">Padding around the thumbnail caption</p>
+    <p class="help-block">Padding around the thumbnail captio</p>
   </div>
 </div>
 <h2 id="wells">Wells</h2>
@@ -1646,7 +1646,7 @@
   <div class="col-xs-4">
     <label for="input-@badge-link-hover-color">@badge-link-hover-color</label>
     <input id="input-@badge-link-hover-color" type="text" value="#fff" data-var="@badge-link-hover-color" class="form-control"/>
-    <p class="help-block">Linked badge text color on hover</p>
+    <p class="help-block">Linked badge text color on hove</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@badge-bg">@badge-bg</label>
@@ -1656,12 +1656,12 @@
   <div class="col-xs-4">
     <label for="input-@badge-active-color">@badge-active-color</label>
     <input id="input-@badge-active-color" type="text" value="@link-color" data-var="@badge-active-color" class="form-control"/>
-    <p class="help-block">Badge text color in active nav link</p>
+    <p class="help-block">Badge text color in active nav lin</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@badge-active-bg">@badge-active-bg</label>
     <input id="input-@badge-active-bg" type="text" value="#fff" data-var="@badge-active-bg" class="form-control"/>
-    <p class="help-block">Badge background color in active nav link</p>
+    <p class="help-block">Badge background color in active nav lin</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@badge-font-weight">@badge-font-weight</label>
@@ -1690,23 +1690,23 @@
   <div class="col-xs-4">
     <label for="input-@breadcrumb-bg">@breadcrumb-bg</label>
     <input id="input-@breadcrumb-bg" type="text" value="#f5f5f5" data-var="@breadcrumb-bg" class="form-control"/>
-    <p class="help-block">Breadcrumb background color</p>
+    <p class="help-block">Breadcrumb background colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@breadcrumb-color">@breadcrumb-color</label>
     <input id="input-@breadcrumb-color" type="text" value="#ccc" data-var="@breadcrumb-color" class="form-control"/>
-    <p class="help-block">Breadcrumb text color</p>
+    <p class="help-block">Breadcrumb text colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@breadcrumb-active-color">@breadcrumb-active-color</label>
     <input id="input-@breadcrumb-active-color" type="text" value="@gray-light" data-var="@breadcrumb-active-color" class="form-control"/>
-    <p class="help-block">Text color of current page in the breadcrumb</p>
+    <p class="help-block">Text color of current page in the breadcrum</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@breadcrumb-separator">@breadcrumb-separator</label>
     <input id="input-@breadcrumb-separator" type="text" value="&quot;/&quot;" data-var="@breadcrumb-separator" class="form-control"/>
-    <p class="help-block">Textual separator for between breadcrumb elements</p>
+    <p class="help-block">Textual separator for between breadcrumb element</p>
   </div>
 </div>
 <h2 id="carousel">Carousel</h2>
@@ -1803,55 +1803,55 @@
   <div class="col-xs-4">
     <label for="input-@component-offset-horizontal">@component-offset-horizontal</label>
     <input id="input-@component-offset-horizontal" type="text" value="180px" data-var="@component-offset-horizontal" class="form-control"/>
-    <p class="help-block">Horizontal offset for forms and lists.</p>
+    <p class="help-block">Horizontal offset for forms and lists</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@text-muted">@text-muted</label>
     <input id="input-@text-muted" type="text" value="@gray-light" data-var="@text-muted" class="form-control"/>
-    <p class="help-block">Text muted color</p>
+    <p class="help-block">Text muted colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@abbr-border-color">@abbr-border-color</label>
     <input id="input-@abbr-border-color" type="text" value="@gray-light" data-var="@abbr-border-color" class="form-control"/>
-    <p class="help-block">Abbreviations and acronyms border color</p>
+    <p class="help-block">Abbreviations and acronyms border colo</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@headings-small-color">@headings-small-color</label>
     <input id="input-@headings-small-color" type="text" value="@gray-light" data-var="@headings-small-color" class="form-control"/>
-    <p class="help-block">Headings small color</p>
+    <p class="help-block">Headings small colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@blockquote-small-color">@blockquote-small-color</label>
     <input id="input-@blockquote-small-color" type="text" value="@gray-light" data-var="@blockquote-small-color" class="form-control"/>
-    <p class="help-block">Blockquote small color</p>
+    <p class="help-block">Blockquote small colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@blockquote-font-size">@blockquote-font-size</label>
     <input id="input-@blockquote-font-size" type="text" value="(@font-size-base * 1.25)" data-var="@blockquote-font-size" class="form-control"/>
-    <p class="help-block">Blockquote font size</p>
+    <p class="help-block">Blockquote font siz</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@blockquote-border-color">@blockquote-border-color</label>
     <input id="input-@blockquote-border-color" type="text" value="@gray-lighter" data-var="@blockquote-border-color" class="form-control"/>
-    <p class="help-block">Blockquote border color</p>
+    <p class="help-block">Blockquote border colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@page-header-border-color">@page-header-border-color</label>
     <input id="input-@page-header-border-color" type="text" value="@gray-lighter" data-var="@page-header-border-color" class="form-control"/>
-    <p class="help-block">Page header border color</p>
+    <p class="help-block">Page header border colo</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dl-horizontal-offset">@dl-horizontal-offset</label>
     <input id="input-@dl-horizontal-offset" type="text" value="@component-offset-horizontal" data-var="@dl-horizontal-offset" class="form-control"/>
-    <p class="help-block">Width of horizontal description list titles</p>
+    <p class="help-block">Width of horizontal description list title</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@hr-border">@hr-border</label>
     <input id="input-@hr-border" type="text" value="@gray-lighter" data-var="@hr-border" class="form-control"/>
-    <p class="help-block">Horizontal line color.</p>
+    <p class="help-block">Horizontal line color</p>
   </div>
 </div>
 <!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
\ No newline at end of file
-- 
cgit v1.2.3


From c897f9d5f0b331dfafb571429d7bd845b6b73b6a Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Tue, 28 Oct 2014 21:24:45 -0700
Subject: Safari v8.0 still suffers from Justified Nav rendering bug

---
 docs/_includes/components/navs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/components/navs.html b/docs/_includes/components/navs.html
index 0e9af578a..c9fc189c5 100644
--- a/docs/_includes/components/navs.html
+++ b/docs/_includes/components/navs.html
@@ -60,7 +60,7 @@
   <p><strong class="text-danger">Justified navbar nav links are currently not supported.</strong></p>
   <div class="bs-callout bs-callout-warning">
     <h4>Safari and responsive justified navs</h4>
-    <p>As of v7.1, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p>
+    <p>As of v8.0, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p>
   </div>
   <div class="bs-example">
     <ul class="nav nav-tabs nav-justified" role="tablist">
-- 
cgit v1.2.3


From a515191afddb3952fa93c6aacf83c73c8024e069 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 29 Oct 2014 06:46:02 +0200
Subject: Customizer: include the minified files only on GitHub pages.

---
 docs/_includes/footer.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'docs/_includes')

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index ef68da3eb..c6ad43cd5 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -46,7 +46,17 @@
 <script src="../assets/js/src/application.js"></script>
 {% endif %}
 {% if page.slug == "customize" %}
+{% if site.github %}
 <script src="../assets/js/customize.min.js"></script>
+{% else %}
+<script src="../assets/js/vendor/less.min.js"></script>
+<script src="../assets/js/vendor/jszip.min.js"></script>
+<script src="../assets/js/vendor/uglify.min.js"></script>
+<script src="../assets/js/vendor/Blob.js"></script>
+<script src="../assets/js/vendor/FileSaver.js"></script>
+<script src="../assets/js/raw-files.min.js"></script>
+<script src="../assets/js/src/customizer.js"></script>
+{% endif %}
 {% endif %}
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 <script src="../assets/js/ie10-viewport-bug-workaround.js"></script>
-- 
cgit v1.2.3


From aad0f00887239a1971ae746a2828f037b5d30541 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 28 Oct 2014 23:04:25 -0700
Subject: indentation and comment

---
 docs/_includes/footer.html | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index c6ad43cd5..c44cabec8 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -33,31 +33,38 @@
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+
 {% if site.github %}
-<script src="../dist/js/bootstrap.min.js"></script>
+  <script src="../dist/js/bootstrap.min.js"></script>
 {% else %}
-<script src="../dist/js/bootstrap.js"></script>
+  <script src="../dist/js/bootstrap.js"></script>
 {% endif %}
+
 {% if site.github %}
-<script src="../assets/js/docs.min.js"></script>
+  <script src="../assets/js/docs.min.js"></script>
 {% else %}
-<script src="../assets/js/vendor/holder.js"></script>
-<script src="../assets/js/vendor/ZeroClipboard.min.js"></script>
-<script src="../assets/js/src/application.js"></script>
+  <script src="../assets/js/vendor/holder.js"></script>
+  <script src="../assets/js/vendor/ZeroClipboard.min.js"></script>
+  <script src="../assets/js/src/application.js"></script>
 {% endif %}
+
 {% if page.slug == "customize" %}
-{% if site.github %}
-<script src="../assets/js/customize.min.js"></script>
-{% else %}
-<script src="../assets/js/vendor/less.min.js"></script>
-<script src="../assets/js/vendor/jszip.min.js"></script>
-<script src="../assets/js/vendor/uglify.min.js"></script>
-<script src="../assets/js/vendor/Blob.js"></script>
-<script src="../assets/js/vendor/FileSaver.js"></script>
-<script src="../assets/js/raw-files.min.js"></script>
-<script src="../assets/js/src/customizer.js"></script>
-{% endif %}
+  {% if site.github %}
+    <script src="../assets/js/customize.min.js"></script>
+  {% else %}
+    {% comment %}
+      This list is repeated in our Gruntfile—update both when making changes.
+    {% endcomment %}
+    <script src="../assets/js/vendor/less.min.js"></script>
+    <script src="../assets/js/vendor/jszip.min.js"></script>
+    <script src="../assets/js/vendor/uglify.min.js"></script>
+    <script src="../assets/js/vendor/Blob.js"></script>
+    <script src="../assets/js/vendor/FileSaver.js"></script>
+    <script src="../assets/js/raw-files.min.js"></script>
+    <script src="../assets/js/src/customizer.js"></script>
+  {% endif %}
 {% endif %}
+
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 <script src="../assets/js/ie10-viewport-bug-workaround.js"></script>
 
-- 
cgit v1.2.3


From a75c6d84e102598ed39f7926a8e1cb4d3f6e487d Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 28 Oct 2014 23:08:42 -0700
Subject: grunt

---
 docs/_includes/customizer-variables.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/_includes')

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index fc5f63d02..04b7ff1e1 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -486,6 +486,11 @@
     <input id="input-@input-group-addon-border-color" type="text" value="@input-border" data-var="@input-group-addon-border-color" class="form-control"/>
     <p class="help-block">Border color for textual input addon</p>
   </div>
+  <div class="col-xs-4">
+    <label for="input-@cursor-disabled">@cursor-disabled</label>
+    <input id="input-@cursor-disabled" type="text" value="not-allowed" data-var="@cursor-disabled" class="form-control"/>
+    <p class="help-block">Disabled cursor for form controls and buttons</p>
+  </div>
 </div>
 <h2 id="dropdowns">Dropdowns</h2>
 <p>Dropdown menu container and contents</p>
-- 
cgit v1.2.3


From 22baa8153b58e80df248b38ddf2aeae4f3f9cc2b Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 29 Oct 2014 09:42:00 -0700
Subject: fixes #14911: bump dependencies to fix customizer text from being cut
 shor

---
 docs/_includes/customizer-variables.html | 308 +++++++++++++++----------------
 1 file changed, 154 insertions(+), 154 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 04b7ff1e1..e45884d5a 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -1,7 +1,7 @@
 
 <!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
 <h2 id="colors">Colors</h2>
-<p>Gray and brand colors for use across Bootstrap</p>
+<p>Gray and brand colors for use across Bootstrap.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@gray-base">@gray-base</label>
@@ -52,37 +52,37 @@
   </div>
 </div>
 <h2 id="scaffolding">Scaffolding</h2>
-<p>Settings for some of the most global styles</p>
+<p>Settings for some of the most global styles.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@body-bg">@body-bg</label>
     <input id="input-@body-bg" type="text" value="#fff" data-var="@body-bg" class="form-control"/>
-    <p class="help-block">Background color for <code>&lt;body&gt;</code></p>
+    <p class="help-block">Background color for <code>&lt;body&gt;</code>.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@text-color">@text-color</label>
     <input id="input-@text-color" type="text" value="@gray-dark" data-var="@text-color" class="form-control"/>
-    <p class="help-block">Global text color on <code>&lt;body&gt;</code></p>
+    <p class="help-block">Global text color on <code>&lt;body&gt;</code>.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@link-color">@link-color</label>
     <input id="input-@link-color" type="text" value="@brand-primary" data-var="@link-color" class="form-control"/>
-    <p class="help-block">Global textual link color</p>
+    <p class="help-block">Global textual link color.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@link-hover-color">@link-hover-color</label>
     <input id="input-@link-hover-color" type="text" value="darken(@link-color, 15%)" data-var="@link-hover-color" class="form-control"/>
-    <p class="help-block">Link hover color set via <code>darken()</code> function</p>
+    <p class="help-block">Link hover color set via <code>darken()</code> function.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@link-hover-decoration">@link-hover-decoration</label>
     <input id="input-@link-hover-decoration" type="text" value="underline" data-var="@link-hover-decoration" class="form-control"/>
-    <p class="help-block">Link hover decoration</p>
+    <p class="help-block">Link hover decoration.</p>
   </div>
 </div>
 <h2 id="typography">Typography</h2>
-<p>Font, line-height, and color for body text, headings, and more</p>
+<p>Font, line-height, and color for body text, headings, and more.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@font-family-sans-serif">@font-family-sans-serif</label>
@@ -95,7 +95,7 @@
   <div class="col-xs-4">
     <label for="input-@font-family-monospace">@font-family-monospace</label>
     <input id="input-@font-family-monospace" type="text" value="Menlo, Monaco, Consolas, &quot;Courier New&quot;, monospace" data-var="@font-family-monospace" class="form-control"/>
-    <p class="help-block">Default monospace fonts for <code>&lt;code&gt;</code>, <code>&lt;kbd&gt;</code>, and <code>&lt;pre&gt;</code></p>
+    <p class="help-block">Default monospace fonts for <code>&lt;code&gt;</code>, <code>&lt;kbd&gt;</code>, and <code>&lt;pre&gt;</code>.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
@@ -144,18 +144,18 @@
   <div class="col-xs-4">
     <label for="input-@line-height-base">@line-height-base</label>
     <input id="input-@line-height-base" type="text" value="1.428571429" data-var="@line-height-base" class="form-control"/>
-    <p class="help-block">Unit-less <code>line-height</code> for use in components like buttons</p>
+    <p class="help-block">Unit-less <code>line-height</code> for use in components like buttons.</p>
   </div>
   <div class="col-xs-4">
     <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> * <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="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@headings-font-family">@headings-font-family</label>
     <input id="input-@headings-font-family" type="text" value="inherit" data-var="@headings-font-family" class="form-control"/>
-    <p class="help-block">By default, this inherits from the <code>&lt;body&gt;</code></p>
+    <p class="help-block">By default, this inherits from the <code>&lt;body&gt;</code>.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@headings-font-weight">@headings-font-weight</label>
@@ -172,26 +172,26 @@
   </div>
 </div>
 <h2 id="iconography">Iconography</h2>
-<p>Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower</p>
+<p>Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@icon-font-path">@icon-font-path</label>
     <input id="input-@icon-font-path" type="text" value="&quot;../fonts/&quot;" data-var="@icon-font-path" class="form-control"/>
-    <p class="help-block">Load fonts from this directory</p>
+    <p class="help-block">Load fonts from this directory.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@icon-font-name">@icon-font-name</label>
     <input id="input-@icon-font-name" type="text" value="&quot;glyphicons-halflings-regular&quot;" data-var="@icon-font-name" class="form-control"/>
-    <p class="help-block">File name for all font files</p>
+    <p class="help-block">File name for all font files.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@icon-font-svg-id">@icon-font-svg-id</label>
     <input id="input-@icon-font-svg-id" type="text" value="&quot;glyphicons_halflingsregular&quot;" data-var="@icon-font-svg-id" class="form-control"/>
-    <p class="help-block">Element ID within SVG icon file</p>
+    <p class="help-block">Element ID within SVG icon file.</p>
   </div>
 </div>
 <h2 id="components">Components</h2>
-<p>Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start)</p>
+<p>Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@padding-base-vertical">@padding-base-vertical</label>
@@ -252,53 +252,53 @@
   <div class="col-xs-4">
     <label for="input-@component-active-color">@component-active-color</label>
     <input id="input-@component-active-color" type="text" value="#fff" data-var="@component-active-color" class="form-control"/>
-    <p class="help-block">Global color for active items (e.g., navs or dropdowns)</p>
+    <p class="help-block">Global color for active items (e.g., navs or dropdowns).</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@component-active-bg">@component-active-bg</label>
     <input id="input-@component-active-bg" type="text" value="@brand-primary" data-var="@component-active-bg" class="form-control"/>
-    <p class="help-block">Global background color for active items (e.g., navs or dropdowns)</p>
+    <p class="help-block">Global background color for active items (e.g., navs or dropdowns).</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@caret-width-base">@caret-width-base</label>
     <input id="input-@caret-width-base" type="text" value="4px" data-var="@caret-width-base" class="form-control"/>
-    <p class="help-block">Width of the <code>border</code> for generating carets that indicator dropdowns</p>
+    <p class="help-block">Width of the <code>border</code> for generating carets that indicator dropdowns.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@caret-width-large">@caret-width-large</label>
     <input id="input-@caret-width-large" type="text" value="5px" data-var="@caret-width-large" class="form-control"/>
-    <p class="help-block">Carets increase slightly in size for larger components</p>
+    <p class="help-block">Carets increase slightly in size for larger components.</p>
   </div>
 </div>
 <h2 id="tables">Tables</h2>
-<p>Customizes the <code>.table</code> component with basic values, each used across all table variations</p>
+<p>Customizes the <code>.table</code> component with basic values, each used across all table variations.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@table-cell-padding">@table-cell-padding</label>
     <input id="input-@table-cell-padding" type="text" value="8px" data-var="@table-cell-padding" class="form-control"/>
-    <p class="help-block">Padding for <code>&lt;th&gt;</code>s and <code>&lt;td&gt;</code>s</p>
+    <p class="help-block">Padding for <code>&lt;th&gt;</code>s and <code>&lt;td&gt;</code>s.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@table-condensed-cell-padding">@table-condensed-cell-padding</label>
     <input id="input-@table-condensed-cell-padding" type="text" value="5px" data-var="@table-condensed-cell-padding" class="form-control"/>
-    <p class="help-block">Padding for cells in <code>.table-condensed</code></p>
+    <p class="help-block">Padding for cells in <code>.table-condensed</code>.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@table-bg">@table-bg</label>
     <input id="input-@table-bg" type="text" value="transparent" data-var="@table-bg" class="form-control"/>
-    <p class="help-block">Default background color used for all tables</p>
+    <p class="help-block">Default background color used for all tables.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@table-bg-accent">@table-bg-accent</label>
     <input id="input-@table-bg-accent" type="text" value="#f9f9f9" data-var="@table-bg-accent" class="form-control"/>
-    <p class="help-block">Background color used for <code>.table-striped</code></p>
+    <p class="help-block">Background color used for <code>.table-striped</code>.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@table-bg-hover">@table-bg-hover</label>
     <input id="input-@table-bg-hover" type="text" value="#f5f5f5" data-var="@table-bg-hover" class="form-control"/>
-    <p class="help-block">Background color used for <code>.table-hover</code></p>
+    <p class="help-block">Background color used for <code>.table-hover</code>.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@table-bg-active">@table-bg-active</label>
@@ -308,11 +308,11 @@
   <div class="col-xs-4">
     <label for="input-@table-border-color">@table-border-color</label>
     <input id="input-@table-border-color" type="text" value="#ddd" data-var="@table-border-color" class="form-control"/>
-    <p class="help-block">Border color for table and cell borders</p>
+    <p class="help-block">Border color for table and cell borders.</p>
   </div>
 </div>
 <h2 id="buttons">Buttons</h2>
-<p>For each of Bootstrap's buttons, define text, background and border color</p>
+<p>For each of Bootstrap's buttons, define text, background and border color.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@btn-font-weight">@btn-font-weight</label>
@@ -406,65 +406,65 @@
   <div class="col-xs-4">
     <label for="input-@input-bg">@input-bg</label>
     <input id="input-@input-bg" type="text" value="#fff" data-var="@input-bg" class="form-control"/>
-    <p class="help-block"><code>&lt;input&gt;</code> background colo</p>
+    <p class="help-block"><code>&lt;input&gt;</code> background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-bg-disabled">@input-bg-disabled</label>
     <input id="input-@input-bg-disabled" type="text" value="@gray-lighter" data-var="@input-bg-disabled" class="form-control"/>
-    <p class="help-block"><code>&lt;input disabled&gt;</code> background colo</p>
+    <p class="help-block"><code>&lt;input disabled&gt;</code> background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-color">@input-color</label>
     <input id="input-@input-color" type="text" value="@gray" data-var="@input-color" class="form-control"/>
-    <p class="help-block">Text color for <code>&lt;input&gt;</code></p>
+    <p class="help-block">Text color for <code>&lt;input&gt;</code>s</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@input-border">@input-border</label>
     <input id="input-@input-border" type="text" value="#ccc" data-var="@input-border" class="form-control"/>
-    <p class="help-block"><code>&lt;input&gt;</code> border colo</p>
+    <p class="help-block"><code>&lt;input&gt;</code> border color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-border-radius">@input-border-radius</label>
     <input id="input-@input-border-radius" type="text" value="@border-radius-base" data-var="@input-border-radius" class="form-control"/>
-    <p class="help-block">Default <code>.form-control</code> border radiu</p>
+    <p class="help-block">Default <code>.form-control</code> border radius</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-border-radius-large">@input-border-radius-large</label>
     <input id="input-@input-border-radius-large" type="text" value="@border-radius-large" data-var="@input-border-radius-large" class="form-control"/>
-    <p class="help-block">Large <code>.form-control</code> border radiu</p>
+    <p class="help-block">Large <code>.form-control</code> border radius</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@input-border-radius-small">@input-border-radius-small</label>
     <input id="input-@input-border-radius-small" type="text" value="@border-radius-small" data-var="@input-border-radius-small" class="form-control"/>
-    <p class="help-block">Small <code>.form-control</code> border radiu</p>
+    <p class="help-block">Small <code>.form-control</code> border radius</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-border-focus">@input-border-focus</label>
     <input id="input-@input-border-focus" type="text" value="#66afe9" data-var="@input-border-focus" class="form-control"/>
-    <p class="help-block">Border color for inputs on focu</p>
+    <p class="help-block">Border color for inputs on focus</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-color-placeholder">@input-color-placeholder</label>
     <input id="input-@input-color-placeholder" type="text" value="#999" data-var="@input-color-placeholder" class="form-control"/>
-    <p class="help-block">Placeholder text colo</p>
+    <p class="help-block">Placeholder text color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@input-height-base">@input-height-base</label>
     <input id="input-@input-height-base" type="text" value="(@line-height-computed + (@padding-base-vertical * 2) + 2)" data-var="@input-height-base" class="form-control"/>
-    <p class="help-block">Default <code>.form-control</code> heigh</p>
+    <p class="help-block">Default <code>.form-control</code> height</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-height-large">@input-height-large</label>
     <input id="input-@input-height-large" type="text" value="(ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2)" data-var="@input-height-large" class="form-control"/>
-    <p class="help-block">Large <code>.form-control</code> heigh</p>
+    <p class="help-block">Large <code>.form-control</code> height</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@input-height-small">@input-height-small</label>
     <input id="input-@input-height-small" type="text" value="(floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2)" data-var="@input-height-small" class="form-control"/>
-    <p class="help-block">Small <code>.form-control</code> heigh</p>
+    <p class="help-block">Small <code>.form-control</code> height</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
@@ -478,110 +478,110 @@
   <div class="col-xs-4">
     <label for="input-@input-group-addon-bg">@input-group-addon-bg</label>
     <input id="input-@input-group-addon-bg" type="text" value="@gray-lighter" data-var="@input-group-addon-bg" class="form-control"/>
-    <p class="help-block">Background color for textual input addon</p>
+    <p class="help-block">Background color for textual input addons</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@input-group-addon-border-color">@input-group-addon-border-color</label>
     <input id="input-@input-group-addon-border-color" type="text" value="@input-border" data-var="@input-group-addon-border-color" class="form-control"/>
-    <p class="help-block">Border color for textual input addon</p>
+    <p class="help-block">Border color for textual input addons</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@cursor-disabled">@cursor-disabled</label>
     <input id="input-@cursor-disabled" type="text" value="not-allowed" data-var="@cursor-disabled" class="form-control"/>
-    <p class="help-block">Disabled cursor for form controls and buttons</p>
+    <p class="help-block">Disabled cursor for form controls and buttons.</p>
   </div>
 </div>
 <h2 id="dropdowns">Dropdowns</h2>
-<p>Dropdown menu container and contents</p>
+<p>Dropdown menu container and contents.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@dropdown-bg">@dropdown-bg</label>
     <input id="input-@dropdown-bg" type="text" value="#fff" data-var="@dropdown-bg" class="form-control"/>
-    <p class="help-block">Background for the dropdown menu</p>
+    <p class="help-block">Background for the dropdown menu.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-border">@dropdown-border</label>
     <input id="input-@dropdown-border" type="text" value="rgba(0,0,0,.15)" data-var="@dropdown-border" class="form-control"/>
-    <p class="help-block">Dropdown menu <code>border-color</code></p>
+    <p class="help-block">Dropdown menu <code>border-color</code>.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-fallback-border">@dropdown-fallback-border</label>
     <input id="input-@dropdown-fallback-border" type="text" value="#ccc" data-var="@dropdown-fallback-border" class="form-control"/>
-    <p class="help-block">Dropdown menu <code>border-color</code> <strong>for IE8</strong></p>
+    <p class="help-block">Dropdown menu <code>border-color</code> <strong>for IE8</strong>.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@dropdown-divider-bg">@dropdown-divider-bg</label>
     <input id="input-@dropdown-divider-bg" type="text" value="#e5e5e5" data-var="@dropdown-divider-bg" class="form-control"/>
-    <p class="help-block">Divider color for between dropdown items</p>
+    <p class="help-block">Divider color for between dropdown items.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-color">@dropdown-link-color</label>
     <input id="input-@dropdown-link-color" type="text" value="@gray-dark" data-var="@dropdown-link-color" class="form-control"/>
-    <p class="help-block">Dropdown link text color</p>
+    <p class="help-block">Dropdown link text color.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-hover-color">@dropdown-link-hover-color</label>
     <input id="input-@dropdown-link-hover-color" type="text" value="darken(@gray-dark, 5%)" data-var="@dropdown-link-hover-color" class="form-control"/>
-    <p class="help-block">Hover color for dropdown links</p>
+    <p class="help-block">Hover color for dropdown links.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-hover-bg">@dropdown-link-hover-bg</label>
     <input id="input-@dropdown-link-hover-bg" type="text" value="#f5f5f5" data-var="@dropdown-link-hover-bg" class="form-control"/>
-    <p class="help-block">Hover background for dropdown links</p>
+    <p class="help-block">Hover background for dropdown links.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-active-color">@dropdown-link-active-color</label>
     <input id="input-@dropdown-link-active-color" type="text" value="@component-active-color" data-var="@dropdown-link-active-color" class="form-control"/>
-    <p class="help-block">Active dropdown menu item text color</p>
+    <p class="help-block">Active dropdown menu item text color.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-active-bg">@dropdown-link-active-bg</label>
     <input id="input-@dropdown-link-active-bg" type="text" value="@component-active-bg" data-var="@dropdown-link-active-bg" class="form-control"/>
-    <p class="help-block">Active dropdown menu item background color</p>
+    <p class="help-block">Active dropdown menu item background color.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@dropdown-link-disabled-color">@dropdown-link-disabled-color</label>
     <input id="input-@dropdown-link-disabled-color" type="text" value="@gray-light" data-var="@dropdown-link-disabled-color" class="form-control"/>
-    <p class="help-block">Disabled dropdown menu item background color</p>
+    <p class="help-block">Disabled dropdown menu item background color.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-header-color">@dropdown-header-color</label>
     <input id="input-@dropdown-header-color" type="text" value="@gray-light" data-var="@dropdown-header-color" class="form-control"/>
-    <p class="help-block">Text color for headers within dropdown menus</p>
+    <p class="help-block">Text color for headers within dropdown menus.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dropdown-caret-color">@dropdown-caret-color</label>
     <input id="input-@dropdown-caret-color" type="text" value="#000" data-var="@dropdown-caret-color" class="form-control"/>
-    <p class="help-block">Deprecated <code>@dropdown-caret-color</code> as of v3.1.</p>
+    <p class="help-block">Deprecated <code>@dropdown-caret-color</code> as of v3.1.0</p>
   </div>
 </div>
 <h2 id="media-queries-breakpoints">Media queries breakpoints</h2>
-<p>Define the breakpoints at which your layout will change, adapting to different screen sizes</p>
+<p>Define the breakpoints at which your layout will change, adapting to different screen sizes.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@screen-xs">@screen-xs</label>
     <input id="input-@screen-xs" type="text" value="480px" data-var="@screen-xs" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-xs</code> as of v3.0.</p>
+    <p class="help-block">Deprecated <code>@screen-xs</code> as of v3.0.1</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@screen-xs-min">@screen-xs-min</label>
     <input id="input-@screen-xs-min" type="text" value="@screen-xs" data-var="@screen-xs-min" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-xs-min</code> as of v3.2.</p>
+    <p class="help-block">Deprecated <code>@screen-xs-min</code> as of v3.2.0</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@screen-phone">@screen-phone</label>
     <input id="input-@screen-phone" type="text" value="@screen-xs-min" data-var="@screen-phone" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-phone</code> as of v3.0.</p>
+    <p class="help-block">Deprecated <code>@screen-phone</code> as of v3.0.1</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@screen-sm">@screen-sm</label>
     <input id="input-@screen-sm" type="text" value="768px" data-var="@screen-sm" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-sm</code> as of v3.0.</p>
+    <p class="help-block">Deprecated <code>@screen-sm</code> as of v3.0.1</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@screen-sm-min">@screen-sm-min</label>
@@ -590,13 +590,13 @@
   <div class="col-xs-4">
     <label for="input-@screen-tablet">@screen-tablet</label>
     <input id="input-@screen-tablet" type="text" value="@screen-sm-min" data-var="@screen-tablet" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-tablet</code> as of v3.0.</p>
+    <p class="help-block">Deprecated <code>@screen-tablet</code> as of v3.0.1</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@screen-md">@screen-md</label>
     <input id="input-@screen-md" type="text" value="992px" data-var="@screen-md" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-md</code> as of v3.0.</p>
+    <p class="help-block">Deprecated <code>@screen-md</code> as of v3.0.1</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@screen-md-min">@screen-md-min</label>
@@ -605,13 +605,13 @@
   <div class="col-xs-4">
     <label for="input-@screen-desktop">@screen-desktop</label>
     <input id="input-@screen-desktop" type="text" value="@screen-md-min" data-var="@screen-desktop" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-desktop</code> as of v3.0.</p>
+    <p class="help-block">Deprecated <code>@screen-desktop</code> as of v3.0.1</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@screen-lg">@screen-lg</label>
     <input id="input-@screen-lg" type="text" value="1200px" data-var="@screen-lg" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-lg</code> as of v3.0.</p>
+    <p class="help-block">Deprecated <code>@screen-lg</code> as of v3.0.1</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@screen-lg-min">@screen-lg-min</label>
@@ -620,7 +620,7 @@
   <div class="col-xs-4">
     <label for="input-@screen-lg-desktop">@screen-lg-desktop</label>
     <input id="input-@screen-lg-desktop" type="text" value="@screen-lg-min" data-var="@screen-lg-desktop" class="form-control"/>
-    <p class="help-block">Deprecated <code>@screen-lg-desktop</code> as of v3.0.</p>
+    <p class="help-block">Deprecated <code>@screen-lg-desktop</code> as of v3.0.1</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
@@ -637,32 +637,32 @@
   </div>
 </div>
 <h2 id="grid-system">Grid system</h2>
-<p>Define your custom responsive grid</p>
+<p>Define your custom responsive grid.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@grid-columns">@grid-columns</label>
     <input id="input-@grid-columns" type="text" value="12" data-var="@grid-columns" class="form-control"/>
-    <p class="help-block">Number of columns in the grid</p>
+    <p class="help-block">Number of columns in the grid.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@grid-gutter-width">@grid-gutter-width</label>
     <input id="input-@grid-gutter-width" type="text" value="30px" data-var="@grid-gutter-width" class="form-control"/>
-    <p class="help-block">Padding between columns. Gets divided in half for the left and right</p>
+    <p class="help-block">Padding between columns. Gets divided in half for the left and right.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@grid-float-breakpoint">@grid-float-breakpoint</label>
     <input id="input-@grid-float-breakpoint" type="text" value="@screen-sm-min" data-var="@grid-float-breakpoint" class="form-control"/>
-    <p class="help-block">Point at which the navbar becomes uncollapsed</p>
+    <p class="help-block">Point at which the navbar becomes uncollapsed.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@grid-float-breakpoint-max">@grid-float-breakpoint-max</label>
     <input id="input-@grid-float-breakpoint-max" type="text" value="(@grid-float-breakpoint - 1)" data-var="@grid-float-breakpoint-max" class="form-control"/>
-    <p class="help-block">Point at which the navbar begins collapsing</p>
+    <p class="help-block">Point at which the navbar begins collapsing.</p>
   </div>
 </div>
 <h2 id="container-sizes">Container sizes</h2>
-<p>Define the maximum width of <code>.container</code> for different screen sizes</p>
+<p>Define the maximum width of <code>.container</code> for different screen sizes.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@container-tablet">@container-tablet</label>
@@ -671,7 +671,7 @@
   <div class="col-xs-4">
     <label for="input-@container-sm">@container-sm</label>
     <input id="input-@container-sm" type="text" value="@container-tablet" data-var="@container-sm" class="form-control"/>
-    <p class="help-block">For <code>@screen-sm-min</code> and up</p>
+    <p class="help-block">For <code>@screen-sm-min</code> and up.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@container-desktop">@container-desktop</label>
@@ -681,7 +681,7 @@
   <div class="col-xs-4">
     <label for="input-@container-md">@container-md</label>
     <input id="input-@container-md" type="text" value="@container-desktop" data-var="@container-md" class="form-control"/>
-    <p class="help-block">For <code>@screen-md-min</code> and up</p>
+    <p class="help-block">For <code>@screen-md-min</code> and up.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@container-large-desktop">@container-large-desktop</label>
@@ -690,7 +690,7 @@
   <div class="col-xs-4">
     <label for="input-@container-lg">@container-lg</label>
     <input id="input-@container-lg" type="text" value="@container-large-desktop" data-var="@container-lg" class="form-control"/>
-    <p class="help-block">For <code>@screen-lg-min</code> and up</p>
+    <p class="help-block">For <code>@screen-lg-min</code> and up.</p>
   </div>
 </div>
 <h2 id="navbar">Navbar</h2>
@@ -1041,7 +1041,7 @@
   </div>
 </div>
 <h2 id="form-states-and-alerts">Form states and alerts</h2>
-<p>Define colors for form feedback states and, by default, alerts</p>
+<p>Define colors for form feedback states and, by default, alerts.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@state-success-text">@state-success-text</label>
@@ -1100,17 +1100,17 @@
   <div class="col-xs-4">
     <label for="input-@tooltip-max-width">@tooltip-max-width</label>
     <input id="input-@tooltip-max-width" type="text" value="200px" data-var="@tooltip-max-width" class="form-control"/>
-    <p class="help-block">Tooltip max widt</p>
+    <p class="help-block">Tooltip max width</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@tooltip-color">@tooltip-color</label>
     <input id="input-@tooltip-color" type="text" value="#fff" data-var="@tooltip-color" class="form-control"/>
-    <p class="help-block">Tooltip text colo</p>
+    <p class="help-block">Tooltip text color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@tooltip-bg">@tooltip-bg</label>
     <input id="input-@tooltip-bg" type="text" value="#000" data-var="@tooltip-bg" class="form-control"/>
-    <p class="help-block">Tooltip background colo</p>
+    <p class="help-block">Tooltip background color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
@@ -1120,12 +1120,12 @@
   <div class="col-xs-4">
     <label for="input-@tooltip-arrow-width">@tooltip-arrow-width</label>
     <input id="input-@tooltip-arrow-width" type="text" value="5px" data-var="@tooltip-arrow-width" class="form-control"/>
-    <p class="help-block">Tooltip arrow widt</p>
+    <p class="help-block">Tooltip arrow width</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@tooltip-arrow-color">@tooltip-arrow-color</label>
     <input id="input-@tooltip-arrow-color" type="text" value="@tooltip-bg" data-var="@tooltip-arrow-color" class="form-control"/>
-    <p class="help-block">Tooltip arrow colo</p>
+    <p class="help-block">Tooltip arrow color</p>
   </div>
 </div>
 <h2 id="popovers">Popovers</h2>
@@ -1133,55 +1133,55 @@
   <div class="col-xs-4">
     <label for="input-@popover-bg">@popover-bg</label>
     <input id="input-@popover-bg" type="text" value="#fff" data-var="@popover-bg" class="form-control"/>
-    <p class="help-block">Popover body background colo</p>
+    <p class="help-block">Popover body background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-max-width">@popover-max-width</label>
     <input id="input-@popover-max-width" type="text" value="276px" data-var="@popover-max-width" class="form-control"/>
-    <p class="help-block">Popover maximum widt</p>
+    <p class="help-block">Popover maximum width</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-border-color">@popover-border-color</label>
     <input id="input-@popover-border-color" type="text" value="rgba(0,0,0,.2)" data-var="@popover-border-color" class="form-control"/>
-    <p class="help-block">Popover border colo</p>
+    <p class="help-block">Popover border color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@popover-fallback-border-color">@popover-fallback-border-color</label>
     <input id="input-@popover-fallback-border-color" type="text" value="#ccc" data-var="@popover-fallback-border-color" class="form-control"/>
-    <p class="help-block">Popover fallback border colo</p>
+    <p class="help-block">Popover fallback border color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-title-bg">@popover-title-bg</label>
     <input id="input-@popover-title-bg" type="text" value="darken(@popover-bg, 3%)" data-var="@popover-title-bg" class="form-control"/>
-    <p class="help-block">Popover title background colo</p>
+    <p class="help-block">Popover title background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-arrow-width">@popover-arrow-width</label>
     <input id="input-@popover-arrow-width" type="text" value="10px" data-var="@popover-arrow-width" class="form-control"/>
-    <p class="help-block">Popover arrow widt</p>
+    <p class="help-block">Popover arrow width</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@popover-arrow-color">@popover-arrow-color</label>
     <input id="input-@popover-arrow-color" type="text" value="@popover-bg" data-var="@popover-arrow-color" class="form-control"/>
-    <p class="help-block">Popover arrow colo</p>
+    <p class="help-block">Popover arrow color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-arrow-outer-width">@popover-arrow-outer-width</label>
     <input id="input-@popover-arrow-outer-width" type="text" value="(@popover-arrow-width + 1)" data-var="@popover-arrow-outer-width" class="form-control"/>
-    <p class="help-block">Popover outer arrow widt</p>
+    <p class="help-block">Popover outer arrow width</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@popover-arrow-outer-color">@popover-arrow-outer-color</label>
     <input id="input-@popover-arrow-outer-color" type="text" value="fadein(@popover-border-color, 5%)" data-var="@popover-arrow-outer-color" class="form-control"/>
-    <p class="help-block">Popover outer arrow colo</p>
+    <p class="help-block">Popover outer arrow color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@popover-arrow-outer-fallback-color">@popover-arrow-outer-fallback-color</label>
     <input id="input-@popover-arrow-outer-fallback-color" type="text" value="darken(@popover-fallback-border-color, 20%)" data-var="@popover-arrow-outer-fallback-color" class="form-control"/>
-    <p class="help-block">Popover outer arrow fallback colo</p>
+    <p class="help-block">Popover outer arrow fallback color</p>
   </div>
 </div>
 <h2 id="labels">Labels</h2>
@@ -1189,44 +1189,44 @@
   <div class="col-xs-4">
     <label for="input-@label-default-bg">@label-default-bg</label>
     <input id="input-@label-default-bg" type="text" value="@gray-light" data-var="@label-default-bg" class="form-control"/>
-    <p class="help-block">Default label background colo</p>
+    <p class="help-block">Default label background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@label-primary-bg">@label-primary-bg</label>
     <input id="input-@label-primary-bg" type="text" value="@brand-primary" data-var="@label-primary-bg" class="form-control"/>
-    <p class="help-block">Primary label background colo</p>
+    <p class="help-block">Primary label background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@label-success-bg">@label-success-bg</label>
     <input id="input-@label-success-bg" type="text" value="@brand-success" data-var="@label-success-bg" class="form-control"/>
-    <p class="help-block">Success label background colo</p>
+    <p class="help-block">Success label background color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@label-info-bg">@label-info-bg</label>
     <input id="input-@label-info-bg" type="text" value="@brand-info" data-var="@label-info-bg" class="form-control"/>
-    <p class="help-block">Info label background colo</p>
+    <p class="help-block">Info label background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@label-warning-bg">@label-warning-bg</label>
     <input id="input-@label-warning-bg" type="text" value="@brand-warning" data-var="@label-warning-bg" class="form-control"/>
-    <p class="help-block">Warning label background colo</p>
+    <p class="help-block">Warning label background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@label-danger-bg">@label-danger-bg</label>
     <input id="input-@label-danger-bg" type="text" value="@brand-danger" data-var="@label-danger-bg" class="form-control"/>
-    <p class="help-block">Danger label background colo</p>
+    <p class="help-block">Danger label background color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@label-color">@label-color</label>
     <input id="input-@label-color" type="text" value="#fff" data-var="@label-color" class="form-control"/>
-    <p class="help-block">Default label text colo</p>
+    <p class="help-block">Default label text color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@label-link-hover-color">@label-link-hover-color</label>
     <input id="input-@label-link-hover-color" type="text" value="#fff" data-var="@label-link-hover-color" class="form-control"/>
-    <p class="help-block">Default text color of a linked labe</p>
+    <p class="help-block">Default text color of a linked label</p>
   </div>
 </div>
 <h2 id="modals">Modals</h2>
@@ -1234,55 +1234,55 @@
   <div class="col-xs-4">
     <label for="input-@modal-inner-padding">@modal-inner-padding</label>
     <input id="input-@modal-inner-padding" type="text" value="15px" data-var="@modal-inner-padding" class="form-control"/>
-    <p class="help-block">Padding applied to the modal bod</p>
+    <p class="help-block">Padding applied to the modal body</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-title-padding">@modal-title-padding</label>
     <input id="input-@modal-title-padding" type="text" value="15px" data-var="@modal-title-padding" class="form-control"/>
-    <p class="help-block">Padding applied to the modal titl</p>
+    <p class="help-block">Padding applied to the modal title</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-title-line-height">@modal-title-line-height</label>
     <input id="input-@modal-title-line-height" type="text" value="@line-height-base" data-var="@modal-title-line-height" class="form-control"/>
-    <p class="help-block">Modal title line-heigh</p>
+    <p class="help-block">Modal title line-height</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@modal-content-bg">@modal-content-bg</label>
     <input id="input-@modal-content-bg" type="text" value="#fff" data-var="@modal-content-bg" class="form-control"/>
-    <p class="help-block">Background color of modal content are</p>
+    <p class="help-block">Background color of modal content area</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-content-border-color">@modal-content-border-color</label>
     <input id="input-@modal-content-border-color" type="text" value="rgba(0,0,0,.2)" data-var="@modal-content-border-color" class="form-control"/>
-    <p class="help-block">Modal content border colo</p>
+    <p class="help-block">Modal content border color</p>
   </div>
   <div class="col-xs-4">
     <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 *<em>for IE8</em></p>
+    <p class="help-block">Modal content border color <strong>for IE8</strong></p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@modal-backdrop-bg">@modal-backdrop-bg</label>
     <input id="input-@modal-backdrop-bg" type="text" value="#000" data-var="@modal-backdrop-bg" class="form-control"/>
-    <p class="help-block">Modal backdrop background colo</p>
+    <p class="help-block">Modal backdrop background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-backdrop-opacity">@modal-backdrop-opacity</label>
     <input id="input-@modal-backdrop-opacity" type="text" value=".5" data-var="@modal-backdrop-opacity" class="form-control"/>
-    <p class="help-block">Modal backdrop opacit</p>
+    <p class="help-block">Modal backdrop opacity</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-header-border-color">@modal-header-border-color</label>
     <input id="input-@modal-header-border-color" type="text" value="#e5e5e5" data-var="@modal-header-border-color" class="form-control"/>
-    <p class="help-block">Modal header border colo</p>
+    <p class="help-block">Modal header border color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@modal-footer-border-color">@modal-footer-border-color</label>
     <input id="input-@modal-footer-border-color" type="text" value="@modal-header-border-color" data-var="@modal-footer-border-color" class="form-control"/>
-    <p class="help-block">Modal footer border colo</p>
+    <p class="help-block">Modal footer border color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@modal-lg">@modal-lg</label>
@@ -1299,7 +1299,7 @@
   </div>
 </div>
 <h2 id="alerts">Alerts</h2>
-<p>Define alert colors, border radius, and padding</p>
+<p>Define alert colors, border radius, and padding.</p>
 <div class="row">
   <div class="col-xs-4">
     <label for="input-@alert-padding">@alert-padding</label>
@@ -1371,44 +1371,44 @@
   <div class="col-xs-4">
     <label for="input-@progress-bg">@progress-bg</label>
     <input id="input-@progress-bg" type="text" value="#f5f5f5" data-var="@progress-bg" class="form-control"/>
-    <p class="help-block">Background color of the whole progress componen</p>
+    <p class="help-block">Background color of the whole progress component</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-color">@progress-bar-color</label>
     <input id="input-@progress-bar-color" type="text" value="#fff" data-var="@progress-bar-color" class="form-control"/>
-    <p class="help-block">Progress bar text colo</p>
+    <p class="help-block">Progress bar text color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@progress-border-radius">@progress-border-radius</label>
     <input id="input-@progress-border-radius" type="text" value="@border-radius-base" data-var="@progress-border-radius" class="form-control"/>
-    <p class="help-block">Variable for setting rounded corners on progress bar</p>
+    <p class="help-block">Variable for setting rounded corners on progress bar.</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-bg">@progress-bar-bg</label>
     <input id="input-@progress-bar-bg" type="text" value="@brand-primary" data-var="@progress-bar-bg" class="form-control"/>
-    <p class="help-block">Default progress bar colo</p>
+    <p class="help-block">Default progress bar color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-success-bg">@progress-bar-success-bg</label>
     <input id="input-@progress-bar-success-bg" type="text" value="@brand-success" data-var="@progress-bar-success-bg" class="form-control"/>
-    <p class="help-block">Success progress bar colo</p>
+    <p class="help-block">Success progress bar color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-warning-bg">@progress-bar-warning-bg</label>
     <input id="input-@progress-bar-warning-bg" type="text" value="@brand-warning" data-var="@progress-bar-warning-bg" class="form-control"/>
-    <p class="help-block">Warning progress bar colo</p>
+    <p class="help-block">Warning progress bar color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-danger-bg">@progress-bar-danger-bg</label>
     <input id="input-@progress-bar-danger-bg" type="text" value="@brand-danger" data-var="@progress-bar-danger-bg" class="form-control"/>
-    <p class="help-block">Danger progress bar colo</p>
+    <p class="help-block">Danger progress bar color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@progress-bar-info-bg">@progress-bar-info-bg</label>
     <input id="input-@progress-bar-info-bg" type="text" value="@brand-info" data-var="@progress-bar-info-bg" class="form-control"/>
-    <p class="help-block">Info progress bar colo</p>
+    <p class="help-block">Info progress bar color</p>
   </div>
 </div>
 <h2 id="list-group">List group</h2>
@@ -1416,60 +1416,60 @@
   <div class="col-xs-4">
     <label for="input-@list-group-bg">@list-group-bg</label>
     <input id="input-@list-group-bg" type="text" value="#fff" data-var="@list-group-bg" class="form-control"/>
-    <p class="help-block">Background color on `.list-group-item</p>
+    <p class="help-block">Background color on <code>.list-group-item</code></p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-border">@list-group-border</label>
     <input id="input-@list-group-border" type="text" value="#ddd" data-var="@list-group-border" class="form-control"/>
-    <p class="help-block"><code>.list-group-item</code> border colo</p>
+    <p class="help-block"><code>.list-group-item</code> border color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-border-radius">@list-group-border-radius</label>
     <input id="input-@list-group-border-radius" type="text" value="@border-radius-base" data-var="@list-group-border-radius" class="form-control"/>
-    <p class="help-block">List group border radiu</p>
+    <p class="help-block">List group border radius</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@list-group-hover-bg">@list-group-hover-bg</label>
     <input id="input-@list-group-hover-bg" type="text" value="#f5f5f5" data-var="@list-group-hover-bg" class="form-control"/>
-    <p class="help-block">Background color of single list items on hove</p>
+    <p class="help-block">Background color of single list items on hover</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-active-color">@list-group-active-color</label>
     <input id="input-@list-group-active-color" type="text" value="@component-active-color" data-var="@list-group-active-color" class="form-control"/>
-    <p class="help-block">Text color of active list item</p>
+    <p class="help-block">Text color of active list items</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-active-bg">@list-group-active-bg</label>
     <input id="input-@list-group-active-bg" type="text" value="@component-active-bg" data-var="@list-group-active-bg" class="form-control"/>
-    <p class="help-block">Background color of active list item</p>
+    <p class="help-block">Background color of active list items</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@list-group-active-border">@list-group-active-border</label>
     <input id="input-@list-group-active-border" type="text" value="@list-group-active-bg" data-var="@list-group-active-border" class="form-control"/>
-    <p class="help-block">Border color of active list element</p>
+    <p class="help-block">Border color of active list elements</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-active-text-color">@list-group-active-text-color</label>
     <input id="input-@list-group-active-text-color" type="text" value="lighten(@list-group-active-bg, 40%)" data-var="@list-group-active-text-color" class="form-control"/>
-    <p class="help-block">Text color for content within active list item</p>
+    <p class="help-block">Text color for content within active list items</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-disabled-color">@list-group-disabled-color</label>
     <input id="input-@list-group-disabled-color" type="text" value="@gray-light" data-var="@list-group-disabled-color" class="form-control"/>
-    <p class="help-block">Text color of disabled list item</p>
+    <p class="help-block">Text color of disabled list items</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@list-group-disabled-bg">@list-group-disabled-bg</label>
     <input id="input-@list-group-disabled-bg" type="text" value="@gray-lighter" data-var="@list-group-disabled-bg" class="form-control"/>
-    <p class="help-block">Background color of disabled list item</p>
+    <p class="help-block">Background color of disabled list items</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-disabled-text-color">@list-group-disabled-text-color</label>
     <input id="input-@list-group-disabled-text-color" type="text" value="@list-group-disabled-color" data-var="@list-group-disabled-text-color" class="form-control"/>
-    <p class="help-block">Text color for content within disabled list item</p>
+    <p class="help-block">Text color for content within disabled list items</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@list-group-link-color">@list-group-link-color</label>
@@ -1511,7 +1511,7 @@
   <div class="col-xs-4">
     <label for="input-@panel-inner-border">@panel-inner-border</label>
     <input id="input-@panel-inner-border" type="text" value="#ddd" data-var="@panel-inner-border" class="form-control"/>
-    <p class="help-block">Border color for elements within panel</p>
+    <p class="help-block">Border color for elements within panels</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
@@ -1602,33 +1602,33 @@
   <div class="col-xs-4">
     <label for="input-@thumbnail-padding">@thumbnail-padding</label>
     <input id="input-@thumbnail-padding" type="text" value="4px" data-var="@thumbnail-padding" class="form-control"/>
-    <p class="help-block">Padding around the thumbnail imag</p>
+    <p class="help-block">Padding around the thumbnail image</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@thumbnail-bg">@thumbnail-bg</label>
     <input id="input-@thumbnail-bg" type="text" value="@body-bg" data-var="@thumbnail-bg" class="form-control"/>
-    <p class="help-block">Thumbnail background colo</p>
+    <p class="help-block">Thumbnail background color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@thumbnail-border">@thumbnail-border</label>
     <input id="input-@thumbnail-border" type="text" value="#ddd" data-var="@thumbnail-border" class="form-control"/>
-    <p class="help-block">Thumbnail border colo</p>
+    <p class="help-block">Thumbnail border color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@thumbnail-border-radius">@thumbnail-border-radius</label>
     <input id="input-@thumbnail-border-radius" type="text" value="@border-radius-base" data-var="@thumbnail-border-radius" class="form-control"/>
-    <p class="help-block">Thumbnail border radiu</p>
+    <p class="help-block">Thumbnail border radius</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@thumbnail-caption-color">@thumbnail-caption-color</label>
     <input id="input-@thumbnail-caption-color" type="text" value="@text-color" data-var="@thumbnail-caption-color" class="form-control"/>
-    <p class="help-block">Custom text color for thumbnail caption</p>
+    <p class="help-block">Custom text color for thumbnail captions</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@thumbnail-caption-padding">@thumbnail-caption-padding</label>
     <input id="input-@thumbnail-caption-padding" type="text" value="9px" data-var="@thumbnail-caption-padding" class="form-control"/>
-    <p class="help-block">Padding around the thumbnail captio</p>
+    <p class="help-block">Padding around the thumbnail caption</p>
   </div>
 </div>
 <h2 id="wells">Wells</h2>
@@ -1651,7 +1651,7 @@
   <div class="col-xs-4">
     <label for="input-@badge-link-hover-color">@badge-link-hover-color</label>
     <input id="input-@badge-link-hover-color" type="text" value="#fff" data-var="@badge-link-hover-color" class="form-control"/>
-    <p class="help-block">Linked badge text color on hove</p>
+    <p class="help-block">Linked badge text color on hover</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@badge-bg">@badge-bg</label>
@@ -1661,12 +1661,12 @@
   <div class="col-xs-4">
     <label for="input-@badge-active-color">@badge-active-color</label>
     <input id="input-@badge-active-color" type="text" value="@link-color" data-var="@badge-active-color" class="form-control"/>
-    <p class="help-block">Badge text color in active nav lin</p>
+    <p class="help-block">Badge text color in active nav link</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@badge-active-bg">@badge-active-bg</label>
     <input id="input-@badge-active-bg" type="text" value="#fff" data-var="@badge-active-bg" class="form-control"/>
-    <p class="help-block">Badge background color in active nav lin</p>
+    <p class="help-block">Badge background color in active nav link</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@badge-font-weight">@badge-font-weight</label>
@@ -1695,23 +1695,23 @@
   <div class="col-xs-4">
     <label for="input-@breadcrumb-bg">@breadcrumb-bg</label>
     <input id="input-@breadcrumb-bg" type="text" value="#f5f5f5" data-var="@breadcrumb-bg" class="form-control"/>
-    <p class="help-block">Breadcrumb background colo</p>
+    <p class="help-block">Breadcrumb background color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@breadcrumb-color">@breadcrumb-color</label>
     <input id="input-@breadcrumb-color" type="text" value="#ccc" data-var="@breadcrumb-color" class="form-control"/>
-    <p class="help-block">Breadcrumb text colo</p>
+    <p class="help-block">Breadcrumb text color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@breadcrumb-active-color">@breadcrumb-active-color</label>
     <input id="input-@breadcrumb-active-color" type="text" value="@gray-light" data-var="@breadcrumb-active-color" class="form-control"/>
-    <p class="help-block">Text color of current page in the breadcrum</p>
+    <p class="help-block">Text color of current page in the breadcrumb</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@breadcrumb-separator">@breadcrumb-separator</label>
     <input id="input-@breadcrumb-separator" type="text" value="&quot;/&quot;" data-var="@breadcrumb-separator" class="form-control"/>
-    <p class="help-block">Textual separator for between breadcrumb element</p>
+    <p class="help-block">Textual separator for between breadcrumb elements</p>
   </div>
 </div>
 <h2 id="carousel">Carousel</h2>
@@ -1808,55 +1808,55 @@
   <div class="col-xs-4">
     <label for="input-@component-offset-horizontal">@component-offset-horizontal</label>
     <input id="input-@component-offset-horizontal" type="text" value="180px" data-var="@component-offset-horizontal" class="form-control"/>
-    <p class="help-block">Horizontal offset for forms and lists</p>
+    <p class="help-block">Horizontal offset for forms and lists.</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@text-muted">@text-muted</label>
     <input id="input-@text-muted" type="text" value="@gray-light" data-var="@text-muted" class="form-control"/>
-    <p class="help-block">Text muted colo</p>
+    <p class="help-block">Text muted color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@abbr-border-color">@abbr-border-color</label>
     <input id="input-@abbr-border-color" type="text" value="@gray-light" data-var="@abbr-border-color" class="form-control"/>
-    <p class="help-block">Abbreviations and acronyms border colo</p>
+    <p class="help-block">Abbreviations and acronyms border color</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@headings-small-color">@headings-small-color</label>
     <input id="input-@headings-small-color" type="text" value="@gray-light" data-var="@headings-small-color" class="form-control"/>
-    <p class="help-block">Headings small colo</p>
+    <p class="help-block">Headings small color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@blockquote-small-color">@blockquote-small-color</label>
     <input id="input-@blockquote-small-color" type="text" value="@gray-light" data-var="@blockquote-small-color" class="form-control"/>
-    <p class="help-block">Blockquote small colo</p>
+    <p class="help-block">Blockquote small color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@blockquote-font-size">@blockquote-font-size</label>
     <input id="input-@blockquote-font-size" type="text" value="(@font-size-base * 1.25)" data-var="@blockquote-font-size" class="form-control"/>
-    <p class="help-block">Blockquote font siz</p>
+    <p class="help-block">Blockquote font size</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@blockquote-border-color">@blockquote-border-color</label>
     <input id="input-@blockquote-border-color" type="text" value="@gray-lighter" data-var="@blockquote-border-color" class="form-control"/>
-    <p class="help-block">Blockquote border colo</p>
+    <p class="help-block">Blockquote border color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@page-header-border-color">@page-header-border-color</label>
     <input id="input-@page-header-border-color" type="text" value="@gray-lighter" data-var="@page-header-border-color" class="form-control"/>
-    <p class="help-block">Page header border colo</p>
+    <p class="help-block">Page header border color</p>
   </div>
   <div class="col-xs-4">
     <label for="input-@dl-horizontal-offset">@dl-horizontal-offset</label>
     <input id="input-@dl-horizontal-offset" type="text" value="@component-offset-horizontal" data-var="@dl-horizontal-offset" class="form-control"/>
-    <p class="help-block">Width of horizontal description list title</p>
+    <p class="help-block">Width of horizontal description list titles</p>
   </div>
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@hr-border">@hr-border</label>
     <input id="input-@hr-border" type="text" value="@gray-lighter" data-var="@hr-border" class="form-control"/>
-    <p class="help-block">Horizontal line color</p>
+    <p class="help-block">Horizontal line color.</p>
   </div>
 </div>
 <!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
\ No newline at end of file
-- 
cgit v1.2.3


From 1339ab7a130600330b1db4e3acae9760710a0a41 Mon Sep 17 00:00:00 2001
From: hillai <hillaib@walla.com>
Date: Thu, 30 Oct 2014 18:13:39 +0200
Subject: Replace v3.2.1 reference with v3.3.0 since there wasn't a v3.2.1

Closes #14941
---
 docs/_includes/js/modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/modal.html b/docs/_includes/js/modal.html
index e47464a4c..1bb606ab8 100644
--- a/docs/_includes/js/modal.html
+++ b/docs/_includes/js/modal.html
@@ -262,7 +262,7 @@
          <td>path</td>
          <td>false</td>
          <td>
-          <p><span class="text-danger">This option is deprecated since v3.2.1 and will be removed in v4.</span> We recommend instead using client-side templating or a data binding framework, or calling <a href="http://api.jquery.com/load/">jQuery.load</a> yourself.</p>
+          <p><strong class="text-danger">This option is deprecated since v3.3.0 and will be removed in v4.</strong> We recommend instead using client-side templating or a data binding framework, or calling <a href="http://api.jquery.com/load/">jQuery.load</a> yourself.</p>
           <p>If a remote URL is provided, <strong>content will be loaded one time</strong> via jQuery's <code>load</code> method and injected into the <code>.modal-content</code> div. If you're using the data-api, you may alternatively use the <code>href</code> attribute to specify the remote source. An example of this is shown below:</p>
 {% highlight html %}
 <a data-toggle="modal" href="remote.html" data-target="#modal">Click me</a>
-- 
cgit v1.2.3


From 88dfd954fa8b0eeefe37482ffd1dba19b1369098 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Thu, 30 Oct 2014 11:31:28 -0700
Subject: Replace deprecated uses of .pull-left & .pull-right in .media docs

Refs https://github.com/twbs/bootlint/pull/153
[skip sauce]
---
 docs/_includes/components/media.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/components/media.html b/docs/_includes/components/media.html
index 1ea4176d4..d77a2520c 100644
--- a/docs/_includes/components/media.html
+++ b/docs/_includes/components/media.html
@@ -43,16 +43,16 @@
       </a>
     </div>
     <div class="media">
-      <a class="pull-right" href="#">
-        <img data-src="holder.js/64x64" alt="Generic placeholder image">
-      </a>
-      <a class="pull-left" href="#">
+      <a class="media-left" href="#">
         <img data-src="holder.js/64x64" alt="Generic placeholder image">
       </a>
       <div class="media-body">
-        <h4 class="media-heading">Deprecated pull-right pull-left example</h4>
+        <h4 class="media-heading">Media heading</h4>
         Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
       </div>
+      <a class="media-right" href="#">
+        <img data-src="holder.js/64x64" alt="Generic placeholder image">
+      </a>
     </div>
   </div><!-- /.bs-example -->
 {% highlight html %}
-- 
cgit v1.2.3


From 1f64aac6b9e04e9f5ba2cf2dcc29031c3d150d81 Mon Sep 17 00:00:00 2001
From: Manuel Meurer <manuel@krautcomputing.com>
Date: Sat, 1 Nov 2014 11:51:11 +0100
Subject: fix whitespace in js dropdown docs

---
 docs/_includes/js/dropdowns.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/dropdowns.html b/docs/_includes/js/dropdowns.html
index dd360a334..64b03fa54 100644
--- a/docs/_includes/js/dropdowns.html
+++ b/docs/_includes/js/dropdowns.html
@@ -124,7 +124,7 @@
 <div class="dropdown">
   <button id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
     Dropdown trigger
-   <span class="caret"></span>
+    <span class="caret"></span>
   </button>
   <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
     ...
-- 
cgit v1.2.3


From f4129792874465a7950b871c6042110f47954248 Mon Sep 17 00:00:00 2001
From: Aaron Cordovez <aaron.cordovez.m@gmail.com>
Date: Sat, 1 Nov 2014 17:46:33 -0700
Subject: Fix typo

Corrected spelling of the word "elements"
---
 docs/_includes/js/carousel.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html
index 62adc09e6..a74802b62 100644
--- a/docs/_includes/js/carousel.html
+++ b/docs/_includes/js/carousel.html
@@ -1,7 +1,7 @@
 <div class="bs-docs-section">
   <h1 id="carousel" class="page-header">Carousel <small>carousel.js</small></h1>
 
-  <p>A slideshow component for cycling through elemnts, like a carousel. <strong>Nested carousels are not supported.</strong></p>
+  <p>A slideshow component for cycling through elements, like a carousel. <strong>Nested carousels are not supported.</strong></p>
 
   <h2 id="carousel-examples">Examples</h2>
   <div class="bs-example">
-- 
cgit v1.2.3


From f0d8894d54afbd10b43a0919383b35fdbf961b51 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 3 Nov 2014 10:56:30 -0800
Subject: Add #14868 to the compatibility docs

---
 docs/_includes/getting-started/browser-device-support.html | 13 +++++++++++--
 docs/_includes/nav/getting-started.html                    |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html
index a0b5ef367..fd66f54b4 100644
--- a/docs/_includes/getting-started/browser-device-support.html
+++ b/docs/_includes/getting-started/browser-device-support.html
@@ -165,13 +165,22 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
   <h3 id="support-browser-zooming">Browser zooming</h3>
   <p>Page zooming inevitably presents rendering artifacts in some components, both in Bootstrap and the rest of the web. Depending on the issue, we may be able to fix it (search first and then open an issue if need be). However, we tend to ignore these as they often have no direct solution other than hacky workarounds.</p>
 
-  <h3 id="support-printing">Printer viewports</h3>
-  <p>Even in some modern browsers, printing can be quirky. In particular, as of Chrome v32 and regardless of margin settings, Chrome uses a viewport width significantly narrower than the physical paper size when resolving media queries while printing a webpage. This can result in Bootstrap's extra-small grid being unexpectedly activated when printing. <a href="https://github.com/twbs/bootstrap/issues/12078">See #12078 for some details.</a> Suggested workarounds:</p>
+  <h3 id="support-printing">Printing</h3>
+  <p>Even in some modern browsers, printing can be quirky.</p>
+  <p>In particular, as of Chrome v32 and regardless of margin settings, Chrome uses a viewport width significantly narrower than the physical paper size when resolving media queries while printing a webpage. This can result in Bootstrap's extra-small grid being unexpectedly activated when printing. <a href="https://github.com/twbs/bootstrap/issues/12078">See #12078 for some details.</a> Suggested workarounds:</p>
   <ul>
     <li>Embrace the extra-small grid and make sure your page looks acceptable under it.</li>
     <li>Customize the values of the <code>@screen-*</code> Less variables so that your printer paper is considered larger than extra-small.</li>
     <li>Add custom media queries to change the grid size breakpoints for print media only.</li>
   </ul>
+  <p>Also, as of Safari v8.0, fixed-width <code>.container</code>s can cause Safari to use an unusually small font size when printing. See <a href="https://github.com/twbs/bootstrap/issues/14868">#14868</a> for more details. One potential workaround for this is adding the following CSS:</p>
+  {% highlight css %}
+@media print {
+  .container {
+    width: auto;
+  }
+}
+  {% endhighlight %}
 
   <h3 id="support-android-stock-browser">Android stock browser</h3>
   <p>Out of the box, Android 4.1 (and even some newer releases apparently) ship with the Browser app as the default web browser of choice (as opposed to Chrome). Unfortunately, the Browser app has lots of bugs and inconsistencies with CSS in general.</p>
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>
-- 
cgit v1.2.3


From 594831f4f3f3c1164812cfdd60497fe6d7438376 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 3 Nov 2014 13:37:27 -0800
Subject: Add event.relatedTarget + `data-*` example to Modal docs

Fixes #14245
---
 docs/_includes/js/modal.html       | 80 ++++++++++++++++++++++++++++++++++++++
 docs/_includes/nav/javascript.html |  1 +
 2 files changed, 81 insertions(+)

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/modal.html b/docs/_includes/js/modal.html
index 1bb606ab8..22924b4e7 100644
--- a/docs/_includes/js/modal.html
+++ b/docs/_includes/js/modal.html
@@ -211,6 +211,86 @@
 <div class="modal" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true">
   ...
 </div>
+{% endhighlight %}
+
+  <h2 id="modals-related-target">Varying modal content based on trigger button</h2>
+  <p>Have a bunch of buttons that all trigger the same modal, just with slightly different contents? Use <code>event.relatedTarget</code> and <a href="https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Using_data_attributes">HTML <code>data-*</code> attributes</a> (possibly <a href="http://api.jquery.com/data/">via jQuery</a>) to vary the contents of the modal depending on which button was clicked. See the Modal Events docs for details on <code>relatedTarget</code>,</p>
+  <div class="bs-example" style="padding-bottom: 24px;">
+    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@mdo">Open modal for @mdo</button>
+    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@fat">Open modal for @fat</button>
+    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@twbootstrap">Open modal for @twbootstrap</button>
+    ...more buttons...
+
+    <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+            <h4 class="modal-title" id="exampleModalLabel">New message</h4>
+          </div>
+          <div class="modal-body">
+            <form role="form">
+              <div class="form-group">
+                <label for="recipient-name" class="control-label">Recipient:</label>
+                <input type="text" class="form-control" id="recipient-name">
+              </div>
+              <div class="form-group">
+                <label for="message-text" class="control-label">Message:</label>
+                <textarea class="form-control" id="message-text"></textarea>
+              </div>
+            </form>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+            <button type="button" class="btn btn-primary">Send message</button>
+          </div>
+        </div>
+      </div>
+    </div><!-- /.modal -->
+  </div><!-- /.bs-example -->
+{% highlight html %}
+<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@mdo">Open modal for @mdo</button>
+<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@fat">Open modal for @fat</button>
+<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@twbootstrap">Open modal for @twbootstrap</button>
+...more buttons...
+
+<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+        <h4 class="modal-title" id="exampleModalLabel">New message</h4>
+      </div>
+      <div class="modal-body">
+        <form role="form">
+          <div class="form-group">
+            <label for="recipient-name" class="control-label">Recipient:</label>
+            <input type="text" class="form-control" id="recipient-name">
+          </div>
+          <div class="form-group">
+            <label for="message-text" class="control-label">Message:</label>
+            <textarea class="form-control" id="message-text"></textarea>
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary">Send message</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endhighlight %}
+{% highlight js %}
+$('#exampleModal').on('show.bs.modal', function (event) {
+  var button = $(event.relatedTarget) // Button that triggered the modal
+  var recipient = button.data('whatever') // Extract info from data-* attributes
+  // If necessary, you could initiate an AJAX request here (and then do the updating in a callback).
+  // Update the modal's content. We'll use jQuery here, but you could use a data binding library or other methods instead.
+  var modal = $(this)
+  modal.find('.modal-title').text('New message to ' + recipient)
+  modal.find('.modal-body input').val(recipient)
+})
 {% endhighlight %}
 
   <h2 id="modals-usage">Usage</h2>
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>
-- 
cgit v1.2.3


From d10700427805c40497b24d7f4ffdd58a7a83c997 Mon Sep 17 00:00:00 2001
From: Heinrich Fenkart <hnrch02@gmail.com>
Date: Mon, 3 Nov 2014 16:19:40 +0100
Subject: Remove duplicate code from Customizer/Gruntfile by sharing it

---
 docs/_includes/footer.html | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index c44cabec8..24dfd26a5 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -43,25 +43,19 @@
 {% if site.github %}
   <script src="../assets/js/docs.min.js"></script>
 {% else %}
-  <script src="../assets/js/vendor/holder.js"></script>
-  <script src="../assets/js/vendor/ZeroClipboard.min.js"></script>
-  <script src="../assets/js/src/application.js"></script>
+  {% for file in site.data.configBridge.paths.docsJs %}
+  <script src="{{ file }}"></script>
+  {% endfor %}
 {% endif %}
 
 {% if page.slug == "customize" %}
+  <script>var __configBridge = {{ site.data.configBridge.config | jsonify }}</script>
   {% if site.github %}
     <script src="../assets/js/customize.min.js"></script>
   {% else %}
-    {% comment %}
-      This list is repeated in our Gruntfile—update both when making changes.
-    {% endcomment %}
-    <script src="../assets/js/vendor/less.min.js"></script>
-    <script src="../assets/js/vendor/jszip.min.js"></script>
-    <script src="../assets/js/vendor/uglify.min.js"></script>
-    <script src="../assets/js/vendor/Blob.js"></script>
-    <script src="../assets/js/vendor/FileSaver.js"></script>
-    <script src="../assets/js/raw-files.min.js"></script>
-    <script src="../assets/js/src/customizer.js"></script>
+    {% for file in site.data.configBridge.paths.customizerJs %}
+    <script src="{{ file }}"></script>
+    {% endfor %}
   {% endif %}
 {% endif %}
 
-- 
cgit v1.2.3


From e55feacf5be152694205b14491ad626537756314 Mon Sep 17 00:00:00 2001
From: Jayanth Koushik <jnkoushik@gmail.com>
Date: Tue, 4 Nov 2014 22:20:34 +0530
Subject: Add initialization examples to tooltip and popover "Opt-in
 functionality" callouts

Fixes #14950.
Closes #15015 by merging it.
---
 docs/_includes/js/popovers.html | 6 ++++++
 docs/_includes/js/tooltips.html | 7 +++++++
 2 files changed, 13 insertions(+)

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index 7739c685e..09b8f36eb 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -12,6 +12,12 @@
   <div class="bs-callout bs-callout-danger">
     <h4>Opt-in functionality</h4>
     <p>For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning <strong>you must initialize them yourself</strong>.</p>
+    <p>One way to initialize all popovers on a page would be to select them by their <code>data-toggle</code> attribute:</p>
+{% highlight js %}
+$(function () {
+  $('[data-toggle="popover"]').popover()
+})
+{% endhighlight %}
   </div>
   <div class="bs-callout bs-callout-warning">
     <h4>Popovers in button groups and input groups require special setting</h4>
diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html
index 3ec076b70..87893608b 100644
--- a/docs/_includes/js/tooltips.html
+++ b/docs/_includes/js/tooltips.html
@@ -61,6 +61,13 @@
   <div class="bs-callout bs-callout-danger">
     <h4>Opt-in functionality</h4>
     <p>For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning <strong>you must initialize them yourself</strong>.</p>
+    <p>One way to initialize all tooltips on a page would be to select them by their <code>data-toggle</code> attribute:</p>
+{% highlight js %}
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+})
+{% endhighlight %}
+
   </div>
   <div class="bs-callout bs-callout-warning">
     <h4>Tooltips in button groups and input groups require special setting</h4>
-- 
cgit v1.2.3


From eb74a8cbf363699eb822057650ddff2f36765ec9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 9 Nov 2014 23:11:28 -0800
Subject: darken primary blue for accessibility contrast on link colors

---
 docs/_includes/customizer-variables.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index e45884d5a..a416f2911 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -31,7 +31,7 @@
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@brand-primary">@brand-primary</label>
-    <input id="input-@brand-primary" type="text" value="#428bca" data-var="@brand-primary" class="form-control"/>
+    <input id="input-@brand-primary" type="text" value="darken(#428bca, 6.5%)" data-var="@brand-primary" class="form-control"/>
   </div>
   <div class="col-xs-4">
     <label for="input-@brand-success">@brand-success</label>
-- 
cgit v1.2.3


From eb74d8c86399d41673b9aa0052c70582b13bd714 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Tue, 4 Nov 2014 10:39:54 +0000
Subject: Accessibility tweaks and explanation for glyphicons

- add aria-hidden="true" to avoid SRs unintentionally reading out the
Unicode character (see
http://www.filamentgroup.com/lab/bulletproof_icon_fonts.html)
- callout with advice on accessible icon usage
- replaced sr-only text in examples with (in the case of button) cleaner
aria-label
- additional example of icon used to convey meaning (in a
non-interactive control)
---
 docs/_includes/components/glyphicons.html | 47 +++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 11 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html
index c614103c6..b5f5178df 100644
--- a/docs/_includes/components/glyphicons.html
+++ b/docs/_includes/components/glyphicons.html
@@ -7,7 +7,7 @@
     <ul class="bs-glyphicons-list">
       {% for iconClassName in site.data.glyphicons %}
         <li>
-          <span class="glyphicon {{ iconClassName }}"></span>
+          <span class="glyphicon {{ iconClassName }}" aria-hidden="true"></span>
           <span class="glyphicon-class">glyphicon {{ iconClassName }}</span>
         </li>
       {% endfor %}
@@ -35,8 +35,14 @@
     </ul>
     <p>Use whatever option best suits your specific development setup.</p>
   </div>
+  <div class="bs-callout bs-callout-warning">
+    <h4>Accessible icons</h4>
+    <p>Modern versions of assistive technologies will announce CSS generated content, as well as specific Unicode characters. To avoid unintended and confusing output in screen readers (particularly when icons are used purely for decoration), we hide them with the <code>aria-hidden="true"</code> attribute.</p>
+    <p>If you're using an icon to convey meaning (rather than only as a decorative element), ensure that this meaning is also conveyed to assistive technologies – for instance, include additional content, visually hidden with the <code>.sr-only</code> class.</p>
+    <p>If you're creating controls with no other text (such as a <code>&lt;button&gt;</code> that only contains an icon), you should always provide alternative content to identify the purpose of the control, so that it will make sense to users of assistive technologies. In this case, you could add an <code>aria-label</code> attribute on the control itself.</p>
+  </div>
 {% highlight html %}
-<span class="glyphicon glyphicon-search"></span>
+<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
 {% endhighlight %}
 
 
@@ -45,22 +51,41 @@
   <div class="bs-example">
     <div class="btn-toolbar" role="toolbar">
       <div class="btn-group">
-        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-left"></span> <span class="sr-only">Left Align</span></button>
-        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-center"></span> <span class="sr-only">Center Align</span></button>
-        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-right"></span> <span class="sr-only">Right Align</span></button>
-        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-justify"></span> <span class="sr-only">Justify</span></button>
+        <button type="button" class="btn btn-default" aria-label="Left Align"><span class="glyphicon glyphicon-align-left" aria-hidden="true"></span></button>
+        <button type="button" class="btn btn-default" aria-label="Center Align"><span class="glyphicon glyphicon-align-center" aria-hidden="true"></span></button>
+        <button type="button" class="btn btn-default" aria-label="Right Align"><span class="glyphicon glyphicon-align-right" aria-hidden="true"></span></button>
+        <button type="button" class="btn btn-default" aria-label="Justify"><span class="glyphicon glyphicon-align-justify" aria-hidden="true"></span></button>
       </div>
     </div>
     <div class="btn-toolbar" role="toolbar">
-      <button type="button" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-star"></span> Star</button>
-      <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-star"></span> Star</button>
-      <button type="button" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-star"></span> Star</button>
-      <button type="button" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-star"></span> Star</button>
+      <button type="button" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> Star</button>
+      <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> Star</button>
+      <button type="button" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> Star</button>
+      <button type="button" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> Star</button>
     </div>
   </div>
 {% highlight html %}
+<button type="button" class="btn btn-default" aria-label="Left Align">
+  <span class="glyphicon glyphicon-align-left" aria-hidden="true"></span>
+</button>
+
 <button type="button" class="btn btn-default btn-lg">
-  <span class="glyphicon glyphicon-star"></span> Star
+  <span class="glyphicon glyphicon-star" aria-hidden="true"></span> Star
 </button>
+{% endhighlight %}
+  <p>An icon used in an <a href="#alerts">alert</a> to convey that it's an error message, with additional <code>.sr-only</code> text to convey this hint to users of assistive technologies.</p>
+  <div class="bs-example">
+    <div class="alert alert-danger" role="alert">
+      <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+      <span class="sr-only">Error:</span>
+      Enter a valid email address
+    </div>
+  </div>
+{% highlight html %}
+<div class="alert alert-danger" role="alert">
+  <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+  <span class="sr-only">Error:</span>
+  Enter a valid email address
+</div>
 {% endhighlight %}
 </div>
-- 
cgit v1.2.3


From c513f58c6a2e345da338aebe45ee422b07260017 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 10 Nov 2014 13:14:33 -0800
Subject: Remove X-UA-Compatible caveat from Validators docs

Refs #15072
---
 docs/_includes/getting-started/browser-device-support.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html
index fd66f54b4..306023d7b 100644
--- a/docs/_includes/getting-started/browser-device-support.html
+++ b/docs/_includes/getting-started/browser-device-support.html
@@ -202,5 +202,5 @@ $(function () {
   <h3 id="support-validators">Validators</h3>
   <p>In order to provide the best possible experience to old and buggy browsers, Bootstrap uses <a href="http://browserhacks.com">CSS browser hacks</a> in several places to target special CSS to certain browser versions in order to work around bugs in the browsers themselves. These hacks understandably cause CSS validators to complain that they are invalid. In a couple places, we also use bleeding-edge CSS features that aren't yet fully standardized, but these are used purely for progressive enhancement.</p>
   <p>These validation warnings don't matter in practice since the non-hacky portion of our CSS does fully validate and the hacky portions don't interfere with the proper functioning of the non-hacky portion, hence why we deliberately ignore these particular warnings.</p>
-  <p>Our HTML docs likewise have some trivial and inconsequential HTML validation warnings due to our inclusion of <a href="#support-ie-compatibility-modes">X-UA-Compatible <code>&lt;meta&gt;</code> tags</a> to avoid Internet Explorer issues and our inclusion of a workaround for <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=654072">a certain Firefox bug</a>.</p>
+  <p>Our HTML docs likewise have some trivial and inconsequential HTML validation warnings due to our inclusion of a workaround for <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=654072">a certain Firefox bug</a>.</p>
 </div>
-- 
cgit v1.2.3


From bb89657bcb53a60d579d8fd9bbea56dde05dad8c Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Thu, 30 Oct 2014 16:45:33 +0000
Subject: Assorted accessibility (and some consistency) fixes for documentation

Closes #14951 by merging it.
---
 docs/_includes/components/button-dropdowns.html   |  46 +++----
 docs/_includes/components/button-groups.html      | 143 ++++++++++++----------
 docs/_includes/components/dropdowns.html          |  10 +-
 docs/_includes/components/input-groups.html       |  12 +-
 docs/_includes/components/navbar.html             |   4 +-
 docs/_includes/components/navs.html               |  55 +++++----
 docs/_includes/components/pagination.html         |  46 +++----
 docs/_includes/css/buttons.html                   |  14 ++-
 docs/_includes/css/forms.html                     | 104 +++++++++-------
 docs/_includes/css/grid.html                      |   2 +-
 docs/_includes/css/helpers.html                   |   8 ++
 docs/_includes/css/tables.html                    |   5 +-
 docs/_includes/getting-started/accessibility.html |   5 +
 docs/_includes/js/tabs.html                       |  40 +++---
 docs/_includes/nav/components.html                |   6 +-
 docs/_includes/nav/css.html                       |  12 +-
 16 files changed, 287 insertions(+), 225 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/components/button-dropdowns.html b/docs/_includes/components/button-dropdowns.html
index 165e0777e..871370d43 100644
--- a/docs/_includes/components/button-dropdowns.html
+++ b/docs/_includes/components/button-dropdowns.html
@@ -12,7 +12,7 @@
   <p>Turn a button into a dropdown toggle with some basic markup changes.</p>
   <div class="bs-example">
     <div class="btn-group">
-      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Default <span class="caret"></span></button>
+      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Default <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
         <li><a href="#">Action</a></li>
         <li><a href="#">Another action</a></li>
@@ -22,7 +22,7 @@
       </ul>
     </div><!-- /btn-group -->
     <div class="btn-group">
-      <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">Primary <span class="caret"></span></button>
+      <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Primary <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
         <li><a href="#">Action</a></li>
         <li><a href="#">Another action</a></li>
@@ -32,7 +32,7 @@
       </ul>
     </div><!-- /btn-group -->
     <div class="btn-group">
-      <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown">Success <span class="caret"></span></button>
+      <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Success <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
         <li><a href="#">Action</a></li>
         <li><a href="#">Another action</a></li>
@@ -42,7 +42,7 @@
       </ul>
     </div><!-- /btn-group -->
     <div class="btn-group">
-      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">Info <span class="caret"></span></button>
+      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Info <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
         <li><a href="#">Action</a></li>
         <li><a href="#">Another action</a></li>
@@ -52,7 +52,7 @@
       </ul>
     </div><!-- /btn-group -->
     <div class="btn-group">
-      <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown">Warning <span class="caret"></span></button>
+      <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Warning <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
         <li><a href="#">Action</a></li>
         <li><a href="#">Another action</a></li>
@@ -62,7 +62,7 @@
       </ul>
     </div><!-- /btn-group -->
     <div class="btn-group">
-      <button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown">Danger <span class="caret"></span></button>
+      <button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Danger <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
         <li><a href="#">Action</a></li>
         <li><a href="#">Another action</a></li>
@@ -75,7 +75,7 @@
 {% highlight html %}
 <!-- Single button -->
 <div class="btn-group">
-  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
     Action <span class="caret"></span>
   </button>
   <ul class="dropdown-menu" role="menu">
@@ -93,7 +93,7 @@
   <div class="bs-example">
     <div class="btn-group">
       <button type="button" class="btn btn-default">Default</button>
-      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
         <span class="caret"></span>
         <span class="sr-only">Toggle Dropdown</span>
       </button>
@@ -107,7 +107,7 @@
     </div><!-- /btn-group -->
     <div class="btn-group">
       <button type="button" class="btn btn-primary">Primary</button>
-      <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+      <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
         <span class="caret"></span>
         <span class="sr-only">Toggle Dropdown</span>
       </button>
@@ -121,7 +121,7 @@
     </div><!-- /btn-group -->
     <div class="btn-group">
       <button type="button" class="btn btn-success">Success</button>
-      <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
+      <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
         <span class="caret"></span>
         <span class="sr-only">Toggle Dropdown</span>
       </button>
@@ -135,7 +135,7 @@
     </div><!-- /btn-group -->
     <div class="btn-group">
       <button type="button" class="btn btn-info">Info</button>
-      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">
+      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
         <span class="caret"></span>
         <span class="sr-only">Toggle Dropdown</span>
       </button>
@@ -149,7 +149,7 @@
     </div><!-- /btn-group -->
     <div class="btn-group">
       <button type="button" class="btn btn-warning">Warning</button>
-      <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown">
+      <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
         <span class="caret"></span>
         <span class="sr-only">Toggle Dropdown</span>
       </button>
@@ -163,7 +163,7 @@
     </div><!-- /btn-group -->
     <div class="btn-group">
       <button type="button" class="btn btn-danger">Danger</button>
-      <button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown">
+      <button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
         <span class="caret"></span>
         <span class="sr-only">Toggle Dropdown</span>
       </button>
@@ -180,7 +180,7 @@
 <!-- Split button -->
 <div class="btn-group">
   <button type="button" class="btn btn-danger">Action</button>
-  <button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown">
+  <button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
     <span class="caret"></span>
     <span class="sr-only">Toggle Dropdown</span>
   </button>
@@ -199,7 +199,7 @@
   <div class="bs-example">
     <div class="btn-toolbar" role="toolbar">
       <div class="btn-group">
-        <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown">
+        <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
           Large button <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" role="menu">
@@ -213,7 +213,7 @@
     </div><!-- /btn-toolbar -->
     <div class="btn-toolbar" role="toolbar">
       <div class="btn-group">
-        <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
+        <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
           Small button <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" role="menu">
@@ -227,7 +227,7 @@
     </div><!-- /btn-toolbar -->
     <div class="btn-toolbar" role="toolbar">
       <div class="btn-group">
-        <button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown">
+        <button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
           Extra small button <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" role="menu">
@@ -243,7 +243,7 @@
 {% highlight html %}
 <!-- Large button group -->
 <div class="btn-group">
-  <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown">
+  <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
     Large button <span class="caret"></span>
   </button>
   <ul class="dropdown-menu" role="menu">
@@ -253,7 +253,7 @@
 
 <!-- Small button group -->
 <div class="btn-group">
-  <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
+  <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
     Small button <span class="caret"></span>
   </button>
   <ul class="dropdown-menu" role="menu">
@@ -263,7 +263,7 @@
 
 <!-- Extra small button group -->
 <div class="btn-group">
-  <button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown">
+  <button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
     Extra small button <span class="caret"></span>
   </button>
   <ul class="dropdown-menu" role="menu">
@@ -278,7 +278,7 @@
     <div class="btn-toolbar" role="toolbar">
       <div class="btn-group dropup">
         <button type="button" class="btn btn-default">Dropup</button>
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
           <span class="caret"></span>
           <span class="sr-only">Toggle Dropdown</span>
         </button>
@@ -292,7 +292,7 @@
       </div><!-- /btn-group -->
       <div class="btn-group dropup">
         <button type="button" class="btn btn-primary">Right dropup</button>
-        <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+        <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
           <span class="caret"></span>
           <span class="sr-only">Toggle Dropdown</span>
         </button>
@@ -309,7 +309,7 @@
 {% highlight html %}
 <div class="btn-group dropup">
   <button type="button" class="btn btn-default">Dropup</button>
-  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
     <span class="caret"></span>
     <span class="sr-only">Toggle Dropdown</span>
   </button>
diff --git a/docs/_includes/components/button-groups.html b/docs/_includes/components/button-groups.html
index 216e4426b..4a1fc86f8 100644
--- a/docs/_includes/components/button-groups.html
+++ b/docs/_includes/components/button-groups.html
@@ -8,17 +8,24 @@
     <p>When using tooltips or popovers on elements within a <code>.btn-group</code>, you'll have to specify the option <code>container: 'body'</code> to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).</p>
   </div>
 
+  <div class="bs-callout bs-callout-warning">
+    <h4>Ensure correct <code>role</code> and provide a label</h4>
+    <p>In order for assistive technologies – such as screen readers – to convey that a series of buttons is grouped, an appropriate <code>role</code> attribute needs to be provided. For button groups, this would be <code>role="group"</code>, while toolbars should have a <code>role="toolbar"</code>.</p>
+    <p>One exception are groups which only contain a single control (for instance the <a href="#btn-groups-justified">justified button groups</a> with <code>&lt;button&gt;</code> elements) or a dropdown.</p>
+    <p>In addition, groups and toolbars should be given an explicit label, as most assistive technologies will otherwise not announce them, despite the presence of the correct <code>role</code> attribute. In the examples provided here, we use <code>aria-label</code>, but alternatives such as <code>aria-labelledby</code> can also be used.</p>
+  </div>
+
   <h3 id="btn-groups-single">Basic example</h3>
   <p>Wrap a series of buttons with <code>.btn</code> in <code>.btn-group</code>.</p>
   <div class="bs-example">
-    <div class="btn-group" style="margin: 9px 0 5px;">
+    <div class="btn-group" role="group" aria-label="Basic example">
       <button type="button" class="btn btn-default">Left</button>
       <button type="button" class="btn btn-default">Middle</button>
       <button type="button" class="btn btn-default">Right</button>
     </div>
   </div>
 {% highlight html %}
-<div class="btn-group">
+<div class="btn-group" role="group" aria-label="...">
   <button type="button" class="btn btn-default">Left</button>
   <button type="button" class="btn btn-default">Middle</button>
   <button type="button" class="btn btn-default">Right</button>
@@ -28,79 +35,74 @@
   <h3 id="btn-groups-toolbar">Button toolbar</h3>
   <p>Combine sets of <code>&lt;div class="btn-group"&gt;</code> into a <code>&lt;div class="btn-toolbar"&gt;</code> for more complex components.</p>
   <div class="bs-example">
-    <div class="btn-toolbar" role="toolbar" style="margin: 0;">
-      <div class="btn-group">
+    <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
+      <div class="btn-group" role="group" aria-label="First group">
         <button type="button" class="btn btn-default">1</button>
         <button type="button" class="btn btn-default">2</button>
         <button type="button" class="btn btn-default">3</button>
         <button type="button" class="btn btn-default">4</button>
       </div>
-      <div class="btn-group">
+      <div class="btn-group" role="group" aria-label="Second group">
         <button type="button" class="btn btn-default">5</button>
         <button type="button" class="btn btn-default">6</button>
         <button type="button" class="btn btn-default">7</button>
       </div>
-      <div class="btn-group">
+      <div class="btn-group" role="group" aria-label="Third group">
         <button type="button" class="btn btn-default">8</button>
       </div>
     </div>
   </div>
 {% highlight html %}
-<div class="btn-toolbar" role="toolbar">
-  <div class="btn-group">...</div>
-  <div class="btn-group">...</div>
-  <div class="btn-group">...</div>
+<div class="btn-toolbar" role="toolbar" aria-label="...">
+  <div class="btn-group" role="group" aria-label="...">...</div>
+  <div class="btn-group" role="group" aria-label="...">...</div>
+  <div class="btn-group" role="group" aria-label="...">...</div>
 </div>
 {% endhighlight %}
 
   <h3 id="btn-groups-sizing">Sizing</h3>
   <p>Instead of applying button sizing classes to every button in a group, just add <code>.btn-group-*</code> to the <code>.btn-group</code>.</p>
   <div class="bs-example">
-    <div class="btn-toolbar" role="toolbar">
-      <div class="btn-group btn-group-lg">
-        <button type="button" class="btn btn-default">Left</button>
-        <button type="button" class="btn btn-default">Middle</button>
-        <button type="button" class="btn btn-default">Right</button>
-      </div>
+    <div class="btn-group btn-group-lg" role="group" aria-label="Large button group">
+      <button type="button" class="btn btn-default">Left</button>
+      <button type="button" class="btn btn-default">Middle</button>
+      <button type="button" class="btn btn-default">Right</button>
     </div>
-    <div class="btn-toolbar" role="toolbar">
-      <div class="btn-group">
-        <button type="button" class="btn btn-default">Left</button>
-        <button type="button" class="btn btn-default">Middle</button>
-        <button type="button" class="btn btn-default">Right</button>
-      </div>
+    <br>
+    <div class="btn-group" role="group" aria-label="Default button group">
+      <button type="button" class="btn btn-default">Left</button>
+      <button type="button" class="btn btn-default">Middle</button>
+      <button type="button" class="btn btn-default">Right</button>
     </div>
-    <div class="btn-toolbar" role="toolbar">
-      <div class="btn-group btn-group-sm">
-        <button type="button" class="btn btn-default">Left</button>
-        <button type="button" class="btn btn-default">Middle</button>
-        <button type="button" class="btn btn-default">Right</button>
-      </div>
+    <br>
+    <div class="btn-group btn-group-sm" role="group" aria-label="Small button group">
+      <button type="button" class="btn btn-default">Left</button>
+      <button type="button" class="btn btn-default">Middle</button>
+      <button type="button" class="btn btn-default">Right</button>
     </div>
-    <div class="btn-toolbar" role="toolbar">
-      <div class="btn-group btn-group-xs">
-        <button type="button" class="btn btn-default">Left</button>
-        <button type="button" class="btn btn-default">Middle</button>
-        <button type="button" class="btn btn-default">Right</button>
-      </div>
+    <br>
+    <div class="btn-group btn-group-xs" role="group" aria-label="Extra-small button group">
+      <button type="button" class="btn btn-default">Left</button>
+      <button type="button" class="btn btn-default">Middle</button>
+      <button type="button" class="btn btn-default">Right</button>
     </div>
   </div>
 {% highlight html %}
-<div class="btn-group btn-group-lg">...</div>
-<div class="btn-group">...</div>
-<div class="btn-group btn-group-sm">...</div>
-<div class="btn-group btn-group-xs">...</div>
+<div class="btn-group btn-group-lg" role="group" aria-label="...">...</div>
+<div class="btn-group" role="group" aria-label="...">...</div>
+<div class="btn-group btn-group-sm" role="group" aria-label="...">...</div>
+<div class="btn-group btn-group-xs" role="group" aria-label="...">...</div>
 {% endhighlight %}
 
   <h3 id="btn-groups-nested">Nesting</h3>
   <p>Place a <code>.btn-group</code> within another <code>.btn-group</code> when you want dropdown menus mixed with a series of buttons.</p>
   <div class="bs-example">
-    <div class="btn-group">
+    <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
       <button type="button" class="btn btn-default">1</button>
       <button type="button" class="btn btn-default">2</button>
 
-      <div class="btn-group">
-        <button id="btnGroupDrop1" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+      <div class="btn-group" role="group">
+        <button id="btnGroupDrop1" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
           Dropdown
           <span class="caret"></span>
         </button>
@@ -112,12 +114,12 @@
     </div>
   </div>
 {% highlight html %}
-<div class="btn-group">
+<div class="btn-group" role="group" aria-label="...">
   <button type="button" class="btn btn-default">1</button>
   <button type="button" class="btn btn-default">2</button>
 
-  <div class="btn-group">
-    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+  <div class="btn-group" role="group">
+    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
       Dropdown
       <span class="caret"></span>
     </button>
@@ -132,11 +134,11 @@
   <h3 id="btn-groups-vertical">Vertical variation</h3>
   <p>Make a set of buttons appear vertically stacked rather than horizontally. <strong class="text-danger">Split button dropdowns are not supported here.</strong></p>
   <div class="bs-example">
-    <div class="btn-group-vertical">
+    <div class="btn-group-vertical" role="group" aria-label="Vertical button group">
       <button type="button" class="btn btn-default">Button</button>
       <button type="button" class="btn btn-default">Button</button>
-      <div class="btn-group">
-        <button id="btnGroupVerticalDrop1" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+      <div class="btn-group" role="group">
+        <button id="btnGroupVerticalDrop1" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
           Dropdown
           <span class="caret"></span>
         </button>
@@ -147,8 +149,8 @@
       </div>
       <button type="button" class="btn btn-default">Button</button>
       <button type="button" class="btn btn-default">Button</button>
-      <div class="btn-group">
-        <button id="btnGroupVerticalDrop2" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+      <div class="btn-group" role="group">
+        <button id="btnGroupVerticalDrop2" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
           Dropdown
           <span class="caret"></span>
         </button>
@@ -157,8 +159,8 @@
           <li><a href="#">Dropdown link</a></li>
         </ul>
       </div>
-      <div class="btn-group">
-        <button id="btnGroupVerticalDrop3" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+      <div class="btn-group" role="group">
+        <button id="btnGroupVerticalDrop3" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
           Dropdown
           <span class="caret"></span>
         </button>
@@ -167,8 +169,8 @@
           <li><a href="#">Dropdown link</a></li>
         </ul>
       </div>
-      <div class="btn-group">
-        <button id="btnGroupVerticalDrop4" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+      <div class="btn-group" role="group">
+        <button id="btnGroupVerticalDrop4" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
           Dropdown
           <span class="caret"></span>
         </button>
@@ -180,7 +182,7 @@
     </div>
   </div>
 {% highlight html %}
-<div class="btn-group-vertical">
+<div class="btn-group-vertical" role="group" aria-label="...">
   ...
 </div>
 {% endhighlight %}
@@ -201,17 +203,17 @@
   <h4>With <code>&lt;a&gt;</code> elements</h4>
   <p>Just wrap a series of <code>.btn</code>s in <code>.btn-group.btn-group-justified</code>.</p>
   <div class="bs-example">
-    <div class="btn-group btn-group-justified">
+    <div class="btn-group btn-group-justified" role="group" aria-label="Justified button group">
       <a href="#" class="btn btn-default" role="button">Left</a>
       <a href="#" class="btn btn-default" role="button">Middle</a>
       <a href="#" class="btn btn-default" role="button">Right</a>
     </div>
     <br>
-    <div class="btn-group btn-group-justified">
+    <div class="btn-group btn-group-justified" role="group" aria-label="Justified button group with nested dropdown">
       <a href="#" class="btn btn-default" role="button">Left</a>
       <a href="#" class="btn btn-default" role="button">Middle</a>
-      <div class="btn-group">
-        <a href="#" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+      <div class="btn-group" role="group">
+        <a href="#" class="btn btn-default dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
           Dropdown <span class="caret"></span>
         </a>
         <ul class="dropdown-menu" role="menu">
@@ -225,35 +227,40 @@
     </div>
   </div>
 {% highlight html %}
-<div class="btn-group btn-group-justified">
+<div class="btn-group btn-group-justified" role="group" aria-label="...">
   ...
 </div>
 {% endhighlight %}
 
+  <div class="bs-callout bs-callout-warning">
+  <h4>Links acting as buttons</h4>
+  <p>If the <code>&lt;a&gt;</code> elements are used to act as buttons – triggering in-page functionality, rather than navigating to another document or section within the current page – they should also be given an appropriate <code>role="button"</code>.</p>
+  </div>
+
   <h4>With <code>&lt;button&gt;</code> elements</h4>
-  <p>To use justified button groups with <code>&lt;button&gt;</code> elements, <strong class="text-danger">you must wrap each button in a button group</strong>. Most browsers don't properly apply our CSS for justification to <code>&lt;button&gt;</code> elements, but since we support button dropdowns, we can workaround that.</p>
+  <p>To use justified button groups with <code>&lt;button&gt;</code> elements, <strong class="text-danger">you must wrap each button in a button group</strong>. Most browsers don't properly apply our CSS for justification to <code>&lt;button&gt;</code> elements, but since we support button dropdowns, we can work around that.</p>
   <div class="bs-example">
-    <div class="btn-group btn-group-justified">
-      <div class="btn-group">
+    <div class="btn-group btn-group-justified" role="group" aria-label="Justified button group">
+      <div class="btn-group" role="group">
         <button type="button" class="btn btn-default">Left</button>
       </div>
-      <div class="btn-group">
+      <div class="btn-group" role="group">
         <button type="button" class="btn btn-default">Middle</button>
       </div>
-      <div class="btn-group">
+      <div class="btn-group" role="group">
         <button type="button" class="btn btn-default">Right</button>
       </div>
     </div>
   </div>
 {% highlight html %}
-<div class="btn-group btn-group-justified">
-  <div class="btn-group">
+<div class="btn-group btn-group-justified" role="group" aria-label="...">
+  <div class="btn-group" role="group">
     <button type="button" class="btn btn-default">Left</button>
   </div>
-  <div class="btn-group">
+  <div class="btn-group" role="group">
     <button type="button" class="btn btn-default">Middle</button>
   </div>
-  <div class="btn-group">
+  <div class="btn-group" role="group">
     <button type="button" class="btn btn-default">Right</button>
   </div>
 </div>
diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html
index 8f0b0c942..6bedbc81b 100644
--- a/docs/_includes/components/dropdowns.html
+++ b/docs/_includes/components/dropdowns.html
@@ -7,7 +7,7 @@
   <p>Wrap the dropdown's trigger and the dropdown menu within <code>.dropdown</code>, or another element that declares <code>position: relative;</code>. Then add the menu's HTML.</p>
   <div class="bs-example">
     <div class="dropdown clearfix">
-      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
+      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true">
         Dropdown
         <span class="caret"></span>
       </button>
@@ -21,7 +21,7 @@
   </div><!-- /example -->
 {% highlight html %}
 <div class="dropdown">
-  <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
+  <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true">
     Dropdown
     <span class="caret"></span>
   </button>
@@ -54,7 +54,7 @@
   <p>Add a header to label sections of actions in any dropdown menu.</p>
   <div class="bs-example">
     <div class="dropdown clearfix">
-      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown">
+      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-expanded="true">
         Dropdown
         <span class="caret"></span>
       </button>
@@ -80,7 +80,7 @@
   <p>Add a divider to separate series of links in a dropdown menu.</p>
   <div class="bs-example">
     <div class="dropdown clearfix">
-      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenuDivider" data-toggle="dropdown">
+      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenuDivider" data-toggle="dropdown" aria-expanded="true">
         Dropdown
         <span class="caret"></span>
       </button>
@@ -105,7 +105,7 @@
   <p>Add <code>.disabled</code> to a <code>&lt;li&gt;</code> in the dropdown to disable the link.</p>
   <div class="bs-example">
     <div class="dropdown clearfix">
-      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown">
+      <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown" aria-expanded="true">
         Dropdown
         <span class="caret"></span>
       </button>
diff --git a/docs/_includes/components/input-groups.html b/docs/_includes/components/input-groups.html
index bd29dbe49..31ddfd0c4 100644
--- a/docs/_includes/components/input-groups.html
+++ b/docs/_includes/components/input-groups.html
@@ -187,7 +187,7 @@
       <div class="col-lg-6">
         <div class="input-group">
           <div class="input-group-btn">
-            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
+            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Action <span class="caret"></span></button>
             <ul class="dropdown-menu" role="menu">
               <li><a href="#">Action</a></li>
               <li><a href="#">Another action</a></li>
@@ -203,7 +203,7 @@
         <div class="input-group">
           <input type="text" class="form-control">
           <div class="input-group-btn">
-            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
+            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Action <span class="caret"></span></button>
             <ul class="dropdown-menu dropdown-menu-right" role="menu">
               <li><a href="#">Action</a></li>
               <li><a href="#">Another action</a></li>
@@ -221,7 +221,7 @@
   <div class="col-lg-6">
     <div class="input-group">
       <div class="input-group-btn">
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Action <span class="caret"></span></button>
         <ul class="dropdown-menu" role="menu">
           <li><a href="#">Action</a></li>
           <li><a href="#">Another action</a></li>
@@ -237,7 +237,7 @@
     <div class="input-group">
       <input type="text" class="form-control">
       <div class="input-group-btn">
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Action <span class="caret"></span></button>
         <ul class="dropdown-menu dropdown-menu-right" role="menu">
           <li><a href="#">Action</a></li>
           <li><a href="#">Another action</a></li>
@@ -258,7 +258,7 @@
         <div class="input-group">
           <div class="input-group-btn">
             <button type="button" class="btn btn-default" tabindex="-1">Action</button>
-            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" tabindex="-1">
+            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
               <span class="caret"></span>
               <span class="sr-only">Toggle Dropdown</span>
             </button>
@@ -278,7 +278,7 @@
           <input type="text" class="form-control">
           <div class="input-group-btn">
             <button type="button" class="btn btn-default" tabindex="-1">Action</button>
-            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" tabindex="-1">
+            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
               <span class="caret"></span>
               <span class="sr-only">Toggle Dropdown</span>
             </button>
diff --git a/docs/_includes/components/navbar.html b/docs/_includes/components/navbar.html
index 5db4d52cf..d0f8a67d6 100644
--- a/docs/_includes/components/navbar.html
+++ b/docs/_includes/components/navbar.html
@@ -40,7 +40,7 @@
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
           <ul class="nav navbar-nav">
-            <li class="active"><a href="#">Link</a></li>
+            <li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
             <li><a href="#">Link</a></li>
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
@@ -95,7 +95,7 @@
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">
-        <li class="active"><a href="#">Link</a></li>
+        <li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
         <li><a href="#">Link</a></li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
diff --git a/docs/_includes/components/navs.html b/docs/_includes/components/navs.html
index c9fc189c5..2ea20d0e8 100644
--- a/docs/_includes/components/navs.html
+++ b/docs/_includes/components/navs.html
@@ -3,38 +3,45 @@
 
   <p class="lead">Navs available in Bootstrap have shared markup, starting with the base <code>.nav</code> class, as well as shared states. Swap modifier classes to switch between each style.</p>
 
+  <div class="bs-callout bs-callout-info">
+    <h4>Using navs for tab panels requires JavaScript tabs plugin</h4>
+    <p>For tabs with tabbable areas, you must use the <a href="../javascript/#tabs">tabs JavaScript plugin</a>. The markup will also require additional <code>role</code> and ARIA attributes – see the plugin's <a href="../javascript/#tabs-usage">example markup</a> for further details.</p>
+  </div>
+
+  <div class="bs-callout bs-callout-warning">
+    <h4>Make navs used as navigation accessible</h4>
+    <p>If you are using navs to provide a navigation bar, be sure to add a <code>role="navigation"</code> to the most logical parent container of the <code>&lt;ul&gt;</code>, or wrap a <code>&lt;nav&gt;</code> element around the whole navigation. Do not add the role to the <code>&lt;ul&gt;</code> itself, as this would prevent it from being announced as an actual list by assistive technologies.</p>
+  </div>
+
   <h2 id="nav-tabs">Tabs</h2>
   <p>Note the <code>.nav-tabs</code> class requires the <code>.nav</code> base class.</p>
   <div class="bs-example">
-    <ul class="nav nav-tabs" role="tablist">
+    <ul class="nav nav-tabs">
       <li role="presentation" class="active"><a href="#">Home</a></li>
       <li role="presentation"><a href="#">Profile</a></li>
       <li role="presentation"><a href="#">Messages</a></li>
     </ul>
   </div>
 {% highlight html %}
-<ul class="nav nav-tabs" role="tablist">
+<ul class="nav nav-tabs">
   <li role="presentation" class="active"><a href="#">Home</a></li>
   <li role="presentation"><a href="#">Profile</a></li>
   <li role="presentation"><a href="#">Messages</a></li>
 </ul>
 {% endhighlight %}
-  <div class="bs-callout bs-callout-info">
-    <h4>Requires JavaScript tabs plugin</h4>
-    <p>For tabs with tabbable areas, you must use the <a href="../javascript/#tabs">tabs JavaScript plugin</a>.</p>
-  </div>
+
 
   <h2 id="nav-pills">Pills</h2>
   <p>Take that same HTML, but use <code>.nav-pills</code> instead:</p>
   <div class="bs-example">
-    <ul class="nav nav-pills" role="tablist">
+    <ul class="nav nav-pills">
       <li role="presentation" class="active"><a href="#">Home</a></li>
       <li role="presentation"><a href="#">Profile</a></li>
       <li role="presentation"><a href="#">Messages</a></li>
     </ul>
   </div>
 {% highlight html %}
-<ul class="nav nav-pills" role="tablist">
+<ul class="nav nav-pills">
   <li role="presentation" class="active"><a href="#">Home</a></li>
   <li role="presentation"><a href="#">Profile</a></li>
   <li role="presentation"><a href="#">Messages</a></li>
@@ -42,14 +49,14 @@
 {% endhighlight %}
   <p>Pills are also vertically stackable. Just add <code>.nav-stacked</code>.</p>
   <div class="bs-example">
-    <ul class="nav nav-pills nav-stacked" role="tablist" style="max-width: 300px;">
+    <ul class="nav nav-pills nav-stacked" style="max-width: 300px;">
       <li role="presentation" class="active"><a href="#">Home</a></li>
       <li role="presentation"><a href="#">Profile</a></li>
       <li role="presentation"><a href="#">Messages</a></li>
     </ul>
   </div>
 {% highlight html %}
-<ul class="nav nav-pills nav-stacked" role="tablist">
+<ul class="nav nav-pills nav-stacked">
   ...
 </ul>
 {% endhighlight %}
@@ -63,23 +70,23 @@
     <p>As of v8.0, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p>
   </div>
   <div class="bs-example">
-    <ul class="nav nav-tabs nav-justified" role="tablist">
+    <ul class="nav nav-tabs nav-justified">
       <li role="presentation" class="active"><a href="#">Home</a></li>
       <li role="presentation"><a href="#">Profile</a></li>
       <li role="presentation"><a href="#">Messages</a></li>
     </ul>
     <br>
-    <ul class="nav nav-pills nav-justified" role="tablist">
+    <ul class="nav nav-pills nav-justified">
       <li role="presentation" class="active"><a href="#">Home</a></li>
       <li role="presentation"><a href="#">Profile</a></li>
       <li role="presentation"><a href="#">Messages</a></li>
     </ul>
   </div>
 {% highlight html %}
-<ul class="nav nav-tabs nav-justified" role="tablist">
+<ul class="nav nav-tabs nav-justified">
   ...
 </ul>
-<ul class="nav nav-pills nav-justified" role="tablist">
+<ul class="nav nav-pills nav-justified">
   ...
 </ul>
 {% endhighlight %}
@@ -94,14 +101,14 @@
   </div>
 
   <div class="bs-example">
-    <ul class="nav nav-pills" role="tablist">
+    <ul class="nav nav-pills">
       <li role="presentation"><a href="#">Clickable link</a></li>
       <li role="presentation"><a href="#">Clickable link</a></li>
       <li role="presentation" class="disabled"><a href="#">Disabled link</a></li>
     </ul>
   </div>
 {% highlight html %}
-<ul class="nav nav-pills" role="tablist">
+<ul class="nav nav-pills">
   ...
   <li role="presentation" class="disabled"><a href="#">Disabled link</a></li>
   ...
@@ -114,11 +121,11 @@
 
   <h3>Tabs with dropdowns</h3>
   <div class="bs-example">
-    <ul class="nav nav-tabs" role="tablist">
+    <ul class="nav nav-tabs">
       <li role="presentation" class="active"><a href="#">Home</a></li>
       <li role="presentation"><a href="#">Help</a></li>
       <li role="presentation" class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-expanded="false">
           Dropdown <span class="caret"></span>
         </a>
         <ul class="dropdown-menu" role="menu">
@@ -132,10 +139,10 @@
     </ul>
   </div>
 {% highlight html %}
-<ul class="nav nav-tabs" role="tablist">
+<ul class="nav nav-tabs">
   ...
   <li role="presentation" class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+    <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-expanded="false">
       Dropdown <span class="caret"></span>
     </a>
     <ul class="dropdown-menu" role="menu">
@@ -148,11 +155,11 @@
 
   <h3>Pills with dropdowns</h3>
   <div class="bs-example">
-    <ul class="nav nav-pills" role="tablist">
+    <ul class="nav nav-pills">
       <li role="presentation" class="active"><a href="#">Home</a></li>
       <li role="presentation"><a href="#">Help</a></li>
       <li role="presentation" class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-expanded="false">
           Dropdown <span class="caret"></span>
         </a>
         <ul class="dropdown-menu" role="menu">
@@ -166,10 +173,10 @@
     </ul>
   </div><!-- /example -->
 {% highlight html %}
-<ul class="nav nav-pills" role="tablist">
+<ul class="nav nav-pills">
   ...
   <li role="presentation" class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+    <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-expanded="false">
       Dropdown <span class="caret"></span>
     </a>
     <ul class="dropdown-menu" role="menu">
diff --git a/docs/_includes/components/pagination.html b/docs/_includes/components/pagination.html
index 27e5b6247..f5e78977a 100644
--- a/docs/_includes/components/pagination.html
+++ b/docs/_includes/components/pagination.html
@@ -8,26 +8,26 @@
   <div class="bs-example">
     <nav>
       <ul class="pagination">
-        <li><a href="#">&laquo;</a></li>
+        <li><a href="#"><span aria-hidden="true">&laquo;</span><span class="sr-only">Previous</span></a></li>
         <li><a href="#">1</a></li>
         <li><a href="#">2</a></li>
         <li><a href="#">3</a></li>
         <li><a href="#">4</a></li>
         <li><a href="#">5</a></li>
-        <li><a href="#">&raquo;</a></li>
+        <li><a href="#"><span aria-hidden="true">&raquo;</span><span class="sr-only">Next</span></a></li>
       </ul>
     </nav>
   </div>
 {% highlight html %}
 <nav>
   <ul class="pagination">
-    <li><a href="#">&laquo;</a></li>
+    <li><a href="#"><span aria-hidden="true">&laquo;</span><span class="sr-only">Previous</span></a></li>
     <li><a href="#">1</a></li>
     <li><a href="#">2</a></li>
     <li><a href="#">3</a></li>
     <li><a href="#">4</a></li>
     <li><a href="#">5</a></li>
-    <li><a href="#">&raquo;</a></li>
+    <li><a href="#"><span aria-hidden="true">&raquo;</span><span class="sr-only">Next</span></a></li>
   </ul>
 </nav>
 {% endhighlight %}
@@ -37,30 +37,30 @@
   <div class="bs-example">
     <nav>
       <ul class="pagination">
-        <li class="disabled"><a href="#">&laquo;</a></li>
+        <li class="disabled"><a href="#"><span aria-hidden="true">&laquo;</span><span class="sr-only">Previous</span></a></li>
         <li class="active"><a href="#">1 <span class="sr-only">(current)</span></a></li>
         <li><a href="#">2</a></li>
         <li><a href="#">3</a></li>
         <li><a href="#">4</a></li>
         <li><a href="#">5</a></li>
-        <li><a href="#">&raquo;</a></li>
+        <li><a href="#"><span aria-hidden="true">&raquo;</span><span class="sr-only">Next</span></a></li>
      </ul>
    </nav>
   </div>
 {% highlight html %}
 <nav>
   <ul class="pagination">
-    <li class="disabled"><a href="#">&laquo;</a></li>
+    <li class="disabled"><a href="#"><span aria-hidden="true">&laquo;</span><span class="sr-only">Previous</span></a></li>
     <li class="active"><a href="#">1 <span class="sr-only">(current)</span></a></li>
     ...
   </ul>
 </nav>
 {% endhighlight %}
-  <p>You can optionally swap out active or disabled anchors for <code>&lt;span&gt;</code> to remove click functionality while retaining intended styles.</p>
+  <p>You can optionally swap out active or disabled anchors for <code>&lt;span&gt;</code>, or omit the anchor in the case of the previous/next arrows, to remove click functionality while retaining intended styles.</p>
 {% highlight html %}
 <nav>
   <ul class="pagination">
-    <li class="disabled"><span>&laquo;</span></li>
+    <li class="disabled"><span aria-hidden="true">&laquo;</span><span class="sr-only">Previous</span></li>
     <li class="active"><span>1 <span class="sr-only">(current)</span></span></li>
     ...
   </ul>
@@ -73,35 +73,35 @@
   <div class="bs-example">
     <nav>
       <ul class="pagination pagination-lg">
-        <li><a href="#">&laquo;</a></li>
+        <li><a href="#"><span aria-hidden="true">&laquo;</span><span class="sr-only">Previous</span></a></li>
         <li><a href="#">1</a></li>
         <li><a href="#">2</a></li>
         <li><a href="#">3</a></li>
         <li><a href="#">4</a></li>
         <li><a href="#">5</a></li>
-        <li><a href="#">&raquo;</a></li>
+        <li><a href="#"><span aria-hidden="true">&raquo;</span><span class="sr-only">Next</span></a></li>
       </ul>
     </nav>
     <nav>
       <ul class="pagination">
-        <li><a href="#">&laquo;</a></li>
+        <li><a href="#"><span aria-hidden="true">&laquo;</span><span class="sr-only">Previous</span></a></li>
         <li><a href="#">1</a></li>
         <li><a href="#">2</a></li>
         <li><a href="#">3</a></li>
         <li><a href="#">4</a></li>
         <li><a href="#">5</a></li>
-        <li><a href="#">&raquo;</a></li>
+        <li><a href="#"><span aria-hidden="true">&raquo;</span><span class="sr-only">Next</span></a></li>
       </ul>
     </nav>
     <nav>
       <ul class="pagination pagination-sm">
-        <li><a href="#">&laquo;</a></li>
+        <li><a href="#"><span aria-hidden="true">&laquo;</span><span class="sr-only">Previous</span></a></li>
         <li><a href="#">1</a></li>
         <li><a href="#">2</a></li>
         <li><a href="#">3</a></li>
         <li><a href="#">4</a></li>
         <li><a href="#">5</a></li>
-        <li><a href="#">&raquo;</a></li>
+        <li><a href="#"><span aria-hidden="true">&raquo;</span><span class="sr-only">Next</span></a></li>
       </ul>
     </nav>
   </div>
@@ -139,16 +139,16 @@
   <div class="bs-example">
     <nav>
       <ul class="pager">
-        <li class="previous"><a href="#">&larr; Older</a></li>
-        <li class="next"><a href="#">Newer &rarr;</a></li>
+        <li class="previous"><a href="#"><span aria-hidden="true">&larr;</span> Older</a></li>
+        <li class="next"><a href="#">Newer <span aria-hidden="true">&rarr;</span></a></li>
       </ul>
     </nav>
   </div>
 {% highlight html %}
 <nav>
   <ul class="pager">
-    <li class="previous"><a href="#">&larr; Older</a></li>
-    <li class="next"><a href="#">Newer &rarr;</a></li>
+    <li class="previous"><a href="#"><span aria-hidden="true">&larr;</span> Older</a></li>
+    <li class="next"><a href="#">Newer <span aria-hidden="true">&rarr;</span></a></li>
   </ul>
 </nav>
 {% endhighlight %}
@@ -159,16 +159,16 @@
   <div class="bs-example">
     <nav>
       <ul class="pager">
-        <li class="previous disabled"><a href="#">&larr; Older</a></li>
-        <li class="next"><a href="#">Newer &rarr;</a></li>
+        <li class="previous disabled"><a href="#"><span aria-hidden="true">&larr;</span> Older</a></li>
+        <li class="next"><a href="#">Newer <span aria-hidden="true">&rarr;</span></a></li>
       </ul>
     </nav>
   </div>
 {% highlight html %}
 <nav>
   <ul class="pager">
-    <li class="previous disabled"><a href="#">&larr; Older</a></li>
-    <li class="next"><a href="#">Newer &rarr;</a></li>
+    <li class="previous disabled"><a href="#"><span aria-hidden="true">&larr;</span> Older</a></li>
+    <li class="next"><a href="#">Newer <span aria-hidden="true">&rarr;</span></a></li>
   </ul>
 </nav>
 {% endhighlight %}
diff --git a/docs/_includes/css/buttons.html b/docs/_includes/css/buttons.html
index ee03c1d65..1b3f46416 100644
--- a/docs/_includes/css/buttons.html
+++ b/docs/_includes/css/buttons.html
@@ -35,6 +35,11 @@
 <button type="button" class="btn btn-link">Link</button>
 {% endhighlight %}
 
+  <div class="bs-callout bs-callout-warning">
+    <h4>Conveying meaning to assistive technologies</h4>
+    <p>Using color to add meaning to a button only provides a visual indication, which will not be conveyed to users of assistive technologies – such as screen readers. Ensure that information denoted by the color is either obvious from the content itself (the visible text of the button), or is included through alternative means, such as additional text hidden with the <code>sr-only</code> class.</p>
+  </div>
+
   <h2 id="buttons-sizes">Sizes</h2>
   <p>Fancy larger or smaller buttons? Add <code>.btn-lg</code>, <code>.btn-sm</code>, or <code>.btn-xs</code> for additional sizes.</p>
   <div class="bs-example">
@@ -88,7 +93,7 @@
 
 
   <h2 id="buttons-active">Active state</h2>
-  <p>Buttons will appear pressed (with a darker background, darker border, and inset shadow) when active. For <code>&lt;button&gt;</code> elements, this is done via <code>:active</code>. For <code>&lt;a&gt;</code> elements, it's done with <code>.active</code>. However, you may use <code>.active</code> on <code>&lt;button&gt;</code>s should you need to replicate the active state programmatically.</p>
+  <p>Buttons will appear pressed (with a darker background, darker border, and inset shadow) when active. For <code>&lt;button&gt;</code> elements, this is done via <code>:active</code>. For <code>&lt;a&gt;</code> elements, it's done with <code>.active</code>. However, you may use <code>.active</code> on <code>&lt;button&gt;</code>s (and include the <code>aria-pressed="true"</code> attribute) should you need to replicate the active state programmatically.</p>
 
   <h3>Button element</h3>
   <p>No need to add <code>:active</code> as it's a pseudo-class, but if you need to force the same appearance, go ahead and add <code>.active</code>.</p>
@@ -147,7 +152,7 @@
   </p>
   <div class="bs-callout bs-callout-warning">
     <h4>Link functionality caveat</h4>
-    <p>This class uses <code>pointer-events: none</code> to try to disable the link functionality of <code>&lt;a&gt;</code>s, but that CSS property is not yet standardized and isn't fully supported in Opera 18 and below, or in Internet Explorer 11. So to be safe, use custom JavaScript to disable such links.</p>
+    <p>This class uses <code>pointer-events: none</code> to try to disable the link functionality of <code>&lt;a&gt;</code>s, but that CSS property is not yet standardized and isn't fully supported in Opera 18 and below, or in Internet Explorer 11. In addition, even in browsers that do support <code>pointer-events: none</code>, keyboard navigation remains unaffected, meaning that sighted keyboard users and users of assistive technologies will still be able to activate these links. So to be safe, use custom JavaScript to disable such links.</p>
   </div>
   <div class="bs-callout bs-callout-warning">
     <h4>Context-specific usage</h4>
@@ -170,6 +175,11 @@
 <input class="btn btn-default" type="submit" value="Submit">
 {% endhighlight %}
 
+  <div class="bs-callout bs-callout-warning">
+    <h4>Links acting as buttons</h4>
+    <p>If the <code>&lt;a&gt;</code> elements are used to act as buttons – triggering in-page functionality, rather than navigating to another document or section within the current page – they should also be given an appropriate <code>role="button"</code>.</p>
+  </div>
+
   <div class="bs-callout bs-callout-warning">
     <h4>Cross-browser rendering</h4>
     <p>As a best practice, <strong>we highly recommend using the <code>&lt;button&gt;</code> element whenever possible</strong> to ensure matching cross-browser rendering.</p>
diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 33e0befb1..6fabb4c78 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -63,7 +63,7 @@
   </div>
   <div class="bs-callout bs-callout-warning">
     <h4>Always add labels</h4>
-    <p>Screen readers will have trouble with your forms if you don't include a label for every input. For these inline forms, you can hide the labels using the <code>.sr-only</code> class.</p>
+    <p>Screen readers will have trouble with your forms if you don't include a label for every input. For these inline forms, you can hide the labels using the <code>.sr-only</code> class. There are further alternative methods of providing a label for assistive technologies, such as the <code>aria-label</code>, <code>aria-labelledby</code> or <code>title</code> attribute. If none of these is present, screen readers may resort to using the <code>placeholder</code> attribute, if present, but note that use of <code>placeholder</code> as a replacement for other labelling methods is not advised.</p>
   </div>
   <div class="bs-example">
     <form class="form-inline" role="form">
@@ -91,14 +91,11 @@
   </div><!-- /example -->
 {% highlight html %}
 <form class="form-inline" role="form">
-  <div class="form-group">
-    <label class="sr-only" for="exampleInputEmail2">Email address</label>
-    <input type="email" class="form-control" id="exampleInputEmail2" placeholder="Enter email">
-  </div>
   <div class="form-group">
     <div class="input-group">
+      <label class="sr-only" for="exampleInputEmail2">Email address</label>
       <div class="input-group-addon">@</div>
-      <input class="form-control" type="email" placeholder="Enter email">
+      <input type="email" class="form-control" id="exampleInputEmail2" placeholder="Enter email">
     </div>
   </div>
   <div class="form-group">
@@ -205,7 +202,7 @@
   <p>Form control which supports multiple lines of text. Change <code>rows</code> attribute as necessary.</p>
   <div class="bs-example">
     <form role="form">
-      <textarea class="form-control" rows="3"></textarea>
+      <textarea class="form-control" rows="3" placeholder="Textarea"></textarea>
     </form>
   </div><!-- /.bs-example -->
 {% highlight html %}
@@ -334,18 +331,18 @@
 </label>
 {% endhighlight %}
 
-  <h4>Checkboxes and radios without labels</h4>
-  <p>Should you have no text within the <code>&lt;label&gt;</code>, the input is positioned as you'd expect. <strong>Currently only works on non-inline checkboxes and radios.</strong></p>
+  <h4>Checkboxes and radios without label text</h4>
+  <p>Should you have no text within the <code>&lt;label&gt;</code>, the input is positioned as you'd expect. <strong>Currently only works on non-inline checkboxes and radios.</strong> Remember to still provide some form of label for assistive technologies (for instance, using <code>aria-label</code>).</p>
   <div class="bs-example">
     <form role="form">
       <div class="checkbox">
         <label>
-          <input type="checkbox" id="blankCheckbox" value="option1">
+          <input type="checkbox" id="blankCheckbox" value="option1" aria-label="Checkbox without label text">
         </label>
       </div>
       <div class="radio">
         <label>
-          <input type="radio" name="blankRadio" id="blankRadio1" value="option1">
+          <input type="radio" name="blankRadio" id="blankRadio1" value="option1" aria-label="Radio button without label text">
         </label>
       </div>
     </form>
@@ -353,12 +350,12 @@
 {% highlight html %}
 <div class="checkbox">
   <label>
-    <input type="checkbox" id="blankCheckbox" value="option1">
+    <input type="checkbox" id="blankCheckbox" value="option1" aria-label="...">
   </label>
 </div>
 <div class="radio">
   <label>
-    <input type="radio" name="blankRadio" id="blankRadio1" value="option1">
+    <input type="radio" name="blankRadio" id="blankRadio1" value="option1" aria-label="...">
   </label>
 </div>
 {% endhighlight %}
@@ -464,7 +461,7 @@
 </form>
 {% endhighlight %}
 
-  <h2 id="forms-control-focus">Input focus</h2>
+  <h2 id="forms-control-focus">Focus state</h2>
   <p>We remove the default <code>outline</code> styles on some form controls and apply a <code>box-shadow</code> in its place for <code>:focus</code>.</p>
   <div class="bs-example">
     <form role="form">
@@ -477,7 +474,7 @@
   </div>
 
 
-  <h2 id="forms-control-disabled">Disabled inputs</h2>
+  <h2 id="forms-control-disabled">Disabled state</h2>
   <p>Add the <code>disabled</code> boolean attribute on an input to prevent user input and trigger a slightly different look.</p>
   <div class="bs-example">
     <form role="form">
@@ -547,7 +544,7 @@
 {% endhighlight %}
 
 
-  <h2 id="forms-control-readonly">Readonly inputs</h2>
+  <h2 id="forms-control-readonly">Readonly state</h2>
   <p>Add the <code>readonly</code> boolean attribute on an input to prevent user input and style the input as disabled.</p>
   <div class="bs-example">
     <form role="form">
@@ -562,6 +559,12 @@
   <h2 id="forms-control-validation">Validation states</h2>
   <p>Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add <code>.has-warning</code>, <code>.has-error</code>, or <code>.has-success</code> to the parent element. Any <code>.control-label</code>, <code>.form-control</code>, and <code>.help-block</code> within that element will receive the validation styles.</p>
 
+  <div class="bs-callout bs-callout-warning">
+    <h4>Conveying validation state to assistive technologies</h4>
+    <p>Using these validation styles to denote the state of a form control only provides a visual indication, which will not be conveyed to users of assistive technologies – such as screen readers.</p>
+    <p>Ensure that an alternative indication of state is also provided. For instance, you can include a hint about state in the form control's <code>&lt;label&gt;</code> text itself (as is the case in the following code example), or associate an additional element with textual information about the validation state with the form control using <code>aria-describedby</code> (see the example in the following section). In the case of an error, you could also use the <code>aria-invalid="true"</code> attribute on the form control.</p>
+  </div>
+
   <div class="bs-example">
     <form role="form">
       <div class="form-group has-success">
@@ -648,40 +651,45 @@
     <h4>Icons, labels, and input groups</h4>
     <p>Manual positioning of feedback icons is required for inputs without a label and for <a href="../components#input-groups">input groups</a> with an add-on on the right. You are strongly encouraged to provide labels for all inputs for accessibility reasons. If you wish to prevent labels from being displayed, hide them with the <code>sr-only</code> class. If you must do without labels, adjust the <code>top</code> value of the feedback icon. For input groups, adjust the <code>right</code> value to an appropriate pixel value depending on the width of your addon.</p>
   </div>
+  <div class="bs-callout bs-callout-warning">
+    <h4>Conveying the icon's meaning to assistive technologies</h4>
+    <p>To ensure that assistive technologies – such as screen readers – correctly convey the meaning of an icon, additional hidden text should be included with the <code>sr-only</code> class, and the icon itself explicitly associated with the form control it relates to using <code>aria-describedby</code>. Alternatively, ensure that the meaning (for instance, the fact that there is a warning for a particular text entry field) is conveyed in some other form, such as changing the text of the actual <code>&lt;label&gt;</code> associated with the form control.</p>
+    <p>Although the following examples already mention the validation state of their respective form controls in the <code>&lt;label&gt;</code> text itself, the above technique (using <code>sr-only</code> text and <code>aria-describedby</code>) has been included for illustrative purposes.</p>
+  </div>
   <div class="bs-example">
     <form role="form">
       <div class="form-group has-success has-feedback">
         <label class="control-label" for="inputSuccess2">Input with success</label>
-        <input type="text" class="form-control" id="inputSuccess2">
-        <span class="glyphicon glyphicon-ok form-control-feedback"></span>
+        <input type="text" class="form-control" id="inputSuccess2" aria-describedby="inputSuccess2Icon">
+        <span id="inputSuccess2Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
       </div>
       <div class="form-group has-warning has-feedback">
         <label class="control-label" for="inputWarning2">Input with warning</label>
-        <input type="text" class="form-control" id="inputWarning2">
-        <span class="glyphicon glyphicon-warning-sign form-control-feedback"></span>
+        <input type="text" class="form-control" id="inputWarning2" aria-describedby="inputWarning2Icon">
+        <span id="inputWarning2Icon" class="glyphicon glyphicon-warning-sign form-control-feedback"><span class="sr-only">(warning)</span></span>
       </div>
       <div class="form-group has-error has-feedback">
         <label class="control-label" for="inputError2">Input with error</label>
-        <input type="text" class="form-control" id="inputError2">
-        <span class="glyphicon glyphicon-remove form-control-feedback"></span>
+        <input type="text" class="form-control" id="inputError2" aria-describedby="inputError2Icon">
+        <span id="inputError2Icon" class="glyphicon glyphicon-remove form-control-feedback"><span class="sr-only">(error)</span></span>
       </div>
     </form>
   </div>
 {% highlight html %}
 <div class="form-group has-success has-feedback">
   <label class="control-label" for="inputSuccess2">Input with success</label>
-  <input type="text" class="form-control" id="inputSuccess2">
-  <span class="glyphicon glyphicon-ok form-control-feedback"></span>
+  <input type="text" class="form-control" id="inputSuccess2" aria-describedby="inputSuccess2Icon">
+  <span id="inputSuccess2Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
 </div>
 <div class="form-group has-warning has-feedback">
   <label class="control-label" for="inputWarning2">Input with warning</label>
-  <input type="text" class="form-control" id="inputWarning2">
-  <span class="glyphicon glyphicon-warning-sign form-control-feedback"></span>
+  <input type="text" class="form-control" id="inputWarning2" aria-describedby="inputWarning2Icon">
+  <span id="inputWarning2Icon" class="glyphicon glyphicon-warning-sign form-control-feedback"><span class="sr-only">(warning)</span></span>
 </div>
 <div class="form-group has-error has-feedback">
   <label class="control-label" for="inputError2">Input with error</label>
-  <input type="text" class="form-control" id="inputError2">
-  <span class="glyphicon glyphicon-remove form-control-feedback"></span>
+  <input type="text" class="form-control" id="inputError2" aria-describedby="inputError2Icon">
+  <span id="inputError2Icon" class="glyphicon glyphicon-remove form-control-feedback"><span class="sr-only">(error)</span></span>
 </div>
 {% endhighlight %}
 
@@ -691,8 +699,8 @@
       <div class="form-group has-success has-feedback">
         <label class="control-label col-sm-3" for="inputSuccess3">Input with success</label>
         <div class="col-sm-9">
-          <input type="text" class="form-control" id="inputSuccess3">
-          <span class="glyphicon glyphicon-ok form-control-feedback"></span>
+          <input type="text" class="form-control" id="inputSuccess3" aria-describedby="inputSuccess3Icon">
+          <span id="inputSuccess3Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
         </div>
       </div>
     </form>
@@ -702,8 +710,8 @@
   <div class="form-group has-success has-feedback">
     <label class="control-label col-sm-3" for="inputSuccess3">Input with success</label>
     <div class="col-sm-9">
-      <input type="text" class="form-control" id="inputSuccess3">
-      <span class="glyphicon glyphicon-ok form-control-feedback"></span>
+      <input type="text" class="form-control" id="inputSuccess3" aria-describedby="inputSuccess3Icon">
+      <span id="inputSuccess3Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
     </div>
   </div>
 </form>
@@ -713,8 +721,8 @@
     <form class="form-inline" role="form">
       <div class="form-group has-success has-feedback">
         <label class="control-label" for="inputSuccess4">Input with success</label>
-        <input type="text" class="form-control" id="inputSuccess4">
-        <span class="glyphicon glyphicon-ok form-control-feedback"></span>
+        <input type="text" class="form-control" id="inputSuccess4" aria-describedby="inputSuccess4Icon">
+        <span id="inputSuccess4Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
       </div>
     </form>
   </div>
@@ -722,8 +730,8 @@
 <form class="form-inline" role="form">
   <div class="form-group has-success has-feedback">
     <label class="control-label" for="inputSuccess4">Input with success</label>
-    <input type="text" class="form-control" id="inputSuccess4">
-    <span class="glyphicon glyphicon-ok form-control-feedback"></span>
+    <input type="text" class="form-control" id="inputSuccess4" aria-describedby="inputSuccess4Icon">
+    <span id="inputSuccess4Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
   </div>
 </form>
 {% endhighlight %}
@@ -733,15 +741,15 @@
   <div class="bs-example">
     <div class="form-group has-success has-feedback">
       <label class="control-label sr-only" for="inputSuccess5">Hidden label</label>
-      <input type="text" class="form-control" id="inputSuccess5">
-      <span class="glyphicon glyphicon-ok form-control-feedback"></span>
+      <input type="text" class="form-control" id="inputSuccess5" aria-describedby="inputSuccess5Icon">
+      <span id="inputSuccess5Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
     </div>
   </div>
 {% highlight html %}
 <div class="form-group has-success has-feedback">
   <label class="control-label sr-only" for="inputSuccess5">Hidden label</label>
-  <input type="text" class="form-control" id="inputSuccess5">
-  <span class="glyphicon glyphicon-ok form-control-feedback"></span>
+  <input type="text" class="form-control" id="inputSuccess5" aria-describedby="inputSuccess5Icon">
+  <span id="inputSuccess5Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
 </div>
 {% endhighlight %}
 
@@ -849,13 +857,23 @@
 
   <h2 id="forms-help-text">Help text</h2>
   <p>Block level help text for form controls.</p>
+  <div class="bs-callout bs-callout-info">
+    <h4>Associating help text with form controls</h4>
+    <p>Help text should be explicitly associated with the form control it relates to using the <code>aria-describedby</code> attribute. This will ensure that assistive technologies – such as screen readers – will announce this help text when the user focuses or enters the control.</p>
+  </div>
   <div class="bs-example">
     <form role="form">
-      <input type="text" class="form-control">
-      <span class="help-block">A block of help text that breaks onto a new line and may extend beyond one line.</span>
+      <div class="form-group">
+        <label for="inputHelpBlock">Input with help text</label>
+        <input type="text" id="inputHelpBlock" class="form-control" aria-describedby="helpBlock">
+      </div>
+      <span id="helpBlock" class="help-block">A block of help text that breaks onto a new line and may extend beyond one line.</span>
     </form>
   </div><!-- /.bs-example -->
 {% highlight html %}
-<span class="help-block">A block of help text that breaks onto a new line and may extend beyond one line.</span>
+<label class="sr-only" for="inputHelpBlock">Input with help text</label>
+<input type="text" id="inputHelpBlock" class="form-control" aria-describedby="helpBlock">
+...
+<span id="helpBlock" class="help-block">A block of help text that breaks onto a new line and may extend beyond one line.</span>
 {% endhighlight %}
 </div>
diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html
index 429ef90f9..cea5b17ee 100644
--- a/docs/_includes/css/grid.html
+++ b/docs/_includes/css/grid.html
@@ -226,7 +226,7 @@
 </div>
 {% endhighlight %}
 
-  <h3 id="grid-example-mixed-complete">Example: Mobile, tablet, desktops</h3>
+  <h3 id="grid-example-mixed-complete">Example: Mobile, tablet, desktop</h3>
   <p>Build on the previous example by creating even more dynamic and powerful layouts with tablet <code>.col-sm-*</code> classes.</p>
   <div class="bs-docs-grid">
     <div class="row show-grid">
diff --git a/docs/_includes/css/helpers.html b/docs/_includes/css/helpers.html
index 9b7223740..a661ded22 100644
--- a/docs/_includes/css/helpers.html
+++ b/docs/_includes/css/helpers.html
@@ -23,6 +23,10 @@
     <h4>Dealing with specificity</h4>
     <p>Sometimes emphasis classes cannot be applied due to the specificity of another selector. In most cases, a sufficient workaround is to wrap your text in a <code>&lt;span&gt;</code> with the class.</p>
   </div>
+  <div class="bs-callout bs-callout-warning">
+    <h4>Conveying meaning to assistive technologies</h4>
+    <p>Using color to add meaning only provides a visual indication, which will not be conveyed to users of assistive technologies – such as screen readers. Ensure that information denoted by the color is either obvious from the content itself (the contextual colors are only used to reinforce meaning that is already present in the text/markup), or is included through alternative means, such as additional text hidden with the <code>.sr-only</code> class.</p>
+  </div>
 
   <h3 id="helper-classes-backgrounds">Contextual backgrounds</h3>
   <p>Similar to the contextual text color classes, easily set the background of an element to any contextual class. Anchor components will darken on hover, just like the text classes.</p>
@@ -44,6 +48,10 @@
     <h4>Dealing with specificity</h4>
     <p>Sometimes contextual background classes cannot be applied due to the specificity of another selector. In some cases, a sufficient workaround is to wrap your element's content in a <code>&lt;div&gt;</code> with the class.</p>
   </div>
+  <div class="bs-callout bs-callout-warning">
+    <h4>Conveying meaning to assistive technologies</h4>
+    <p>As with <a href="#helper-classes-colors">contextual colors</a>, ensure that any meaning conveyed through color is also conveyed in a format that is not purely presentational.</p>
+  </div>
 
   <h3 id="helper-classes-close">Close icon</h3>
   <p>Use the generic close icon for dismissing content like modals and alerts.</p>
diff --git a/docs/_includes/css/tables.html b/docs/_includes/css/tables.html
index 011a4dbba..d09c34068 100644
--- a/docs/_includes/css/tables.html
+++ b/docs/_includes/css/tables.html
@@ -346,7 +346,10 @@
   <td class="info">...</td>
 </tr>
 {% endhighlight %}
-
+  <div class="bs-callout bs-callout-warning">
+    <h4>Conveying meaning to assistive technologies</h4>
+    <p>Using color to add meaning to a table row or individual cell only provides a visual indication, which will not be conveyed to users of assistive technologies – such as screen readers. Ensure that information denoted by the color is either obvious from the content itself (the visible text in the relevant table row/cell), or is included through alternative means, such as additional text hidden with the <code>sr-only</code> class.</p>
+  </div>
 
   <h2 id="tables-responsive">Responsive tables</h2>
   <p>Create responsive tables by wrapping any <code>.table</code> in <code>.table-responsive</code> to make them scroll horizontally on small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.</p>
diff --git a/docs/_includes/getting-started/accessibility.html b/docs/_includes/getting-started/accessibility.html
index cb9b3e11e..5a60bc83b 100644
--- a/docs/_includes/getting-started/accessibility.html
+++ b/docs/_includes/getting-started/accessibility.html
@@ -17,9 +17,14 @@
   <p>When nesting headings (<code>&lt;h1&gt;</code> - <code>&lt;h6&gt;</code>), your primary document header should be an <code>&lt;h1&gt;</code>. Subsequent headings should make logical use of <code>&lt;h2&gt;</code> - <code>&lt;h6&gt;</code> such that screen readers can construct a table of contents for your pages.</p>
   <p>Learn more at <a href="http://squizlabs.github.io/HTML_CodeSniffer/Standards/Section508/">HTML CodeSniffer</a> and <a href="http://accessibility.psu.edu/headings">Penn State's AccessAbility</a>.</p>
 
+  <h3>Color contrast</h3>
+  <p>Currently, some of the default color combinations available in Bootstrap (such as the various <a href="../css/#buttons">styled button</a> classes, some of the code highlighting colors used for <a href="../css/#code-block">basic code blocks</a>, the <code>.bg-primary</code> <a href="..css/#helper-classes-backgrounds">contextual background</a> helper class, and the default link color when used on a white background) have a low contrast ratio (below the <a href="http://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast">recommended ratio of 4.5:1</a>). This can cause problems to users with low vision or who are color blind. These default colors may need to be modified to increase their contrast and legibility.</p>
+
   <h3>Additional resources</h3>
   <ul>
     <li><a href="https://github.com/squizlabs/HTML_CodeSniffer">"HTML Codesniffer" bookmarklet for identifying accessibility issues</a></li>
+    <li><a href="https://chrome.google.com/webstore/detail/accessibility-developer-t/fpkknkljclfencbdbgkenhalefipecmb?hl=en">Chrome's Accessibility Developer Tools extension</a></li>
+    <li><a href="http://www.paciellogroup.com/resources/contrastanalyser/">Colour Contrast Analyser</a>
     <li><a href="http://a11yproject.com/">The A11Y Project</a></li>
     <li><a href="https://developer.mozilla.org/en-US/docs/Accessibility">MDN accessibility documentation</a></li>
   </ul>
diff --git a/docs/_includes/js/tabs.html b/docs/_includes/js/tabs.html
index aec6485aa..69f0cc45f 100644
--- a/docs/_includes/js/tabs.html
+++ b/docs/_includes/js/tabs.html
@@ -3,7 +3,7 @@
 
   <h2 id="tabs-examples">Example tabs</h2>
   <p>Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.</p>
-  <div class="bs-example bs-example-tabs">
+  <div class="bs-example bs-example-tabs" role="tabpanel">
     <ul id="myTab" class="nav nav-tabs" role="tablist">
       <li role="presentation" class="active"><a href="#home" id="home-tab" role="tab" data-toggle="tab" aria-controls="home" aria-expanded="true">Home</a></li>
       <li role="presentation"><a href="#profile" role="tab" id="profile-tab" data-toggle="tab" aria-controls="profile">Profile</a></li>
@@ -59,20 +59,24 @@ $('#myTab li:eq(2) a').tab('show') // Select third tab (0-indexed)
   <h3>Markup</h3>
   <p>You can activate a tab or pill navigation without writing any JavaScript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element. Adding the <code>nav</code> and <code>nav-tabs</code> classes to the tab <code>ul</code> will apply the Bootstrap <a href="../components/#nav-tabs">tab styling</a>, while adding the <code>nav</code> and <code>nav-pills</code> classes will apply <a href="../components/#nav-pills">pill styling</a>.</p>
 {% highlight html %}
-<!-- Nav tabs -->
-<ul class="nav nav-tabs" role="tablist">
-  <li role="presentation" class="active"><a href="#home" role="tab" data-toggle="tab">Home</a></li>
-  <li role="presentation"><a href="#profile" role="tab" data-toggle="tab">Profile</a></li>
-  <li role="presentation"><a href="#messages" role="tab" data-toggle="tab">Messages</a></li>
-  <li role="presentation"><a href="#settings" role="tab" data-toggle="tab">Settings</a></li>
-</ul>
+<div role="tabpanel">
+
+  <!-- Nav tabs -->
+  <ul class="nav nav-tabs" role="tablist">
+    <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">Home</a></li>
+    <li role="presentation"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Profile</a></li>
+    <li role="presentation"><a href="#messages" aria-controls="messages" role="tab" data-toggle="tab">Messages</a></li>
+    <li role="presentation"><a href="#settings" aria-controls="settings" role="tab" data-toggle="tab">Settings</a></li>
+  </ul>
+
+  <!-- Tab panes -->
+  <div class="tab-content">
+    <div role="tabpanel" class="tab-pane active" id="home">...</div>
+    <div role="tabpanel" class="tab-pane" id="profile">...</div>
+    <div role="tabpanel" class="tab-pane" id="messages">...</div>
+    <div role="tabpanel" class="tab-pane" id="settings">...</div>
+  </div>
 
-<!-- Tab panes -->
-<div class="tab-content">
-  <div role="tabpanel" class="tab-pane active" id="home">...</div>
-  <div role="tabpanel" class="tab-pane" id="profile">...</div>
-  <div role="tabpanel" class="tab-pane" id="messages">...</div>
-  <div role="tabpanel" class="tab-pane" id="settings">...</div>
 </div>
 {% endhighlight %}
 
@@ -94,10 +98,10 @@ $('#myTab li:eq(2) a').tab('show') // Select third tab (0-indexed)
   </p>
 {% highlight html %}
 <ul class="nav nav-tabs" role="tablist" id="myTab">
-  <li role="presentation" class="active"><a href="#home" role="tab" data-toggle="tab">Home</a></li>
-  <li role="presentation"><a href="#profile" role="tab" data-toggle="tab">Profile</a></li>
-  <li role="presentation"><a href="#messages" role="tab" data-toggle="tab">Messages</a></li>
-  <li role="presentation"><a href="#settings" role="tab" data-toggle="tab">Settings</a></li>
+  <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">Home</a></li>
+  <li role="presentation"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Profile</a></li>
+  <li role="presentation"><a href="#messages" aria-controls="messages" role="tab" data-toggle="tab">Messages</a></li>
+  <li role="presentation"><a href="#settings" aria-controls="settings" role="tab" data-toggle="tab">Settings</a></li>
 </ul>
 
 <div class="tab-content">
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>
-- 
cgit v1.2.3


From 917decab6cc15c0178b1ebf9d30e4e3c0ef90c7f Mon Sep 17 00:00:00 2001
From: Jayanth Koushik <jnkoushik@gmail.com>
Date: Tue, 11 Nov 2014 15:28:21 +0530
Subject: Fix Issue #15076.

This commit adds documentation explaining the need to have an initial
.active element in carousels.
---
 docs/_includes/js/carousel.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html
index a74802b62..56dd856d9 100644
--- a/docs/_includes/js/carousel.html
+++ b/docs/_includes/js/carousel.html
@@ -75,6 +75,11 @@
     <p>Bootstrap exclusively uses CSS3 for its animations, but Internet Explorer 8 &amp; 9 don't support the necessary CSS properties. Thus, there are no slide transition animations when using these browsers. We have intentionally decided not to include jQuery-based fallbacks for the transitions.</p>
   </div>
 
+  <div class="bs-callout bs-callout-warning" id="callout-carousel-active">
+    <h4>Initial active element required</h4>
+    <p>The <code>.active</code> class needs to be added to one of the slides. Otherwise, the carousel will not be visible.</p>
+  </div>
+
   <h3>Optional captions</h3>
   <p>Add captions to your slides easily with the <code>.carousel-caption</code> element within any <code>.item</code>. Place just about any optional HTML within there and it will be automatically aligned and formatted.</p>
   <div class="bs-example">
-- 
cgit v1.2.3


From eb580f739ce8aec357f0847a687a8b372ab0d58a Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Tue, 11 Nov 2014 22:13:25 +0000
Subject: Improved accessible glyphicon advice/use

...to actually make it consistent with what I said in the glyphicon docs
section...
---
 docs/_includes/css/forms.html | 62 ++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 25 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 6fabb4c78..96b9b6ce0 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -653,43 +653,49 @@
   </div>
   <div class="bs-callout bs-callout-warning">
     <h4>Conveying the icon's meaning to assistive technologies</h4>
-    <p>To ensure that assistive technologies – such as screen readers – correctly convey the meaning of an icon, additional hidden text should be included with the <code>sr-only</code> class, and the icon itself explicitly associated with the form control it relates to using <code>aria-describedby</code>. Alternatively, ensure that the meaning (for instance, the fact that there is a warning for a particular text entry field) is conveyed in some other form, such as changing the text of the actual <code>&lt;label&gt;</code> associated with the form control.</p>
+    <p>To ensure that assistive technologies – such as screen readers – correctly convey the meaning of an icon, additional hidden text should be included with the <code>sr-only</code> class and explicitly associated with the form control it relates to using <code>aria-describedby</code>. Alternatively, ensure that the meaning (for instance, the fact that there is a warning for a particular text entry field) is conveyed in some other form, such as changing the text of the actual <code>&lt;label&gt;</code> associated with the form control.</p>
     <p>Although the following examples already mention the validation state of their respective form controls in the <code>&lt;label&gt;</code> text itself, the above technique (using <code>sr-only</code> text and <code>aria-describedby</code>) has been included for illustrative purposes.</p>
   </div>
   <div class="bs-example">
     <form role="form">
       <div class="form-group has-success has-feedback">
         <label class="control-label" for="inputSuccess2">Input with success</label>
-        <input type="text" class="form-control" id="inputSuccess2" aria-describedby="inputSuccess2Icon">
-        <span id="inputSuccess2Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
+        <input type="text" class="form-control" id="inputSuccess2" aria-describedby="inputSuccess2Status">
+        <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
+        <span id="inputSuccess2Status" class="sr-only">(success)</span>
       </div>
       <div class="form-group has-warning has-feedback">
         <label class="control-label" for="inputWarning2">Input with warning</label>
-        <input type="text" class="form-control" id="inputWarning2" aria-describedby="inputWarning2Icon">
-        <span id="inputWarning2Icon" class="glyphicon glyphicon-warning-sign form-control-feedback"><span class="sr-only">(warning)</span></span>
+        <input type="text" class="form-control" id="inputWarning2" aria-describedby="inputWarning2Status">
+        <span class="glyphicon glyphicon-warning-sign form-control-feedback" aria-hidden="true"></span>
+        <span id="inputWarning2Status" class="sr-only">(warning)</span>
       </div>
       <div class="form-group has-error has-feedback">
         <label class="control-label" for="inputError2">Input with error</label>
-        <input type="text" class="form-control" id="inputError2" aria-describedby="inputError2Icon">
-        <span id="inputError2Icon" class="glyphicon glyphicon-remove form-control-feedback"><span class="sr-only">(error)</span></span>
+        <input type="text" class="form-control" id="inputError2" aria-describedby="inputError2Status">
+        <span class="glyphicon glyphicon-remove form-control-feedback" aria-hidden="true"></span>
+        <span id="inputError2Status" class="sr-only">(error)</span>
       </div>
     </form>
   </div>
 {% highlight html %}
 <div class="form-group has-success has-feedback">
   <label class="control-label" for="inputSuccess2">Input with success</label>
-  <input type="text" class="form-control" id="inputSuccess2" aria-describedby="inputSuccess2Icon">
-  <span id="inputSuccess2Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
+  <input type="text" class="form-control" id="inputSuccess2" aria-describedby="inputSuccess2Status">
+  <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
+  <span id="inputSuccess2Status" class="sr-only">(success)</span>
 </div>
 <div class="form-group has-warning has-feedback">
   <label class="control-label" for="inputWarning2">Input with warning</label>
-  <input type="text" class="form-control" id="inputWarning2" aria-describedby="inputWarning2Icon">
-  <span id="inputWarning2Icon" class="glyphicon glyphicon-warning-sign form-control-feedback"><span class="sr-only">(warning)</span></span>
+  <input type="text" class="form-control" id="inputWarning2" aria-describedby="inputWarning2Status">
+  <span class="glyphicon glyphicon-warning-sign form-control-feedback" aria-hidden="true"></span>
+  <span id="inputWarning2Status" class="sr-only">(warning)</span>
 </div>
 <div class="form-group has-error has-feedback">
   <label class="control-label" for="inputError2">Input with error</label>
-  <input type="text" class="form-control" id="inputError2" aria-describedby="inputError2Icon">
-  <span id="inputError2Icon" class="glyphicon glyphicon-remove form-control-feedback"><span class="sr-only">(error)</span></span>
+  <input type="text" class="form-control" id="inputError2" aria-describedby="inputError2Status">
+  <span class="glyphicon glyphicon-remove form-control-feedback" aria-hidden="true"></span>
+  <span id="inputError2Status" class="sr-only">(error)</span>
 </div>
 {% endhighlight %}
 
@@ -699,8 +705,9 @@
       <div class="form-group has-success has-feedback">
         <label class="control-label col-sm-3" for="inputSuccess3">Input with success</label>
         <div class="col-sm-9">
-          <input type="text" class="form-control" id="inputSuccess3" aria-describedby="inputSuccess3Icon">
-          <span id="inputSuccess3Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
+          <input type="text" class="form-control" id="inputSuccess3" aria-describedby="inputSuccess3Status">
+          <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
+          <span id="inputSuccess3Status" class="sr-only">(success)</span>
         </div>
       </div>
     </form>
@@ -710,8 +717,9 @@
   <div class="form-group has-success has-feedback">
     <label class="control-label col-sm-3" for="inputSuccess3">Input with success</label>
     <div class="col-sm-9">
-      <input type="text" class="form-control" id="inputSuccess3" aria-describedby="inputSuccess3Icon">
-      <span id="inputSuccess3Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
+      <input type="text" class="form-control" id="inputSuccess3" aria-describedby="inputSuccess3Status">
+      <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
+      <span id="inputSuccess3Status" class="sr-only">(success)</span>
     </div>
   </div>
 </form>
@@ -721,8 +729,9 @@
     <form class="form-inline" role="form">
       <div class="form-group has-success has-feedback">
         <label class="control-label" for="inputSuccess4">Input with success</label>
-        <input type="text" class="form-control" id="inputSuccess4" aria-describedby="inputSuccess4Icon">
-        <span id="inputSuccess4Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
+        <input type="text" class="form-control" id="inputSuccess4" aria-describedby="inputSuccess4Status">
+        <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
+        <span id="inputSuccess4Status" class="sr-only">(success)</span>
       </div>
     </form>
   </div>
@@ -730,8 +739,9 @@
 <form class="form-inline" role="form">
   <div class="form-group has-success has-feedback">
     <label class="control-label" for="inputSuccess4">Input with success</label>
-    <input type="text" class="form-control" id="inputSuccess4" aria-describedby="inputSuccess4Icon">
-    <span id="inputSuccess4Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
+    <input type="text" class="form-control" id="inputSuccess4" aria-describedby="inputSuccess4Status">
+    <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
+    <span id="inputSuccess4Status" class="sr-only">(success)</span>
   </div>
 </form>
 {% endhighlight %}
@@ -741,15 +751,17 @@
   <div class="bs-example">
     <div class="form-group has-success has-feedback">
       <label class="control-label sr-only" for="inputSuccess5">Hidden label</label>
-      <input type="text" class="form-control" id="inputSuccess5" aria-describedby="inputSuccess5Icon">
-      <span id="inputSuccess5Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
+      <input type="text" class="form-control" id="inputSuccess5" aria-describedby="inputSuccess5Status">
+      <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
+      <span id="inputSuccess5Status" class="sr-only">(success)</span>
     </div>
   </div>
 {% highlight html %}
 <div class="form-group has-success has-feedback">
   <label class="control-label sr-only" for="inputSuccess5">Hidden label</label>
-  <input type="text" class="form-control" id="inputSuccess5" aria-describedby="inputSuccess5Icon">
-  <span id="inputSuccess5Icon" class="glyphicon glyphicon-ok form-control-feedback"><span class="sr-only">(success)</span></span>
+  <input type="text" class="form-control" id="inputSuccess5" aria-describedby="inputSuccess5Status">
+  <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
+  <span id="inputSuccess5Status" class="sr-only">(success)</span>
 </div>
 {% endhighlight %}
 
-- 
cgit v1.2.3


From 9391ef207ff05f28e3952afdb92639c02b5920f5 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Tue, 11 Nov 2014 22:41:21 +0000
Subject: aria-hidden added to some stray glyphicons

plus minor tweak to customizer's generated alerts
---
 .../getting-started/browser-device-support.html    | 46 +++++++++++-----------
 docs/_includes/js/carousel.html                    | 12 +++---
 2 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html
index 306023d7b..2f3802b84 100644
--- a/docs/_includes/getting-started/browser-device-support.html
+++ b/docs/_includes/getting-started/browser-device-support.html
@@ -19,33 +19,33 @@
       <tbody>
         <tr>
           <th>Android</th>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
           <td class="text-muted" rowspan="3" style="vertical-align: middle;">N/A</td>
-          <td class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not Supported</td>
+          <td class="text-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Not Supported</td>
           <td class="text-muted">N/A</td>
         </tr>
         <tr>
           <th>iOS</th>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
           <td class="text-muted">N/A</td>
-          <td class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not Supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
+          <td class="text-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Not Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
         </tr>
         <tr>
           <th>Mac OS X</th>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
         </tr>
         <tr>
           <th>Windows</th>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
-          <td class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
+          <td class="text-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Not Supported</td>
         </tr>
       </tbody>
     </table>
@@ -67,26 +67,26 @@
       <tbody>
         <tr>
           <th scope="row"><code>border-radius</code></th>
-          <td class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
+          <td class="text-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Not supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
         </tr>
         <tr>
           <th scope="row"><code>box-shadow</code></th>
-          <td class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
+          <td class="text-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Not supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported</td>
         </tr>
         <tr>
           <th scope="row"><code>transform</code></th>
-          <td class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not supported</td>
-          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported, with <code>-ms</code> prefix</td>
+          <td class="text-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Not supported</td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Supported, with <code>-ms</code> prefix</td>
         </tr>
         <tr>
           <th scope="row"><code>transition</code></th>
-          <td colspan="2" class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not supported</td>
+          <td colspan="2" class="text-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Not supported</td>
         </tr>
         <tr>
           <th scope="row"><code>placeholder</code></th>
-          <td colspan="2" class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not supported</td>
+          <td colspan="2" class="text-danger"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Not supported</td>
         </tr>
       </tbody>
     </table>
diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html
index a74802b62..9c13aa033 100644
--- a/docs/_includes/js/carousel.html
+++ b/docs/_includes/js/carousel.html
@@ -23,11 +23,11 @@
         </div>
       </div>
       <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
-        <span class="glyphicon glyphicon-chevron-left"></span>
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
         <span class="sr-only">Previous</span>
       </a>
       <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
-        <span class="glyphicon glyphicon-chevron-right"></span>
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
         <span class="sr-only">Next</span>
       </a>
     </div>
@@ -60,11 +60,11 @@
 
   <!-- Controls -->
   <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
-    <span class="glyphicon glyphicon-chevron-left"></span>
+    <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
     <span class="sr-only">Previous</span>
   </a>
   <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
-    <span class="glyphicon glyphicon-chevron-right"></span>
+    <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
     <span class="sr-only">Next</span>
   </a>
 </div>
@@ -108,11 +108,11 @@
         </div>
       </div>
       <a class="left carousel-control" href="#carousel-example-captions" role="button" data-slide="prev">
-        <span class="glyphicon glyphicon-chevron-left"></span>
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
         <span class="sr-only">Previous</span>
       </a>
       <a class="right carousel-control" href="#carousel-example-captions" role="button" data-slide="next">
-        <span class="glyphicon glyphicon-chevron-right"></span>
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
         <span class="sr-only">Next</span>
       </a>
     </div>
-- 
cgit v1.2.3


From 0681971c8aea1c4de4ae3878506477b835cacc6b Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Tue, 11 Nov 2014 23:52:52 +0000
Subject: Wash-up of some stray dropdown examples

adding explicit aria-expanded="false" initial state (so they're
correctly announced by AT as being collapsed), and - in the case of
old-school use of <a> - role="button"
---
 docs/_includes/components/navbar.html |  8 ++++----
 docs/_includes/js/dropdowns.html      | 16 ++++++++--------
 docs/_includes/js/scrollspy.html      |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/components/navbar.html b/docs/_includes/components/navbar.html
index d0f8a67d6..e876e80a3 100644
--- a/docs/_includes/components/navbar.html
+++ b/docs/_includes/components/navbar.html
@@ -43,7 +43,7 @@
             <li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
             <li><a href="#">Link</a></li>
             <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
               <ul class="dropdown-menu" role="menu">
                 <li><a href="#">Action</a></li>
                 <li><a href="#">Another action</a></li>
@@ -64,7 +64,7 @@
           <ul class="nav navbar-nav navbar-right">
             <li><a href="#">Link</a></li>
             <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
               <ul class="dropdown-menu" role="menu">
                 <li><a href="#">Action</a></li>
                 <li><a href="#">Another action</a></li>
@@ -98,7 +98,7 @@
         <li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
         <li><a href="#">Link</a></li>
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">
             <li><a href="#">Action</a></li>
             <li><a href="#">Another action</a></li>
@@ -119,7 +119,7 @@
       <ul class="nav navbar-nav navbar-right">
         <li><a href="#">Link</a></li>
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">
             <li><a href="#">Action</a></li>
             <li><a href="#">Another action</a></li>
diff --git a/docs/_includes/js/dropdowns.html b/docs/_includes/js/dropdowns.html
index 64b03fa54..826fe6c08 100644
--- a/docs/_includes/js/dropdowns.html
+++ b/docs/_includes/js/dropdowns.html
@@ -20,7 +20,7 @@
         <div class="collapse navbar-collapse bs-example-js-navbar-collapse">
           <ul class="nav navbar-nav">
             <li class="dropdown">
-              <a id="drop1" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              <a id="drop1" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" role="button" aria-expanded="false">
                 Dropdown
                 <span class="caret"></span>
               </a>
@@ -33,7 +33,7 @@
               </ul>
             </li>
             <li class="dropdown">
-              <a id="drop2" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              <a id="drop2" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" role="button" aria-expanded="false">
                 Dropdown
                 <span class="caret"></span>
               </a>
@@ -48,7 +48,7 @@
           </ul>
           <ul class="nav navbar-nav navbar-right">
             <li id="fat-menu" class="dropdown">
-              <a id="drop3" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              <a id="drop3" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" role="button" aria-expanded="false">
                 Dropdown
                 <span class="caret"></span>
               </a>
@@ -71,7 +71,7 @@
     <ul class="nav nav-pills" role="tablist">
       <li role="presentation" class="active"><a href="#">Regular link</a></li>
       <li role="presentation" class="dropdown">
-        <a id="drop4" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <a id="drop4" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" role="button" aria-expanded="false">
           Dropdown
           <span class="caret"></span>
         </a>
@@ -84,7 +84,7 @@
         </ul>
       </li>
       <li role="presentation" class="dropdown">
-        <a id="drop5" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <a id="drop5" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" role="button" aria-expanded="false">
           Dropdown
           <span class="caret"></span>
         </a>
@@ -97,7 +97,7 @@
         </ul>
       </li>
       <li role="presentation" class="dropdown">
-        <a id="drop6" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <a id="drop6" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" role="button" aria-expanded="false">
           Dropdown
           <span class="caret"></span>
         </a>
@@ -122,7 +122,7 @@
   <p>Add <code>data-toggle="dropdown"</code> to a link or button to toggle a dropdown.</p>
 {% highlight html %}
 <div class="dropdown">
-  <button id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+  <button id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" role="button" aria-expanded="false">
     Dropdown trigger
     <span class="caret"></span>
   </button>
@@ -134,7 +134,7 @@
   <p>To keep URLs intact with link buttons, use the <code>data-target</code> attribute instead of <code>href="#"</code>.</p>
 {% highlight html %}
 <div class="dropdown">
-  <a id="dLabel" data-target="#" href="http://example.com" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+  <a id="dLabel" data-target="#" href="http://example.com" data-toggle="dropdown" aria-haspopup="true" role="button" aria-expanded="false">
     Dropdown trigger
     <span class="caret"></span>
   </a>
diff --git a/docs/_includes/js/scrollspy.html b/docs/_includes/js/scrollspy.html
index 8fa37d87f..25f5671c4 100644
--- a/docs/_includes/js/scrollspy.html
+++ b/docs/_includes/js/scrollspy.html
@@ -20,7 +20,7 @@
             <li><a href="#fat">@fat</a></li>
             <li><a href="#mdo">@mdo</a></li>
             <li class="dropdown">
-              <a href="#" id="navbarDrop1" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+              <a href="#" id="navbarDrop1" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
               <ul class="dropdown-menu" role="menu" aria-labelledby="navbarDrop1">
                 <li><a href="#one" tabindex="-1">one</a></li>
                 <li><a href="#two" tabindex="-1">two</a></li>
-- 
cgit v1.2.3