Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

1 files changed, 47 insertions, 47 deletions

diff --git a/css.html b/css.html
index fd373c4e5..8b3cc0c50 100644
--- a/css.html
+++ b/css.html
@@ -585,27 +585,27 @@ base_url: "../"
       <table class="table">
         <tbody>
           <tr>
-            <th><h1>Bootstrap heading</h1></th>
+            <td><h1>Bootstrap heading</h1></td>
             <td>Semibold 38px</td>
           </tr>
           <tr>
-            <th><h2>Bootstrap heading</h2></th>
+            <td><h2>Bootstrap heading</h2></td>
             <td>Semibold 32px</td>
           </tr>
           <tr>
-            <th><h3>Bootstrap heading</h3></th>
+            <td><h3>Bootstrap heading</h3></td>
             <td>Semibold 24px</td>
           </tr>
           <tr>
-            <th><h4>Bootstrap heading</h4></th>
+            <td><h4>Bootstrap heading</h4></td>
             <td>Semibold 18px</td>
           </tr>
           <tr>
-            <th><h5>Bootstrap heading</h5></th>
+            <td><h5>Bootstrap heading</h5></td>
             <td>Semibold 16px</td>
           </tr>
           <tr>
-            <th><h6>Bootstrap heading</h6></th>
+            <td><h6>Bootstrap heading</h6></td>
             <td>Semibold 12px</td>
           </tr>
         </tbody>
@@ -1335,12 +1335,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <fieldset>
         <legend>Legend</legend>
         <div class="form-group">
-          <label for="exampleInputEmail">Email address</label>
-          <input type="text" class="form-control" id="exampleInputEmail" placeholder="Enter email">
+          <label for="exampleInputEmail1">Email address</label>
+          <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Enter email">
         </div>
         <div class="form-group">
-          <label for="exampleInputPassword">Password</label>
-          <input type="password" class="form-control" id="exampleInputPassword" placeholder="Password">
+          <label for="exampleInputPassword1">Password</label>
+          <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password">
         </div>
         <div class="form-group">
           <label for="exampleInputFile">File input</label>
@@ -1360,12 +1360,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   <fieldset>
     <legend>Legend</legend>
     <div class="form-group">
-      <label for="exampleInputEmail">Email address</label>
-      <input type="text" class="form-control" id="exampleInputEmail" placeholder="Enter email">
+      <label for="exampleInputEmail1">Email address</label>
+      <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Enter email">
     </div>
     <div class="form-group">
-      <label for="exampleInputPassword">Password</label>
-      <input type="password" class="form-control" id="exampleInputPassword" placeholder="Password">
+      <label for="exampleInputPassword1">Password</label>
+      <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password">
     </div>
     <div class="form-group">
       <label for="exampleInputFile">File input</label>
@@ -1395,12 +1395,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     </div>
     <form class="bs-example form-inline" role="form">
       <div class="form-group">
-        <label class="sr-only" for="exampleInputEmail">Email address</label>
-        <input type="text" class="form-control" id="exampleInputEmail" placeholder="Enter email">
+        <label class="sr-only" for="exampleInputEmail2">Email address</label>
+        <input type="text" class="form-control" id="exampleInputEmail2" placeholder="Enter email">
       </div>
       <div class="form-group">
-        <label class="sr-only" for="exampleInputPassword">Password</label>
-        <input type="password" class="form-control" id="exampleInputPassword" placeholder="Password">
+        <label class="sr-only" for="exampleInputPassword2">Password</label>
+        <input type="password" class="form-control" id="exampleInputPassword2" placeholder="Password">
       </div>
       <div class="checkbox">
         <label>
@@ -1412,12 +1412,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% highlight html %}
 <form class="form-inline" role="form">
   <div class="form-group">
-    <label class="sr-only" for="exampleInputEmail">Email address</label>
-    <input type="text" class="form-control" id="exampleInputEmail" placeholder="Enter email">
+    <label class="sr-only" for="exampleInputEmail2">Email address</label>
+    <input type="text" class="form-control" id="exampleInputEmail2" placeholder="Enter email">
   </div>
   <div class="form-group">
-    <label class="sr-only" for="exampleInputPassword">Password</label>
-    <input type="password" class="form-control" id="exampleInputPassword" placeholder="Password">
+    <label class="sr-only" for="exampleInputPassword2">Password</label>
+    <input type="password" class="form-control" id="exampleInputPassword2" placeholder="Password">
   </div>
   <div class="checkbox">
     <label>
@@ -1432,15 +1432,15 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout by adding <code>.form-horizontal</code> to the form. Doing so changes <code>.form-group</code>s to behave as grid rows, so no need for <code>.row</code>.</p>
     <form class="bs-example form-horizontal">
       <div class="form-group">
-        <label for="inputEmail" class="col-lg-2 control-label">Email</label>
+        <label for="inputEmail1" class="col-lg-2 control-label">Email</label>
         <div class="col-lg-10">
-          <input type="text" class="form-control" id="inputEmail" placeholder="Email">
+          <input type="text" class="form-control" id="inputEmail1" placeholder="Email">
         </div>
       </div>
       <div class="form-group">
-        <label for="inputPassword" class="col-lg-2 control-label">Password</label>
+        <label for="inputPassword1" class="col-lg-2 control-label">Password</label>
         <div class="col-lg-10">
-          <input type="password" class="form-control" id="inputPassword" placeholder="Password">
+          <input type="password" class="form-control" id="inputPassword1" placeholder="Password">
         </div>
       </div>
       <div class="form-group">
@@ -1461,15 +1461,15 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% highlight html %}
 <form class="form-horizontal" role="form">
   <div class="form-group">
-    <label for="inputEmail" class="col-lg-2 control-label">Email</label>
+    <label for="inputEmail1" class="col-lg-2 control-label">Email</label>
     <div class="col-lg-10">
-      <input type="text" class="form-control" id="inputEmail" placeholder="Email">
+      <input type="text" class="form-control" id="inputEmail1" placeholder="Email">
     </div>
   </div>
   <div class="form-group">
-    <label for="inputPassword" class="col-lg-2 control-label">Password</label>
+    <label for="inputPassword1" class="col-lg-2 control-label">Password</label>
     <div class="col-lg-10">
-      <input type="password" class="form-control" id="inputPassword" placeholder="Password">
+      <input type="password" class="form-control" id="inputPassword1" placeholder="Password">
     </div>
   </div>
   <div class="form-group">
@@ -1628,7 +1628,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>When you need to place regular, static text next to a form label within a horizontal form, use the <code>.form-control-static</code> class on a <code>&lt;p&gt;</code>.</p>
     <form class="bs-example form-horizontal">
       <div class="form-group">
-        <label for="inputEmail" class="col-lg-2 control-label">Email</label>
+        <label class="col-lg-2 control-label">Email</label>
         <div class="col-lg-10">
           <p class="form-control-static">[email protected]</p>
         </div>
@@ -1643,15 +1643,15 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% highlight html %}
 <form class="form-horizontal" role="form">
   <div class="form-group">
-    <label for="inputEmail2" class="col-lg-2 control-label">Email</label>
+    <label class="col-lg-2 control-label">Email</label>
     <div class="col-lg-10">
       <p class="form-control-static">[email protected]</p>
     </div>
   </div>
   <div class="form-group">
-    <label for="inputPassword2" class="col-lg-2 control-label">Password</label>
+    <label for="inputPassword" class="col-lg-2 control-label">Password</label>
     <div class="col-lg-10">
-      <input type="password" class="form-control" id="inputPassword2" placeholder="Password">
+      <input type="password" class="form-control" id="inputPassword" placeholder="Password">
     </div>
   </div>
 </form>
@@ -1695,11 +1695,11 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <form class="bs-example">
       <fieldset disabled>
         <div class="form-group">
-          <label for="disabledInput">Disabled input</label>
-          <input type="text" id="disabledInput" class="form-control" placeholder="Disabled input">
+          <label for="disabledTextInput">Disabled input</label>
+          <input type="text" id="disabledTextInput" class="form-control" placeholder="Disabled input">
         </div>
         <div class="form-group">
-          <label for="disabledInput">Disabled select menu</label>
+          <label for="disabledSelect">Disabled select menu</label>
           <select id="disabledSelect" class="form-control">
             <option>Disabled select</option>
           </select>
@@ -1716,11 +1716,11 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 <form class="form-inline" role="form">
   <fieldset disabled>
     <div class="form-group">
-      <label for="disabledInput">Disabled input</label>
-      <input type="text" id="disabledInput" class="form-control" placeholder="Disabled input">
+      <label for="disabledTextInput">Disabled input</label>
+      <input type="text" id="disabledTextInput" class="form-control" placeholder="Disabled input">
     </div>
     <div class="form-group">
-      <label for="disabledInput">Disabled select menu</label>
+      <label for="disabledSelect">Disabled select menu</label>
       <select id="disabledSelect" class="form-control">
         <option>Disabled select</option>
       </select>
@@ -1736,7 +1736,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}
 
     <h3 id="forms-validation">Validation states</h3>
-    <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.</li>
+    <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>
 
     <form class="bs-example">
       <div class="form-group has-warning">
@@ -2012,14 +2012,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <p>Keep in mind that Internet Explorer 8 lacks support for rounded corners.</p>
     </div>
     <div class="bs-example bs-example-images">
-      <img data-src="holder.js/140x140" class="img-rounded">
-      <img data-src="holder.js/140x140" class="img-circle">
-      <img data-src="holder.js/140x140" class="img-thumbnail">
+      <img data-src="holder.js/140x140" class="img-rounded" alt="A generic square placeholder image with rounded corners">
+      <img data-src="holder.js/140x140" class="img-circle" alt="A generic square placeholder image where only the portion within the circle circumscribed about said square is visible">
+      <img data-src="holder.js/140x140" class="img-thumbnail" alt="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera">
     </div>
 {% highlight html %}
-<img src="..." class="img-rounded">
-<img src="..." class="img-circle">
-<img src="..." class="img-thumbnail">
+<img src="..." alt="..." class="img-rounded">
+<img src="..." alt="..." class="img-circle">
+<img src="..." alt="..." class="img-thumbnail">
 {% endhighlight %}
 
     <div class="bs-callout bs-callout-warning">