Merge branch 'master' of github.com:twbs/bootstrap

1 files changed, 33 insertions, 33 deletions

diff --git a/css.html b/css.html
index 4220b998c..cd233ef2a 100644
--- a/css.html
+++ b/css.html
@@ -1965,31 +1965,31 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <div class="bs-example">
       <form role="form">
         <div class="form-group has-success">
-          <label class="control-label" for="inputSuccess">Input with success</label>
-          <input type="text" class="form-control" id="inputSuccess">
+          <label class="control-label" for="inputSuccess1">Input with success</label>
+          <input type="text" class="form-control" id="inputSuccess1">
         </div>
         <div class="form-group has-warning">
-          <label class="control-label" for="inputWarning">Input with warning</label>
-          <input type="text" class="form-control" id="inputWarning">
+          <label class="control-label" for="inputWarning1">Input with warning</label>
+          <input type="text" class="form-control" id="inputWarning1">
         </div>
         <div class="form-group has-error">
-          <label class="control-label" for="inputError">Input with error</label>
-          <input type="text" class="form-control" id="inputError">
+          <label class="control-label" for="inputError1">Input with error</label>
+          <input type="text" class="form-control" id="inputError1">
         </div>
       </form>
     </div><!-- /.bs-example -->
 {% highlight html %}
 <div class="form-group has-success">
-  <label class="control-label" for="inputSuccess">Input with success</label>
-  <input type="text" class="form-control" id="inputSuccess">
+  <label class="control-label" for="inputSuccess1">Input with success</label>
+  <input type="text" class="form-control" id="inputSuccess1">
 </div>
 <div class="form-group has-warning">
-  <label class="control-label" for="inputWarning">Input with warning</label>
-  <input type="text" class="form-control" id="inputWarning">
+  <label class="control-label" for="inputWarning1">Input with warning</label>
+  <input type="text" class="form-control" id="inputWarning1">
 </div>
 <div class="form-group has-error">
-  <label class="control-label" for="inputError">Input with error</label>
-  <input type="text" class="form-control" id="inputError">
+  <label class="control-label" for="inputError1">Input with error</label>
+  <input type="text" class="form-control" id="inputError1">
 </div>
 {% endhighlight %}
 
@@ -1998,36 +1998,36 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <div class="bs-example">
       <form role="form">
         <div class="form-group has-success has-feedback">
-          <label class="control-label" for="inputSuccess">Input with success</label>
-          <input type="text" class="form-control" id="inputSuccess">
+          <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>
         </div>
         <div class="form-group has-warning has-feedback">
-          <label class="control-label" for="inputWarning">Input with warning</label>
-          <input type="text" class="form-control" id="inputWarning">
+          <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>
         </div>
         <div class="form-group has-error has-feedback">
-          <label class="control-label" for="inputError">Input with error</label>
-          <input type="text" class="form-control" id="inputError">
+          <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>
         </div>
       </form>
     </div>
 {% highlight html %}
 <div class="form-group has-success has-feedback">
-  <label class="control-label" for="inputSuccess">Input with success</label>
-  <input type="text" class="form-control" id="inputSuccess">
+  <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>
 </div>
 <div class="form-group has-warning has-feedback">
-  <label class="control-label" for="inputWarning">Input with warning</label>
-  <input type="text" class="form-control" id="inputWarning">
+  <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>
 </div>
 <div class="form-group has-error has-feedback">
-  <label class="control-label" for="inputError">Input with error</label>
-  <input type="text" class="form-control" id="inputError">
+  <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>
 </div>
 {% endhighlight %}
@@ -2036,9 +2036,9 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <div class="bs-example">
       <form class="form-horizontal" role="form">
         <div class="form-group has-success has-feedback">
-          <label class="control-label col-sm-3" for="inputSuccess">Input with success</label>
+          <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="inputSuccess">
+            <input type="text" class="form-control" id="inputSuccess3">
             <span class="glyphicon glyphicon-ok form-control-feedback"></span>
           </div>
         </div>
@@ -2047,9 +2047,9 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% highlight html %}
 <form class="form-horizontal" role="form">
   <div class="form-group has-success has-feedback">
-    <label class="control-label col-sm-3" for="inputSuccess">Input with success</label>
+    <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="inputSuccess">
+      <input type="text" class="form-control" id="inputSuccess3">
       <span class="glyphicon glyphicon-ok form-control-feedback"></span>
     </div>
   </div>
@@ -2059,8 +2059,8 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <div class="bs-example">
       <form class="form-inline" role="form">
         <div class="form-group has-success has-feedback">
-          <label class="control-label" for="inputSuccess">Input with success</label>
-          <input type="text" class="form-control" id="inputSuccess">
+          <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>
         </div>
       </form>
@@ -2068,8 +2068,8 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% highlight html %}
 <form class="form-inline" role="form">
   <div class="form-group has-success has-feedback">
-    <label class="control-label" for="inputSuccess">Input with success</label>
-    <input type="text" class="form-control" id="inputSuccess">
+    <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>
   </div>
 </form>
@@ -3006,7 +3006,7 @@ a {
 {% endhighlight %}
 
     <h3 id="less-mixins-box-shadow">Box (Drop) shadows</h3>
-    <p>If your target audience is using the latest and greatest browsers and devices, be sure to just use the <code>box-shadow</code> property on it's own. If you need support for older Android (pre-v4) and iOS devices (pre-iOS 5), use of the mixin to pick up the required <code>-webkit</code> prefix.</p>
+    <p>If your target audience is using the latest and greatest browsers and devices, be sure to just use the <code>box-shadow</code> property on its own. If you need support for older Android (pre-v4) and iOS devices (pre-iOS 5), use the mixin to pick up the required <code>-webkit</code> prefix.</p>
     <p>Be sure to use <code>rgba()</code> colors in your box shadows so they blend as seamlessly as possible with backgrounds.</p>
 {% highlight css %}
 .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {