From eea9eabb83a54402f0219d799e2156525d3c7709 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Mon, 17 Mar 2014 03:12:03 -0700
Subject: fix <mark> raw source to match live example

#12956 errata
---
 docs/_includes/css/type.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html
index 9c5aee200..80e30cd42 100644
--- a/docs/_includes/css/type.html
+++ b/docs/_includes/css/type.html
@@ -112,7 +112,7 @@
     <p>You can use the mark tag to <mark>highlight</mark> text.</p>
   </div>
 {% highlight html %}
-<mark>This line of text is meant to be treated as deleted text.</mark>
+You can use the mark tag to <mark>highlight</mark> text.
 {% endhighlight %}
 
 
-- 
cgit v1.2.3


From 4df96c768f823106949ea07898b231ab8d40b109 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Mon, 17 Mar 2014 03:15:27 -0700
Subject: fix description of <mark>

#12956 errata
---
 docs/_includes/css/type.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html
index 80e30cd42..2ea046519 100644
--- a/docs/_includes/css/type.html
+++ b/docs/_includes/css/type.html
@@ -107,7 +107,7 @@
   <!-- Inline text elements -->
   <h2 id="type-inline-text">Inline text elements</h2>
   <h3>Marked text</h3>
-  <p>For indicating blocks of text that have been deleted use the <code>&lt;mark&gt;</code> tag.</p>
+  <p>For highlighting a run of text due to its relevance in another context, use the <code>&lt;mark&gt;</code> tag.</p>
   <div class="bs-example">
     <p>You can use the mark tag to <mark>highlight</mark> text.</p>
   </div>
-- 
cgit v1.2.3


From 1d6187956f3a0ae0a3527da533b21608b9e18c3e Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 25 Mar 2014 23:00:47 -0700
Subject: Document #13186

---
 docs/_includes/css/forms.html | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index eb2141cf1..5a76ce495 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -254,7 +254,7 @@
 </div>
 {% endhighlight %}
 
-  <h4>Inline checkboxes</h4>
+  <h4>Inline checkboxes and radios</h4>
   <p>Use the <code>.checkbox-inline</code> or <code>.radio-inline</code> classes on a series of checkboxes or radios for controls that appear on the same line.</p>
   <div class="bs-example">
     <form role="form">
@@ -268,6 +268,18 @@
         <input type="checkbox" id="inlineCheckbox3" value="option3"> 3
       </label>
     </form>
+    <br>
+    <form role="form">
+      <label class="radio-inline">
+        <input type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1"> 1
+      </label>
+      <label class="radio-inline">
+        <input type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2"> 2
+      </label>
+      <label class="radio-inline">
+        <input type="radio" name="inlineRadioOptions" id="inlineRadio3" value="option3"> 3
+      </label>
+    </form>
   </div><!-- /.bs-example -->
 {% highlight html %}
 <label class="checkbox-inline">
@@ -279,6 +291,16 @@
 <label class="checkbox-inline">
   <input type="checkbox" id="inlineCheckbox3" value="option3"> 3
 </label>
+
+<label class="radio-inline">
+  <input type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1"> 1
+</label>
+<label class="radio-inline">
+  <input type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2"> 2
+</label>
+<label class="radio-inline">
+  <input type="radio" name="inlineRadioOptions" id="inlineRadio3" value="option3"> 3
+</label>
 {% endhighlight %}
 
   <h3>Selects</h3>
-- 
cgit v1.2.3


From d56026d489fb8db66c2db6aa0d222f1a3fa9261f Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Fri, 4 Apr 2014 10:25:22 -0700
Subject: fix grammar in "Underlined text" example

---
 docs/_includes/css/type.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html
index 2ea046519..da81d7414 100644
--- a/docs/_includes/css/type.html
+++ b/docs/_includes/css/type.html
@@ -146,10 +146,10 @@ You can use the mark tag to <mark>highlight</mark> text.
   <h3>Underlined text</h3>
   <p>To underline text use the <code>&lt;u&gt;</code> tag.</p>
   <div class="bs-example">
-    <p><u>This line of text is will render as underlined</u></p>
+    <p><u>This line of text will render as underlined</u></p>
   </div>
 {% highlight html %}
-<u>This line of text is will render as underlined</u>
+<u>This line of text will render as underlined</u>
 {% endhighlight %}
 
   <p>Make use of HTML's default emphasis tags with lightweight styles.</p>
-- 
cgit v1.2.3


From fce0254b2a90e99804e6433d01ca45a5378285ac Mon Sep 17 00:00:00 2001
From: Billy Matthews <Billy.Matthews@bucknell.edu>
Date: Sat, 5 Apr 2014 18:33:57 -0400
Subject: Fixed typo in Responsive Tables CSS docs

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

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/tables.html b/docs/_includes/css/tables.html
index 99db2af72..affe17ffa 100644
--- a/docs/_includes/css/tables.html
+++ b/docs/_includes/css/tables.html
@@ -348,7 +348,7 @@
 
 
   <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 up to small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.</p>
+  <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>
   <div class="bs-example">
     <div class="table-responsive">
       <table class="table">
-- 
cgit v1.2.3


From 458cb6944beb7bfa65c12c6b20387757969617ba Mon Sep 17 00:00:00 2001
From: Sean Dwyer <sean.dwyer@gmail.com>
Date: Fri, 11 Apr 2014 15:30:51 -0700
Subject: Add documentation for using optional icons with sr-only labels

---
 docs/_includes/css/forms.html | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 5a76ce495..24e07cd25 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -511,7 +511,7 @@
   <p>You can also add optional feedback icons with the addition of <code>.has-feedback</code> and the right icon.</p>
   <div class="bs-callout bs-callout-warning">
     <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. For inputs without labels, adjust the <code>top</code>value. For input groups, adjust the <code>right</code> value to an appropriate pixel value depending on the width of your addon.</p>
+    <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-example">
     <form role="form">
@@ -550,7 +550,7 @@
 </div>
 {% endhighlight %}
 
-  <p>Optional icons also work on horizontal and inline forms.</p>
+  <h4>Optional icons in horizontal and inline forms</h4>
   <div class="bs-example">
     <form class="form-horizontal" role="form">
       <div class="form-group has-success has-feedback">
@@ -593,6 +593,22 @@
 </form>
 {% endhighlight %}
 
+  <h4>Optional icons with hidden <code>.sr-only</code> labels</h4>
+  <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>
+    </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>
+</div>
+{% endhighlight %}
+
 
   <h2 id="forms-control-sizes">Control sizing</h2>
   <p>Set heights using classes like <code>.input-lg</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p>
-- 
cgit v1.2.3


From f18bff0a7c10fe7afe4276029e9eda15e1f0c227 Mon Sep 17 00:00:00 2001
From: Cecchi MacNaughton <cecchi.macnaughton@gmail.com>
Date: Tue, 15 Apr 2014 14:12:39 -0700
Subject: Add nested kbd element styles for actual keys or inputs

---
 docs/_includes/css/code.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/code.html b/docs/_includes/css/code.html
index 0d1396145..188bd18ca 100644
--- a/docs/_includes/css/code.html
+++ b/docs/_includes/css/code.html
@@ -13,7 +13,8 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   <h2 id="code-user-input">User input</h2>
   <p>Use the <code>&lt;kbd&gt;</code> to indicate input that is typically entered via keyboard.</p>
 <div class="bs-example">
-  To switch directories, type <kbd>cd</kbd> followed by the name of the directory.
+  To switch directories, type <kbd>cd</kbd> followed by the name of the directory.<br>
+  To edit settings, press <kbd><kbd>ctrl</kbd> + <kbd>,</kbd></kbd>
 </div>
 {% highlight html %}
   To switch directories, type <kbd>cd</kbd> followed by the name of the directory.
-- 
cgit v1.2.3


From 1d77660c62f178407c3cd306cc745182de2abc03 Mon Sep 17 00:00:00 2001
From: jackson <zohar.jackson@dynamicsresolved.com>
Date: Wed, 16 Apr 2014 11:29:36 -0400
Subject: Added specificity note to docs per issue #13332

---
 docs/_includes/css/helpers.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/helpers.html b/docs/_includes/css/helpers.html
index e787a3103..7bb6cf82e 100644
--- a/docs/_includes/css/helpers.html
+++ b/docs/_includes/css/helpers.html
@@ -40,7 +40,10 @@
 <p class="bg-warning">...</p>
 <p class="bg-danger">...</p>
 {% endhighlight %}
-
+ <div class="bs-callout bs-callout-info">
+    <h4>Dealing with specificity</h4>
+    <p>Sometimes contextual background classeses 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>
 
   <h3 id="helper-classes-close">Close icon</h3>
   <p>Use the generic close icon for dismissing content like modals and alerts.</p>
-- 
cgit v1.2.3


From ca45998fc9ac6ea2d83c32dfe590d2f76d37db0d Mon Sep 17 00:00:00 2001
From: jackson <zohar.jackson@dynamicsresolved.com>
Date: Wed, 16 Apr 2014 12:39:29 -0400
Subject: Fixed typo and added leading space

---
 docs/_includes/css/helpers.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/helpers.html b/docs/_includes/css/helpers.html
index 7bb6cf82e..a76704673 100644
--- a/docs/_includes/css/helpers.html
+++ b/docs/_includes/css/helpers.html
@@ -40,9 +40,9 @@
 <p class="bg-warning">...</p>
 <p class="bg-danger">...</p>
 {% endhighlight %}
- <div class="bs-callout bs-callout-info">
+  <div class="bs-callout bs-callout-info">
     <h4>Dealing with specificity</h4>
-    <p>Sometimes contextual background classeses 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>
+    <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>
 
   <h3 id="helper-classes-close">Close icon</h3>
-- 
cgit v1.2.3


From d42b1a2d2d0911de918bcd7ec37c7bd3568a18f3 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Fri, 25 Apr 2014 10:43:30 -0700
Subject: fix #13427

---
 docs/_includes/css/less.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/less.html b/docs/_includes/css/less.html
index b6d46da29..c07153318 100644
--- a/docs/_includes/css/less.html
+++ b/docs/_includes/css/less.html
@@ -76,7 +76,7 @@
 {% highlight scss %}
 // Variables
 @link-color:       @brand-primary;
-@link-color-hover: darken(@link-color, 15%);
+@link-hover-color: darken(@link-color, 15%);
 
 // Usage
 a {
@@ -84,12 +84,12 @@ a {
   text-decoration: none;
 
   &:hover {
-    color: @link-color-hover;
+    color: @link-hover-color;
     text-decoration: underline;
   }
 }
 {% endhighlight %}
-  <p>Note that the <code>@link-color-hover</code> uses a function, another awesome tool from Less, to automagically create the right hover color. You can use <code>darken</code>, <code>lighten</code>, <code>saturate</code>, and <code>desaturate</code>.</p>
+  <p>Note that the <code>@link-hover-color</code> uses a function, another awesome tool from Less, to automagically create the right hover color. You can use <code>darken</code>, <code>lighten</code>, <code>saturate</code>, and <code>desaturate</code>.</p>
 
   <h3 id="less-variables-typography">Typography</h3>
   <p>Easily set your type face, text size, leading, and more with a few quick variables. Bootstrap makes use of these as well to provide easy typographic mixins.</p>
-- 
cgit v1.2.3


From 43b6d6c2f879b08c682433adfd6a8a78622500b3 Mon Sep 17 00:00:00 2001
From: syed <syed.sayal.shah@gmail.com>
Date: Sat, 26 Apr 2014 09:44:14 +0500
Subject: fixes https://github.com/twbs/bootstrap/issues/13367

Second color stop value should be percentage instead of decimal value.
---
 docs/_includes/css/less.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/less.html b/docs/_includes/css/less.html
index c07153318..eadbda775 100644
--- a/docs/_includes/css/less.html
+++ b/docs/_includes/css/less.html
@@ -378,10 +378,10 @@ a {
 {% highlight scss %}
 #gradient > .striped(#333; 45deg);
 {% endhighlight %}
-  <p>Up the ante and use three colors instead. Set the first color, the second color, the second color's color stop (a decimal value like 0.25), and the third color with these mixins:</p>
+  <p>Up the ante and use three colors instead. Set the first color, the second color, the second color's color stop (a percentage value like 25%), and the third color with these mixins:</p>
 {% highlight scss %}
-#gradient > .vertical-three-colors(#777; #333; .25; #000);
-#gradient > .horizontal-three-colors(#777; #333; .25; #000);
+#gradient > .vertical-three-colors(#777; #333; 25%; #000);
+#gradient > .horizontal-three-colors(#777; #333; 25%; #000);
 {% endhighlight %}
   <p><strong>Heads up!</strong> Should you ever need to remove a gradient, be sure to remove any IE-specific <code>filter</code> you may have added. You can do that by using the <code>.reset-filter()</code> mixin alongside <code>background-image: none;</code>.</p>
 
-- 
cgit v1.2.3


From a80eb1eb50d0c5953c2dc35ceb67ad622aa9a732 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 30 Apr 2014 19:47:50 -0700
Subject: explain

---
 docs/_includes/css/forms.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 24e07cd25..f2e29d6ff 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -594,6 +594,7 @@
 {% endhighlight %}
 
   <h4>Optional icons with hidden <code>.sr-only</code> labels</h4>
+  <p>For form controls with no visible label, add the <code>.sr-only</code> class on the label. Bootstrap will automatically adjust the position of the icon once it's been added.</p>
   <div class="bs-example">
     <div class="form-group has-success has-feedback">
       <label class="control-label sr-only" for="inputSuccess5">Hidden label</label>
-- 
cgit v1.2.3


From f793853609ad0d292ba6291a8c87c66fd659a560 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Fri, 25 Apr 2014 11:39:42 -0700
Subject: document grid column wrapping behavior; fixes #13247

---
 docs/_includes/css/grid.html | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html
index 992612e85..0deb12458 100644
--- a/docs/_includes/css/grid.html
+++ b/docs/_includes/css/grid.html
@@ -13,6 +13,7 @@
     <li>Columns create gutters (gaps between column content) via <code>padding</code>. That padding is offset in rows for the first and last column via negative margin on <code>.row</code>s.</li>
     <li>The negative margin is why the examples below are outdented. It's so that content within grid columns is lined up with non-grid content.</li>
     <li>Grid columns are created by specifying the number of twelve available columns you wish to span. For example, three equal columns would use three <code>.col-xs-4</code>.</li>
+    <li>If more than 12 columns are placed within a single row, each group of extra columns will, as one unit, wrap onto a new line.</li>
     <li>Grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes, and override grid classes targeted at smaller devices. Therefore, applying any <code>.col-md-</code> class to an element will not only affect its styling on medium devices but also on large devices if a <code>.col-lg-</code> class is not present.</li>
   </ul>
   <p>Look to the examples for applying these principles to your code.</p>
@@ -252,6 +253,23 @@
   <div class="clearfix visible-xs-block"></div>
   <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div>
 </div>
+{% endhighlight %}
+
+  <h3 id="grid-example-wrapping">Example: Column wrapping</h3>
+  <p>If more than 12 columns are placed within a single row, each group of extra columns will, as one unit, wrap onto a new line.</p>
+  <div class="bs-docs-grid">
+    <div class="row show-grid">
+      <div class="col-xs-9">.col-xs-9</div>
+      <div class="col-xs-4">.col-xs-4<br>Since 9 + 4 = 13 &gt; 12, this 4-column-wide div gets wrapped onto a new line as one contiguous unit.</div>
+      <div class="col-xs-6">.col-xs-6<br>Subsequent columns continue along the new line.</div>
+    </div>
+  </div>
+{% highlight html %}
+<div class="row">
+  <div class="col-xs-9">.col-xs-9</div>
+  <div class="col-xs-4">.col-xs-4<br>Since 9 + 4 = 13 &gt; 12, this 4-column-wide div gets wrapped onto a new line as one contiguous unit.</div>
+  <div class="col-xs-6">.col-xs-6<br>Subsequent columns continue along the new line.</div>
+</div>
 {% endhighlight %}
 
   <h3 id="grid-responsive-resets">Responsive column resets</h3>
-- 
cgit v1.2.3


From 949b81f51171550bcec0d92e771793999e69a389 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sat, 3 May 2014 19:38:09 -0700
Subject: Improve accessibility of close buttons in modals & alerts

Adds textual caption to the close buttons. The "X" multiplication sign isn't very meaningful to screenreaders.

Credit: https://github.com/paypal/bootstrap-accessibility-plugin
Per:
    https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#alert
    https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#modal-dialog
---
 docs/_includes/css/helpers.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/helpers.html b/docs/_includes/css/helpers.html
index a76704673..043dad9ff 100644
--- a/docs/_includes/css/helpers.html
+++ b/docs/_includes/css/helpers.html
@@ -48,10 +48,10 @@
   <h3 id="helper-classes-close">Close icon</h3>
   <p>Use the generic close icon for dismissing content like modals and alerts.</p>
   <div class="bs-example">
-    <p><button type="button" class="close" aria-hidden="true">&times;</button></p>
+    <p><button type="button" class="close"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button></p>
   </div>
 {% highlight html %}
-<button type="button" class="close" aria-hidden="true">&times;</button>
+<button type="button" class="close"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
 {% endhighlight %}
 
 
-- 
cgit v1.2.3


From f71f2dbeb0ebafe0d8255317001396ce9ddb7e55 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sun, 4 May 2014 02:24:04 -0700
Subject: emphasize that bootstrap-rtl.css & bootstrap.css should not be used
 together

---
 docs/_includes/css/rtl.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/rtl.html b/docs/_includes/css/rtl.html
index 050c429b1..55568ccd6 100644
--- a/docs/_includes/css/rtl.html
+++ b/docs/_includes/css/rtl.html
@@ -8,13 +8,18 @@
 <!-- Example: Arabic language with direction set to RTL -->
 <html lang="ar" dir="rtl">
 {% endhighlight %}
-  <p>Then, include the right-to-left CSS file in place of the default Bootstrap CSS:</p>
+  <p>Then, include the right-to-left CSS file <strong>instead of</strong> the default Bootstrap CSS:</p>
 {% highlight html %}
 <!-- Bootstrap RTL -->
 <link rel="stylesheet" href="bootstrap-rtl.css">
 {% endhighlight %}
   <p>Alternatively, you may use the minified RTL file, <code>bootstrap-rtl.min.css</code>.</p>
 
+  <div class="bs-callout bs-callout-danger">
+    <h4>Do not use in combination with <code>bootstrap.css</code></h4>
+    <p><code>bootstrap-rtl.css</code> must not be used together with <code>bootstrap.css</code>. Use either one or the other, but not both. <code>bootstrap-rtl.css</code> includes all of Bootstrap's styles, including those not affected by writing direction.</p>
+  </div>
+
   <h2 id="rtl-css-flip">CSS Flip</h2>
   <p><a href="https://github.com/twitter/css-flip">CSS Flip</a> is a project for converting left-to-right CSS files into right-to-left CSS files. We use it in our Gruntfile to automate the generation of Bootstrap's RTL CSS files.</p>
 </div>
-- 
cgit v1.2.3


From ed410667dfd95502b3674806e7ad7b2b79a5627b Mon Sep 17 00:00:00 2001
From: Quy Ton <quy@fluxbb.org>
Date: Sun, 4 May 2014 09:02:55 -0700
Subject: Fix .visible-print deprecation version #.

---
 docs/_includes/css/responsive-utilities.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/responsive-utilities.html b/docs/_includes/css/responsive-utilities.html
index 260eea3cc..666c0bce7 100644
--- a/docs/_includes/css/responsive-utilities.html
+++ b/docs/_includes/css/responsive-utilities.html
@@ -93,7 +93,7 @@
     </table>
   </div>
 
-  <p>As of v3.2, the <code>.visible-*-*</code> classes for each breakpoint come in three variations, one for each CSS <code>display</code> property value listed below.</p>
+  <p>As of v3.2.0, the <code>.visible-*-*</code> classes for each breakpoint come in three variations, one for each CSS <code>display</code> property value listed below.</p>
   <div class="table-responsive">
     <table class="table table-bordered table-striped">
       <thead>
@@ -119,7 +119,7 @@
     </table>
   </div>
   <p>So, for extra small (<code>xs</code>) screens for example, the available <code>.visible-*-*</code> classes are: <code>.visible-xs-block</code>, <code>.visible-xs-inline</code>, and <code>.visible-xs-inline-block</code>.</p>
-  <p>The classes <code>.visible-xs</code>, <code>.visible-sm</code>, <code>.visible-md</code>, and <code>.visible-lg</code> also exist, but are <strong>deprecated as of v3.2</strong>. They are approximately equivalent to <code>.visible-*-block</code>, except with additional special cases for toggling <code>&lt;table&gt;</code>-related elements.</p>
+  <p>The classes <code>.visible-xs</code>, <code>.visible-sm</code>, <code>.visible-md</code>, and <code>.visible-lg</code> also exist, but are <strong>deprecated as of v3.2.0</strong>. They are approximately equivalent to <code>.visible-*-block</code>, except with additional special cases for toggling <code>&lt;table&gt;</code>-related elements.</p>
 
   <h2 id="responsive-utilities-print">Print classes</h2>
   <p>Similar to the regular responsive classes, use these for toggling content for print.</p>
@@ -150,7 +150,7 @@
       </tbody>
     </table>
   </div>
-  <p>The class <code>.visible-print</code> also exists but is <strong>deprecated</strong> as of v3.1.0. It is approximately equivalent to <code>.visible-print-block</code>, except with additional special cases for <code>&lt;table&gt;</code>-related elements.</p>
+  <p>The class <code>.visible-print</code> also exists but is <strong>deprecated</strong> as of v3.2.0. It is approximately equivalent to <code>.visible-print-block</code>, except with additional special cases for <code>&lt;table&gt;</code>-related elements.</p>
 
 
   <h2 id="responsive-utilities-tests">Test cases</h2>
-- 
cgit v1.2.3


From f0daa64a29a66a663f6fedb9d8687524af754436 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 7 May 2014 15:30:27 -0700
Subject: move rtl to getting started, per @cvrebert's feedback

---
 docs/_includes/css/rtl.html | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 docs/_includes/css/rtl.html

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/rtl.html b/docs/_includes/css/rtl.html
deleted file mode 100644
index 55568ccd6..000000000
--- a/docs/_includes/css/rtl.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="bs-docs-section">
-  <h1 id="rtl" class="page-header">RTL</h1>
-  <p class="lead">As of Bootstrap 3.2, a right-to-left version of Bootstrap ships as part of the repository. It's powered by Twitter's <a href="https://github.com/twitter/css-flip">CSS Flip project</a> and is generated via our Gruntfile.</p>
-
-  <h2 id="rtl-how-to">How to use</h2>
-  <p>Bootstrap is by default a left-to-right project. For right-to-left projects, you'll need to set your language and replace the default Bootstrap CSS with an RTL version. First, set your language and text direction:</p>
-{% highlight html %}
-<!-- Example: Arabic language with direction set to RTL -->
-<html lang="ar" dir="rtl">
-{% endhighlight %}
-  <p>Then, include the right-to-left CSS file <strong>instead of</strong> the default Bootstrap CSS:</p>
-{% highlight html %}
-<!-- Bootstrap RTL -->
-<link rel="stylesheet" href="bootstrap-rtl.css">
-{% endhighlight %}
-  <p>Alternatively, you may use the minified RTL file, <code>bootstrap-rtl.min.css</code>.</p>
-
-  <div class="bs-callout bs-callout-danger">
-    <h4>Do not use in combination with <code>bootstrap.css</code></h4>
-    <p><code>bootstrap-rtl.css</code> must not be used together with <code>bootstrap.css</code>. Use either one or the other, but not both. <code>bootstrap-rtl.css</code> includes all of Bootstrap's styles, including those not affected by writing direction.</p>
-  </div>
-
-  <h2 id="rtl-css-flip">CSS Flip</h2>
-  <p><a href="https://github.com/twitter/css-flip">CSS Flip</a> is a project for converting left-to-right CSS files into right-to-left CSS files. We use it in our Gruntfile to automate the generation of Bootstrap's RTL CSS files.</p>
-</div>
-- 
cgit v1.2.3


From ceda9483723fedb04ad6221a32be028cc81c5d4d Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Tue, 13 May 2014 17:14:10 +0300
Subject: Remove unneeded spaces from `pre`.

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

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/code.html b/docs/_includes/css/code.html
index 0d1396145..6e15b4c56 100644
--- a/docs/_includes/css/code.html
+++ b/docs/_includes/css/code.html
@@ -16,7 +16,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   To switch directories, type <kbd>cd</kbd> followed by the name of the directory.
 </div>
 {% highlight html %}
-  To switch directories, type <kbd>cd</kbd> followed by the name of the directory.
+To switch directories, type <kbd>cd</kbd> followed by the name of the directory.
 {% endhighlight %}
 
   <h2 id="code-block">Basic block</h2>
-- 
cgit v1.2.3


From abbf6da6aaa37e337a527217982838bfff1d8027 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 22 May 2014 21:12:13 -0700
Subject: tighten up callouts and remove backgrounds

---
 docs/_includes/css/tables.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/tables.html b/docs/_includes/css/tables.html
index affe17ffa..d9a1cd2cf 100644
--- a/docs/_includes/css/tables.html
+++ b/docs/_includes/css/tables.html
@@ -349,6 +349,20 @@
 
   <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>
+
+  <div class="bs-callout bs-callout-warning">
+    <h4>Firefox and fieldsets</h4>
+    <p>Firefox has some awkward fieldset styling involving <code>width</code> that interferes with the responsive table. This cannot be overriden without a Firefox-specific hack:</p>
+{% highlight css %}
+@-moz-document url-prefix() {
+  fieldset {
+    display: table-cell;
+  }
+}
+{% endhighlight %}
+    <p>For more information, read <a href="http://stackoverflow.com/questions/17408815/fieldset-resizes-wrong-appears-to-have-unremovable-min-width-min-content/17863685#17863685">this Stack Overflow answer</a>.</p>
+  </div>
+
   <div class="bs-example">
     <div class="table-responsive">
       <table class="table">
-- 
cgit v1.2.3


From 338cff13593a5e10abcab37da9f197fa4eafa3de Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 22 May 2014 21:39:47 -0700
Subject: clarify

---
 docs/_includes/css/tables.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/tables.html b/docs/_includes/css/tables.html
index d9a1cd2cf..655545112 100644
--- a/docs/_includes/css/tables.html
+++ b/docs/_includes/css/tables.html
@@ -352,12 +352,10 @@
 
   <div class="bs-callout bs-callout-warning">
     <h4>Firefox and fieldsets</h4>
-    <p>Firefox has some awkward fieldset styling involving <code>width</code> that interferes with the responsive table. This cannot be overriden without a Firefox-specific hack:</p>
+    <p>Firefox has some awkward fieldset styling involving <code>width</code> that interferes with the responsive table. This cannot be overriden without a Firefox-specific hack that we <strong>don't</strong> provide in Bootstrap:</p>
 {% highlight css %}
 @-moz-document url-prefix() {
-  fieldset {
-    display: table-cell;
-  }
+  fieldset { display: table-cell; }
 }
 {% endhighlight %}
     <p>For more information, read <a href="http://stackoverflow.com/questions/17408815/fieldset-resizes-wrong-appears-to-have-unremovable-min-width-min-content/17863685#17863685">this Stack Overflow answer</a>.</p>
-- 
cgit v1.2.3


From 585f4787f7080e738e8172a56901c2f347a54a30 Mon Sep 17 00:00:00 2001
From: Konstantin Kulinicenko <konstantin@sourcestream.de>
Date: Sat, 24 May 2014 15:33:15 +0200
Subject: text transformation added

Transform text in components with text capitalization classes.
---
 docs/_includes/css/type.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html
index da81d7414..57ee72b92 100644
--- a/docs/_includes/css/type.html
+++ b/docs/_includes/css/type.html
@@ -203,6 +203,18 @@ You can use the mark tag to <mark>highlight</mark> text.
 <p class="text-justify">Justified text.</p>
 {% endhighlight %}
 
+  <h2 id="type-transformation">Transformation classes</h2>
+  <p>Transform text in components with text capitalization classes.</p>
+  <div class="bs-example">
+      <p class="text-lowercase">Lowercase text.</p>
+      <p class="text-uppercase">Uppercase text.</p>
+      <p class="text-capitalize">Capitalize text.</p>
+  </div>
+{% highlight html %}
+<p class="text-lowercase">Lowercase text.</p>
+<p class="text-uppercase">Uppercase text.</p>
+<p class="text-capitalize">Capitalize text.</p>
+{% endhighlight %}
 
   <!-- Abbreviations -->
   <h2 id="type-abbreviations">Abbreviations</h2>
-- 
cgit v1.2.3


From dd7ee517e4541cddf98b46feb8b35d1568ff2346 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Fri, 6 Jun 2014 17:28:02 -0700
Subject: add docs for #13745

Good catch @juthilo
[skip sauce]
---
 docs/_includes/css/forms.html | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index f2e29d6ff..95bb29c59 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -207,7 +207,8 @@
 {% endhighlight %}
 
   <h3>Checkboxes and radios</h3>
-  <p>Checkboxes are for selecting one or several options in a list while radios are for selecting one option from many.</p>
+  <p>Checkboxes are for selecting one or several options in a list, while radios are for selecting one option from many.</p>
+  <p>A checkbox or radio with the <code>disabled</code> attribute will be styled appropriately. To have the <code>&lt;label&gt;</code> for the checkbox or radio also display a "not-allowed" cursor when the user hovers over the label, add the <code>.disabled</code> class to your <code>.radio</code>, <code>.radio-inline</code>, <code>.checkbox</code>, <code>.checkbox-inline</code>, or <code>&lt;fieldset&gt;</code>.</p>
   <h4>Default (stacked)</h4>
   <div class="bs-example">
     <form role="form">
@@ -217,6 +218,12 @@
           Option one is this and that&mdash;be sure to include why it's great
         </label>
       </div>
+      <div class="checkbox disabled">
+        <label>
+          <input type="checkbox" value="" disabled>
+          Option two is disabled
+        </label>
+      </div>
       <br>
       <div class="radio">
         <label>
@@ -230,6 +237,12 @@
           Option two can be something else and selecting it will deselect option one
         </label>
       </div>
+      <div class="radio disabled">
+        <label>
+          <input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled>
+          Option three is disabled
+        </label>
+      </div>
     </form>
   </div><!-- /.bs-example -->
 {% highlight html %}
@@ -239,6 +252,12 @@
     Option one is this and that&mdash;be sure to include why it's great
   </label>
 </div>
+<div class="checkbox disabled">
+  <label>
+    <input type="checkbox" value="" disabled>
+    Option two is disabled
+  </label>
+</div>
 
 <div class="radio">
   <label>
@@ -252,6 +271,12 @@
     Option two can be something else and selecting it will deselect option one
   </label>
 </div>
+<div class="radio disabled">
+  <label>
+    <input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled>
+    Option three is disabled
+  </label>
+</div>
 {% endhighlight %}
 
   <h4>Inline checkboxes and radios</h4>
-- 
cgit v1.2.3


From af45472dfe5e81a3ad01ea33f039f7eefe9e5245 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Tue, 10 Jun 2014 11:41:32 -0700
Subject: <input> buttons line-height Firefox bugfix has been shipped!

Remove Wall of Browser Bugs entry.
Update mention of the bug in the CSS docs.
[skip sauce]
---
 docs/_includes/css/buttons.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/buttons.html b/docs/_includes/css/buttons.html
index f6a131aaa..15b0f5ed2 100644
--- a/docs/_includes/css/buttons.html
+++ b/docs/_includes/css/buttons.html
@@ -173,6 +173,6 @@
   <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>
-    <p>Among other things, there's <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=697451">a Firefox bug</a> that prevents us from setting the <code>line-height</code> of <code>&lt;input&gt;</code>-based buttons, causing them to not exactly match the height of other buttons on Firefox.</p>
+    <p>Among other things, there's <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=697451">a bug in Firefox &lt;30</a> that prevents us from setting the <code>line-height</code> of <code>&lt;input&gt;</code>-based buttons, causing them to not exactly match the height of other buttons on Firefox.</p>
   </div>
 </div>
-- 
cgit v1.2.3


From dcbe484a09531da4ecc80fd2991a9910fb6a64ed Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 10 Jun 2014 21:20:34 -0700
Subject: New text align class, .text-nowrap, for preventing text from breaking
 to new lines. Applies it to the grid docs table.

---
 docs/_includes/css/grid.html | 18 +++++++++---------
 docs/_includes/css/type.html |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html
index 0deb12458..593b02a43 100644
--- a/docs/_includes/css/grid.html
+++ b/docs/_includes/css/grid.html
@@ -68,49 +68,49 @@
       </thead>
       <tbody>
         <tr>
-          <th>Grid behavior</th>
+          <th class="text-nowrap">Grid behavior</th>
           <td>Horizontal at all times</td>
           <td colspan="3">Collapsed to start, horizontal above breakpoints</td>
         </tr>
         <tr>
-          <th>Container width</th>
+          <th class="text-nowrap">Container width</th>
           <td>None (auto)</td>
           <td>750px</td>
           <td>970px</td>
           <td>1170px</td>
         </tr>
         <tr>
-          <th>Class prefix</th>
+          <th class="text-nowrap">Class prefix</th>
           <td><code>.col-xs-</code></td>
           <td><code>.col-sm-</code></td>
           <td><code>.col-md-</code></td>
           <td><code>.col-lg-</code></td>
         </tr>
         <tr>
-          <th># of columns</th>
+          <th class="text-nowrap"># of columns</th>
           <td colspan="4">12</td>
         </tr>
         <tr>
-          <th>Column width</th>
+          <th class="text-nowrap">Column width</th>
           <td class="text-muted">Auto</td>
           <td>~62px</td>
           <td>~81px</td>
           <td>~97px</td>
         </tr>
         <tr>
-          <th>Gutter width</th>
+          <th class="text-nowrap">Gutter width</th>
           <td colspan="4">30px (15px on each side of a column)</td>
         </tr>
         <tr>
-          <th>Nestable</th>
+          <th class="text-nowrap">Nestable</th>
           <td colspan="4">Yes</td>
         </tr>
         <tr>
-          <th>Offsets</th>
+          <th class="text-nowrap">Offsets</th>
           <td colspan="4">Yes</td>
         </tr>
         <tr>
-          <th>Column ordering</th>
+          <th class="text-nowrap">Column ordering</th>
           <td colspan="4">Yes</td>
         </tr>
       </tbody>
diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html
index da81d7414..65001198d 100644
--- a/docs/_includes/css/type.html
+++ b/docs/_includes/css/type.html
@@ -195,12 +195,13 @@ You can use the mark tag to <mark>highlight</mark> text.
     <p class="text-center">Center aligned text.</p>
     <p class="text-right">Right aligned text.</p>
     <p class="text-justify">Justified text.</p>
+    <p class="text-nowrap">No wrap text.</p>
   </div>
 {% highlight html %}
 <p class="text-left">Left aligned text.</p>
 <p class="text-center">Center aligned text.</p>
 <p class="text-right">Right aligned text.</p>
-<p class="text-justify">Justified text.</p>
+<p class="text-nowrap">No wrap text.</p>
 {% endhighlight %}
 
 
-- 
cgit v1.2.3


From 5c6c0a194d61f8fb8ffca94bc5e695a7dda87fd7 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 10 Jun 2014 21:24:44 -0700
Subject: fixes #13775: tweak grid nesting docs about # of cols, change up
 example slightly

---
 docs/_includes/css/grid.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html
index 593b02a43..8ff53dd71 100644
--- a/docs/_includes/css/grid.html
+++ b/docs/_includes/css/grid.html
@@ -347,30 +347,30 @@
 
 
   <h3 id="grid-nesting">Nesting columns</h3>
-  <p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-md-*</code> columns within an existing <code>.col-md-*</code> column. Nested rows should include a set of columns that add up to 12 or less.</p>
+  <p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-md-*</code> columns within an existing <code>.col-md-*</code> column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns).</p>
   <div class="row show-grid">
-    <div class="col-md-9">
+    <div class="col-sm-9">
       Level 1: .col-md-9
       <div class="row show-grid">
-        <div class="col-md-6">
-          Level 2: .col-md-6
+        <div class="col-xs-8 col-sm-6">
+          Level 2: .col-xs-8 .col-md-6
         </div>
-        <div class="col-md-6">
-          Level 2: .col-md-6
+        <div class="col-xs-4 col-sm-6">
+          Level 2: .col-xs-4 .col-md-6
         </div>
       </div>
     </div>
   </div>
 {% highlight html %}
 <div class="row">
-  <div class="col-md-9">
+  <div class="col-sm-9">
     Level 1: .col-md-9
     <div class="row">
-      <div class="col-md-6">
-        Level 2: .col-md-6
+      <div class="col-xs-8 col-sm-6">
+        Level 2: .col-xs-8 .col-md-6
       </div>
-      <div class="col-md-6">
-        Level 2: .col-md-6
+      <div class="col-xs-4 col-sm-6">
+        Level 2: .col-xs-4 .col-md-6
       </div>
     </div>
   </div>
-- 
cgit v1.2.3


From f77d0aa591d455159ae1d9927333227cf1ae0382 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 10 Jun 2014 23:06:25 -0700
Subject: fixes #13356: clarify use of clearfix on parents

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

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/helpers.html b/docs/_includes/css/helpers.html
index 043dad9ff..9b7223740 100644
--- a/docs/_includes/css/helpers.html
+++ b/docs/_includes/css/helpers.html
@@ -116,7 +116,7 @@
 
 
   <h3 id="helper-classes-clearfix">Clearfix</h3>
-  <p>Clear the <code>float</code> on any element with the <code>.clearfix</code> class. Utilizes <a href="http://nicolasgallagher.com/micro-clearfix-hack/">the micro clearfix</a> as popularized by Nicolas Gallagher. Can also be used as a mixin.</p>
+  <p>Easily clear <code>float</code>s by adding <code>.clearfix</code> <strong>to the parent element</strong>. Utilizes <a href="http://nicolasgallagher.com/micro-clearfix-hack/">the micro clearfix</a> as popularized by Nicolas Gallagher. Can also be used as a mixin.</p>
 {% highlight html %}
 <!-- Usage as a class -->
 <div class="clearfix">...</div>
-- 
cgit v1.2.3


From 03b556bbc5c0aecc2d86edfcf143d7b3312c86cc Mon Sep 17 00:00:00 2001
From: Heinrich Fenkart <hnrch02@gmail.com>
Date: Wed, 11 Jun 2014 08:33:30 +0200
Subject: Follow-up to #13671; improves consistency of text with previous
 examples

Also fixes a small indentation error.
---
 docs/_includes/css/type.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html
index 124e4f087..70e3fc36d 100644
--- a/docs/_includes/css/type.html
+++ b/docs/_includes/css/type.html
@@ -207,14 +207,14 @@ You can use the mark tag to <mark>highlight</mark> text.
   <h2 id="type-transformation">Transformation classes</h2>
   <p>Transform text in components with text capitalization classes.</p>
   <div class="bs-example">
-      <p class="text-lowercase">Lowercase text.</p>
-      <p class="text-uppercase">Uppercase text.</p>
-      <p class="text-capitalize">Capitalize text.</p>
+    <p class="text-lowercase">Lowercased text.</p>
+    <p class="text-uppercase">Uppercased text.</p>
+    <p class="text-capitalize">Capitalized text.</p>
   </div>
 {% highlight html %}
-<p class="text-lowercase">Lowercase text.</p>
-<p class="text-uppercase">Uppercase text.</p>
-<p class="text-capitalize">Capitalize text.</p>
+<p class="text-lowercase">Lowercased text.</p>
+<p class="text-uppercase">Uppercased text.</p>
+<p class="text-capitalize">Capitalized text.</p>
 {% endhighlight %}
 
   <!-- Abbreviations -->
-- 
cgit v1.2.3


From 7a0f4416a5436a892ed4328cd42e1d708f0ba715 Mon Sep 17 00:00:00 2001
From: Bas Bosman <github@nazgul.nu>
Date: Wed, 11 Jun 2014 17:39:02 +0200
Subject: Add dropped text-justify

---
 docs/_includes/css/type.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html
index 70e3fc36d..6eca026de 100644
--- a/docs/_includes/css/type.html
+++ b/docs/_includes/css/type.html
@@ -201,6 +201,7 @@ You can use the mark tag to <mark>highlight</mark> text.
 <p class="text-left">Left aligned text.</p>
 <p class="text-center">Center aligned text.</p>
 <p class="text-right">Right aligned text.</p>
+<p class="text-justify">Justified text.</p>
 <p class="text-nowrap">No wrap text.</p>
 {% endhighlight %}
 
-- 
cgit v1.2.3


From 74a264fb98ced0228d385d601e9edd913bb1b173 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 18 Jun 2014 18:19:17 -0700
Subject: fixes #13021: add .form-group-sm/-lg

---
 docs/_includes/css/forms.html | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 95bb29c59..947c5179c 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -670,6 +670,42 @@
 <select class="form-control input-sm">...</select>
 {% endhighlight %}
 
+  <h3>Horizontal form group sizes</h3>
+  <p>Quickly size labels and form controls within <code>.form-horizontal</code> by adding <code>.form-group-lg</code> or <code>.form-group-sm</code>.</p>
+  <div class="bs-example">
+    <form class="form-horizontal" role="form">
+      <div class="form-group form-group-lg">
+        <label class="col-sm-2 control-label" for="formGroupInputLarge">Large label</label>
+        <div class="col-sm-10">
+          <input class="form-control" type="text" name="formGroupInputLarge" placeholder="Large input">
+        </div>
+      </div>
+      <div class="form-group form-group-sm">
+        <label class="col-sm-2 control-label" for="formGroupInputSmall">Small label</label>
+        <div class="col-sm-10">
+          <input class="form-control" type="text" name="formGroupInputSmall" placeholder="Small input">
+        </div>
+      </div>
+    </form>
+  </div><!-- /.bs-example -->
+{% highlight html %}
+<form class="form-horizontal" role="form">
+  <div class="form-group form-group-lg">
+    <label class="col-sm-2 control-label" for="formGroupInputLarge">Large label</label>
+    <div class="col-sm-10">
+      <input class="form-control" type="text" name="formGroupInputLarge" placeholder="Large input">
+    </div>
+  </div>
+  <div class="form-group form-group-sm">
+    <label class="col-sm-2 control-label" for="formGroupInputSmall">Small label</label>
+    <div class="col-sm-10">
+      <input class="form-control" type="text" name="formGroupInputSmall" placeholder="Small input">
+    </div>
+  </div>
+</form>
+{% endhighlight %}
+
+
   <h3>Column sizing</h3>
   <p>Wrap inputs in grid columns, or any custom parent element, to easily enforce desired widths.</p>
   <div class="bs-example">
-- 
cgit v1.2.3


From 91d2cf848bc6fcd07bf2b16ce0308b0372d28b2e Mon Sep 17 00:00:00 2001
From: Bas Bosman <github@nazgul.nu>
Date: Thu, 19 Jun 2014 14:56:43 +0200
Subject: Fix @gray-light in docs

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

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/less.html b/docs/_includes/css/less.html
index eadbda775..a6fbbaa11 100644
--- a/docs/_includes/css/less.html
+++ b/docs/_includes/css/less.html
@@ -28,7 +28,7 @@
 @gray-darker:  lighten(#000, 13.5%); // #222
 @gray-dark:    lighten(#000, 20%);   // #333
 @gray:         lighten(#000, 33.5%); // #555
-@gray-light:   lighten(#000, 60%);   // #999
+@gray-light:   lighten(#000, 46.7%); // #777
 @gray-lighter: lighten(#000, 93.5%); // #eee
 {% endhighlight %}
 
-- 
cgit v1.2.3


From 00cc166671a4ecfe3284662db14c8bf151de5bb5 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 19 Jun 2014 15:22:49 -0700
Subject: ids over names

---
 docs/_includes/css/forms.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 947c5179c..2a1848e50 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -677,13 +677,13 @@
       <div class="form-group form-group-lg">
         <label class="col-sm-2 control-label" for="formGroupInputLarge">Large label</label>
         <div class="col-sm-10">
-          <input class="form-control" type="text" name="formGroupInputLarge" placeholder="Large input">
+          <input class="form-control" type="text" id="formGroupInputLarge" placeholder="Large input">
         </div>
       </div>
       <div class="form-group form-group-sm">
         <label class="col-sm-2 control-label" for="formGroupInputSmall">Small label</label>
         <div class="col-sm-10">
-          <input class="form-control" type="text" name="formGroupInputSmall" placeholder="Small input">
+          <input class="form-control" type="text" id="formGroupInputSmall" placeholder="Small input">
         </div>
       </div>
     </form>
@@ -693,13 +693,13 @@
   <div class="form-group form-group-lg">
     <label class="col-sm-2 control-label" for="formGroupInputLarge">Large label</label>
     <div class="col-sm-10">
-      <input class="form-control" type="text" name="formGroupInputLarge" placeholder="Large input">
+      <input class="form-control" type="text" id="formGroupInputLarge" placeholder="Large input">
     </div>
   </div>
   <div class="form-group form-group-sm">
     <label class="col-sm-2 control-label" for="formGroupInputSmall">Small label</label>
     <div class="col-sm-10">
-      <input class="form-control" type="text" name="formGroupInputSmall" placeholder="Small input">
+      <input class="form-control" type="text" id="formGroupInputSmall" placeholder="Small input">
     </div>
   </div>
 </form>
-- 
cgit v1.2.3


From d4ce4dbf122158e3d0d714ac8eead0144f071d05 Mon Sep 17 00:00:00 2001
From: Ilya Radchenko <ilya@burstcreations.com>
Date: Mon, 23 Jun 2014 12:25:14 -0400
Subject: fix typo in css - buttons

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

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/buttons.html b/docs/_includes/css/buttons.html
index 15b0f5ed2..bfc5ded80 100644
--- a/docs/_includes/css/buttons.html
+++ b/docs/_includes/css/buttons.html
@@ -88,7 +88,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 progammatically.</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 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>
-- 
cgit v1.2.3


From 32bde78e1996a92e6b801e1f4a475d5ab48685f8 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 23 Jun 2014 10:41:45 -0700
Subject: grid class inconsistency /cc @juthilo

---
 docs/_includes/css/grid.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html
index 8ff53dd71..f1ee7fcd1 100644
--- a/docs/_includes/css/grid.html
+++ b/docs/_includes/css/grid.html
@@ -353,10 +353,10 @@
       Level 1: .col-md-9
       <div class="row show-grid">
         <div class="col-xs-8 col-sm-6">
-          Level 2: .col-xs-8 .col-md-6
+          Level 2: .col-xs-8 .col-sm-6
         </div>
         <div class="col-xs-4 col-sm-6">
-          Level 2: .col-xs-4 .col-md-6
+          Level 2: .col-xs-4 .col-sm-6
         </div>
       </div>
     </div>
@@ -364,13 +364,13 @@
 {% highlight html %}
 <div class="row">
   <div class="col-sm-9">
-    Level 1: .col-md-9
+    Level 1: .col-sm-9
     <div class="row">
       <div class="col-xs-8 col-sm-6">
-        Level 2: .col-xs-8 .col-md-6
+        Level 2: .col-xs-8 .col-sm-6
       </div>
       <div class="col-xs-4 col-sm-6">
-        Level 2: .col-xs-4 .col-md-6
+        Level 2: .col-xs-4 .col-sm-6
       </div>
     </div>
   </div>
-- 
cgit v1.2.3


From 25b06d927fa8fb056b3b146db263498a34401fb8 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Mon, 23 Jun 2014 23:36:18 +0200
Subject: grid class inconsistency 2

https://github.com/twbs/bootstrap/commit/32bde78e1996a92e6b801e1f4a475d5ab48685f8
---
 docs/_includes/css/grid.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html
index f1ee7fcd1..429ef90f9 100644
--- a/docs/_includes/css/grid.html
+++ b/docs/_includes/css/grid.html
@@ -347,10 +347,10 @@
 
 
   <h3 id="grid-nesting">Nesting columns</h3>
-  <p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-md-*</code> columns within an existing <code>.col-md-*</code> column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns).</p>
+  <p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-sm-*</code> columns within an existing <code>.col-sm-*</code> column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns).</p>
   <div class="row show-grid">
     <div class="col-sm-9">
-      Level 1: .col-md-9
+      Level 1: .col-sm-9
       <div class="row show-grid">
         <div class="col-xs-8 col-sm-6">
           Level 2: .col-xs-8 .col-sm-6
-- 
cgit v1.2.3


From 10ea20515c148a94fb52c43f22ce476a572d5bf1 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Thu, 26 Jun 2014 21:05:50 +0300
Subject: Fix link to compiling info. Fixes #13938.

[skip sauce]
---
 docs/_includes/css/less.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/less.html b/docs/_includes/css/less.html
index a6fbbaa11..b325ea9eb 100644
--- a/docs/_includes/css/less.html
+++ b/docs/_includes/css/less.html
@@ -7,7 +7,7 @@
 
 
   <h2 id="less-bootstrap">Compiling Bootstrap</h2>
-  <p>Bootstrap can be used in at least two ways: with the compiled CSS or with the source Less files. To compile the Less files, <a href="https://github.com/twbs/bootstrap#compiling-css-and-javascript">visit the README</a> for how to setup your development environment to run the necessary commands.</p>
+  <p>Bootstrap can be used in at least two ways: with the compiled CSS or with the source Less files. To compile the Less files, <a href="../getting-started/#grunt">consult the Getting Started section</a> for how to setup your development environment to run the necessary commands.</p>
   <p>Third party compilation tools may work with Bootstrap, but they are not supported by our core team.</p>
 
   <h2 id="less-variables">Variables</h2>
-- 
cgit v1.2.3


From 51f924ea24bf97837725d3147df296240914716d Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 28 Jun 2014 16:23:06 -0700
Subject: fixes #13968

---
 docs/_includes/css/forms.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 2a1848e50..9680c6c91 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -95,6 +95,12 @@
     <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">
+      <div class="input-group-addon">@</div>
+      <input class="form-control" type="email" placeholder="Enter email">
+    </div>
+  </div>
   <div class="form-group">
     <label class="sr-only" for="exampleInputPassword2">Password</label>
     <input type="password" class="form-control" id="exampleInputPassword2" placeholder="Password">
-- 
cgit v1.2.3


From afdc9c4b3216b628a9bf4dbaa5b5e070d95cb0f0 Mon Sep 17 00:00:00 2001
From: Zac Echola <zac.echola@so.mnscu.edu>
Date: Wed, 2 Jul 2014 10:15:22 -0500
Subject: Documents radio and checkbox validation states

References #14010

fixing duped IDs

fix ALL the duped IDs.

make example id match actual id
---
 docs/_includes/css/forms.html | 52 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 9680c6c91..c5d89c321 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -579,6 +579,58 @@
   <input type="text" class="form-control" id="inputError2">
   <span class="glyphicon glyphicon-remove form-control-feedback"></span>
 </div>
+{% endhighlight %}
+
+  <h3>Checkboxes and radio buttons</h3>
+  <div class=bs-example>
+    <form role="form">
+      <div class="has-error">
+        <div class="radio">
+          <label class="checkbox">
+            <input type="checkbox" id="checkboxError" value="option1">
+            Option one is this and that&mdash;be sure to include why it's great
+          </label>
+        </div>
+      </div>
+      <div class="has-success">
+        <div class="radio">
+          <label>
+            <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
+            Option one is this and that&mdash;be sure to include why it's great
+          </label>
+        </div>
+        <div class="radio">
+          <label>
+            <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
+            Option two can be something else and selecting it will deselect option one
+          </label>
+        </div>
+      </div>
+    </form>
+  </div>
+{% highlight html %}
+<div class="has-error">
+  <div class="radio">
+    <label class="checkbox">
+      <input type="checkbox" id="checkboxError" value="option1">
+      Option one is this and that&mdash;be sure to include why it's great
+    </label>
+  </div>
+</div>
+<div class="has-success">
+  <div class="radio">
+    <label>
+      <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
+      Option one is this and that&mdash;be sure to include why it's great
+    </label>
+  </div>
+  <div class="radio">
+    <label>
+      <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
+      Option two can be something else and selecting it will deselect option one
+    </label>
+  </div>
+</div>
 {% endhighlight %}
 
   <h4>Optional icons in horizontal and inline forms</h4>
-- 
cgit v1.2.3


From 1136f9346adb1cc9ef1b22b7c91ec1f06c225bc7 Mon Sep 17 00:00:00 2001
From: Zac Echola <zac.echola@so.mnscu.edu>
Date: Wed, 2 Jul 2014 11:32:25 -0500
Subject: Moves checkbox/radios into "Validation states" example.

---
 docs/_includes/css/forms.html | 96 ++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 52 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index c5d89c321..7fb07ec7c 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -521,6 +521,28 @@
         <label class="control-label" for="inputError1">Input with error</label>
         <input type="text" class="form-control" id="inputError1">
       </div>
+      <div class="has-error">
+        <div class="radio">
+          <label class="checkbox">
+            <input type="checkbox" id="checkboxError" value="option1">
+            Option one is this and that&mdash;be sure to include why it's great
+          </label>
+        </div>
+      </div>
+      <div class="has-success">
+        <div class="radio">
+          <label>
+            <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
+            Option one is this and that&mdash;be sure to include why it's great
+          </label>
+        </div>
+        <div class="radio">
+          <label>
+            <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
+            Option two can be something else and selecting it will deselect option one
+          </label>
+        </div>
+      </div>
     </form>
   </div><!-- /.bs-example -->
 {% highlight html %}
@@ -536,6 +558,28 @@
   <label class="control-label" for="inputError1">Input with error</label>
   <input type="text" class="form-control" id="inputError1">
 </div>
+<div class="has-error">
+  <div class="radio">
+    <label class="checkbox">
+      <input type="checkbox" id="checkboxError" value="option1">
+      Option one is this and that&mdash;be sure to include why it's great
+    </label>
+  </div>
+</div>
+<div class="has-success">
+  <div class="radio">
+    <label>
+      <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
+      Option one is this and that&mdash;be sure to include why it's great
+    </label>
+  </div>
+  <div class="radio">
+    <label>
+      <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
+      Option two can be something else and selecting it will deselect option one
+    </label>
+  </div>
+</div>
 {% endhighlight %}
 
   <h3>With optional icons</h3>
@@ -579,58 +623,6 @@
   <input type="text" class="form-control" id="inputError2">
   <span class="glyphicon glyphicon-remove form-control-feedback"></span>
 </div>
-{% endhighlight %}
-
-  <h3>Checkboxes and radio buttons</h3>
-  <div class=bs-example>
-    <form role="form">
-      <div class="has-error">
-        <div class="radio">
-          <label class="checkbox">
-            <input type="checkbox" id="checkboxError" value="option1">
-            Option one is this and that&mdash;be sure to include why it's great
-          </label>
-        </div>
-      </div>
-      <div class="has-success">
-        <div class="radio">
-          <label>
-            <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
-            Option one is this and that&mdash;be sure to include why it's great
-          </label>
-        </div>
-        <div class="radio">
-          <label>
-            <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
-            Option two can be something else and selecting it will deselect option one
-          </label>
-        </div>
-      </div>
-    </form>
-  </div>
-{% highlight html %}
-<div class="has-error">
-  <div class="radio">
-    <label class="checkbox">
-      <input type="checkbox" id="checkboxError" value="option1">
-      Option one is this and that&mdash;be sure to include why it's great
-    </label>
-  </div>
-</div>
-<div class="has-success">
-  <div class="radio">
-    <label>
-      <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
-      Option one is this and that&mdash;be sure to include why it's great
-    </label>
-  </div>
-  <div class="radio">
-    <label>
-      <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
-      Option two can be something else and selecting it will deselect option one
-    </label>
-  </div>
-</div>
 {% endhighlight %}
 
   <h4>Optional icons in horizontal and inline forms</h4>
-- 
cgit v1.2.3


From ebdecacd650a766e8123dbe3f86c4aa0f9cd72b4 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 2 Jul 2014 22:06:28 -0700
Subject: fix up examples

---
 docs/_includes/css/forms.html | 48 +++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 7fb07ec7c..15bfb93b0 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -521,25 +521,27 @@
         <label class="control-label" for="inputError1">Input with error</label>
         <input type="text" class="form-control" id="inputError1">
       </div>
-      <div class="has-error">
-        <div class="radio">
-          <label class="checkbox">
+      <div class="has-success">
+        <div class="checkbox">
+          <label>
             <input type="checkbox" id="checkboxError" value="option1">
-            Option one is this and that&mdash;be sure to include why it's great
+            Checkbox with success
           </label>
         </div>
       </div>
-      <div class="has-success">
-        <div class="radio">
+      <div class="has-warning">
+        <div class="checkbox">
           <label>
-            <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
-            Option one is this and that&mdash;be sure to include why it's great
+            <input type="checkbox" id="checkboxError" value="option1">
+            Checkbox with warning
           </label>
         </div>
-        <div class="radio">
+      </div>
+      <div class="has-error">
+        <div class="checkbox">
           <label>
-            <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
-            Option two can be something else and selecting it will deselect option one
+            <input type="checkbox" id="checkboxError" value="option1">
+            Checkbox with error
           </label>
         </div>
       </div>
@@ -558,25 +560,27 @@
   <label class="control-label" for="inputError1">Input with error</label>
   <input type="text" class="form-control" id="inputError1">
 </div>
-<div class="has-error">
-  <div class="radio">
-    <label class="checkbox">
+<div class="has-success">
+  <div class="checkbox">
+    <label>
       <input type="checkbox" id="checkboxError" value="option1">
-      Option one is this and that&mdash;be sure to include why it's great
+      Checkbox with success
     </label>
   </div>
 </div>
-<div class="has-success">
-  <div class="radio">
+<div class="has-warning">
+  <div class="checkbox">
     <label>
-      <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
-      Option one is this and that&mdash;be sure to include why it's great
+      <input type="checkbox" id="checkboxError" value="option1">
+      Checkbox with warning
     </label>
   </div>
-  <div class="radio">
+</div>
+<div class="has-error">
+  <div class="checkbox">
     <label>
-      <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
-      Option two can be something else and selecting it will deselect option one
+      <input type="checkbox" id="checkboxError" value="option1">
+      Checkbox with error
     </label>
   </div>
 </div>
-- 
cgit v1.2.3


From a091c90063441e6ccd93307477fe9e3335fd740a Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 2 Jul 2014 22:12:39 -0700
Subject: fix new form validation

---
 docs/_includes/css/forms.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 15bfb93b0..02deb7d67 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -524,7 +524,7 @@
       <div class="has-success">
         <div class="checkbox">
           <label>
-            <input type="checkbox" id="checkboxError" value="option1">
+            <input type="checkbox" id="checkboxSuccess" value="option1">
             Checkbox with success
           </label>
         </div>
@@ -532,7 +532,7 @@
       <div class="has-warning">
         <div class="checkbox">
           <label>
-            <input type="checkbox" id="checkboxError" value="option1">
+            <input type="checkbox" id="checkboxWarning" value="option1">
             Checkbox with warning
           </label>
         </div>
@@ -563,7 +563,7 @@
 <div class="has-success">
   <div class="checkbox">
     <label>
-      <input type="checkbox" id="checkboxError" value="option1">
+      <input type="checkbox" id="checkboxSuccess" value="option1">
       Checkbox with success
     </label>
   </div>
@@ -571,7 +571,7 @@
 <div class="has-warning">
   <div class="checkbox">
     <label>
-      <input type="checkbox" id="checkboxError" value="option1">
+      <input type="checkbox" id="checkboxWarning" value="option1">
       Checkbox with warning
     </label>
   </div>
-- 
cgit v1.2.3


From 97ca848e16414ee995ed6cdce10246712e42d348 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Sat, 5 Jul 2014 15:51:03 +0300
Subject: Docs: add missing example code code for `kbd` after #13351.

---
 docs/_includes/css/code.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/code.html b/docs/_includes/css/code.html
index 675ac10e9..ba2edc151 100644
--- a/docs/_includes/css/code.html
+++ b/docs/_includes/css/code.html
@@ -17,7 +17,8 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   To edit settings, press <kbd><kbd>ctrl</kbd> + <kbd>,</kbd></kbd>
 </div>
 {% highlight html %}
-To switch directories, type <kbd>cd</kbd> followed by the name of the directory.
+To switch directories, type <kbd>cd</kbd> followed by the name of the directory.<br>
+To edit settings, press <kbd><kbd>ctrl</kbd> + <kbd>,</kbd></kbd>
 {% endhighlight %}
 
   <h2 id="code-block">Basic block</h2>
-- 
cgit v1.2.3


From 4f5efb84c9e81120b26949cecc626ae866fef46a Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 7 Jul 2014 17:26:52 -0700
Subject: Part 2 for fixing #13996: Add a docs callout to help folks using SVG
 images in IE8-10

---
 docs/_includes/css/images.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/images.html b/docs/_includes/css/images.html
index 4e0fc4a77..78f4c65b8 100644
--- a/docs/_includes/css/images.html
+++ b/docs/_includes/css/images.html
@@ -3,6 +3,10 @@
 
   <h2 id="images-responsive">Responsive images</h2>
   <p>Images in Bootstrap 3 can be made responsive-friendly via the addition of the <code>.img-responsive</code> class. This applies <code>max-width: 100%;</code> and <code>height: auto;</code> to the image so that it scales nicely to the parent element.</p>
+  <div class="bs-callout bs-callout-warning">
+    <h4>SVG images and IE 8-10</h4>
+    <p>In Internet Explorer IE 8-10, SVG images with <code>.img-responsive</code> are disproportionately sized. To fix this, add <code>width: 100% \9;</code> where necessary. Bootstrap doesn't apply this automatically as it causes complications to other image formats.</p>
+  </div>
 {% highlight html %}
 <img src="..." class="img-responsive" alt="Responsive image">
 {% endhighlight %}
-- 
cgit v1.2.3


From ddee04038f946ac103eb4e70c8eb7adeb2cf563b Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 7 Jul 2014 20:44:43 -0700
Subject: Fixes #14068: Update docs note for inline forms

---
 docs/_includes/css/forms.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/_includes/css')

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 02deb7d67..08b3e77ae 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -49,17 +49,17 @@
   <button type="submit" class="btn btn-default">Submit</button>
 </form>
 {% endhighlight %}
-    <div class="bs-callout bs-callout-warning">
-      <h4>Don't mix form groups with input groups</h4>
-      <p>Do not mix form groups directly with <a href="/components/#input-groups">input groups</a>. Instead, nest the input group inside of the form group.</p>
-    </div>
+  <div class="bs-callout bs-callout-warning">
+    <h4>Don't mix form groups with input groups</h4>
+    <p>Do not mix form groups directly with <a href="/components/#input-groups">input groups</a>. Instead, nest the input group inside of the form group.</p>
+  </div>
 
 
   <h2 id="forms-inline">Inline form</h2>
   <p>Add <code>.form-inline</code> to your <code>&lt;form&gt;</code> for left-aligned and inline-block controls. <strong>This only applies to forms within viewports that are at least 768px wide.</strong></p>
   <div class="bs-callout bs-callout-danger">
     <h4>Requires custom widths</h4>
-    <p>Inputs, selects, and textareas are 100% wide by default in Bootstrap. To use the inline form, you'll have to set a width on the form controls used within.</p>
+    <p>Inputs and selects have <code>width: 100%;</code> applied by default in Bootstrap. Within inline forms, we reset that to <code>width: auto;</code> so multiple controls can reside on the same line. Depending on your layout, additional custom widths may be required.</p>
   </div>
   <div class="bs-callout bs-callout-warning">
     <h4>Always add labels</h4>
-- 
cgit v1.2.3