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

1 files changed, 19 insertions, 19 deletions

diff --git a/components.html b/components.html
index d49e153f5..39039a448 100644
--- a/components.html
+++ b/components.html
@@ -1124,7 +1124,7 @@ base_url: "../"
 
       <nav class="navbar" role="navigation">
         <form class="navbar-form pull-left" role="form">
-          <select name="" id="" class="form-control" style="width: 200px;">
+          <select name="" class="form-control" style="width: 200px;">
             <option value="1">1</option>
             <option value="2">2</option>
             <option value="3">3</option>
@@ -1318,7 +1318,7 @@ body { padding-bottom: 70px; }
                 </ul>
               </li>
             </ul>
-            <form class="navbar-form pull-left" action="" role="search">
+            <form class="navbar-form pull-left" action="." role="search">
               <input type="text" class="form-control col-lg-8" placeholder="Search">
             </form>
             <ul class="nav navbar-nav pull-right">
@@ -1388,7 +1388,7 @@ body { padding-bottom: 70px; }
               <li><a href="#">Link</a></li>
               <li><a href="#">Link</a></li>
             </ul>
-            <form class="navbar-form pull-left" action="" role="search">
+            <form class="navbar-form pull-left" action="." role="search">
               <input type="text" class="form-control col-lg-8" placeholder="Search">
             </form>
           </div><!-- /.nav-collapse -->
@@ -1438,7 +1438,7 @@ body { padding-bottom: 70px; }
                 </ul>
               </li>
             </ul>
-            <form class="navbar-form pull-left" action="" role="search">
+            <form class="navbar-form pull-left" action="." role="search">
               <input type="text" class="form-control col-lg-8" placeholder="Search">
             </form>
             <ul class="nav navbar-nav pull-right">
@@ -1819,22 +1819,22 @@ body { padding-bottom: 70px; }
       <div class="row">
         <div class="col-lg-3">
           <a href="#" class="thumbnail">
-            <img data-src="holder.js/100%x180" alt="">
+            <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
           </a>
         </div>
         <div class="col-lg-3">
           <a href="#" class="thumbnail">
-            <img data-src="holder.js/100%x180" alt="">
+            <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
           </a>
         </div>
         <div class="col-lg-3">
           <a href="#" class="thumbnail">
-            <img data-src="holder.js/100%x180" alt="">
+            <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
           </a>
         </div>
         <div class="col-lg-3">
           <a href="#" class="thumbnail">
-            <img data-src="holder.js/100%x180" alt="">
+            <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
           </a>
         </div>
       </div>
@@ -1843,7 +1843,7 @@ body { padding-bottom: 70px; }
 <div class="row">
   <div class="col-lg-3">
     <a href="#" class="thumbnail">
-      <img data-src="holder.js/100%x180" alt="">
+      <img data-src="holder.js/100%x180" alt="...">
     </a>
   </div>
   ...
@@ -2148,7 +2148,7 @@ body { padding-bottom: 70px; }
     <div class="bs-example">
       <div class="media">
         <a class="pull-left" href="#">
-          <img class="media-object" data-src="holder.js/64x64">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
         <div class="media-body">
           <h4 class="media-heading">Media heading</h4>
@@ -2157,14 +2157,14 @@ body { padding-bottom: 70px; }
       </div>
       <div class="media">
         <a class="pull-left" href="#">
-          <img class="media-object" data-src="holder.js/64x64">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
         <div class="media-body">
           <h4 class="media-heading">Media heading</h4>
           Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
           <div class="media">
             <a class="pull-left" href="#">
-              <img class="media-object" data-src="holder.js/64x64">
+              <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
             </a>
             <div class="media-body">
               <h4 class="media-heading">Media heading</h4>
@@ -2177,7 +2177,7 @@ body { padding-bottom: 70px; }
 {% highlight html %}
 <div class="media">
   <a class="pull-left" href="#">
-    <img class="media-object" src="...">
+    <img class="media-object" src="..." alt="...">
   </a>
   <div class="media-body">
     <h4 class="media-heading">Media heading</h4>
@@ -2192,7 +2192,7 @@ body { padding-bottom: 70px; }
       <ul class="media-list">
         <li class="media">
           <a class="pull-left" href="#">
-            <img class="media-object" data-src="holder.js/64x64">
+            <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
           </a>
           <div class="media-body">
             <h4 class="media-heading">Media heading</h4>
@@ -2200,7 +2200,7 @@ body { padding-bottom: 70px; }
             <!-- Nested media object -->
             <div class="media">
               <a class="pull-left" href="#">
-                <img class="media-object" data-src="holder.js/64x64">
+                <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
               </a>
               <div class="media-body">
                 <h4 class="media-heading">Nested media heading</h4>
@@ -2208,7 +2208,7 @@ body { padding-bottom: 70px; }
                 <!-- Nested media object -->
                 <div class="media">
                   <a class="pull-left" href="#">
-                    <img class="media-object" data-src="holder.js/64x64">
+                    <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
                   </a>
                   <div class="media-body">
                     <h4 class="media-heading">Nested media heading</h4>
@@ -2220,7 +2220,7 @@ body { padding-bottom: 70px; }
             <!-- Nested media object -->
             <div class="media">
               <a class="pull-left" href="#">
-                <img class="media-object" data-src="holder.js/64x64">
+                <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
               </a>
               <div class="media-body">
                 <h4 class="media-heading">Nested media heading</h4>
@@ -2231,7 +2231,7 @@ body { padding-bottom: 70px; }
         </li>
         <li class="media">
           <a class="pull-right" href="#">
-            <img class="media-object" data-src="holder.js/64x64">
+            <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
           </a>
           <div class="media-body">
             <h4 class="media-heading">Media heading</h4>
@@ -2244,7 +2244,7 @@ body { padding-bottom: 70px; }
 <ul class="media-list">
   <li class="media">
     <a class="pull-left" href="#">
-      <img class="media-object" src="...">
+      <img class="media-object" src="..." alt="...">
     </a>
     <div class="media-body">
       <h4 class="media-heading">Media heading</h4>