Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into...

diff --cc docs/base-css.html
Simple merge

diff --cc docs/templates/pages/base-css.mustache
index 2108ddd054cbd85f418a70c941fb15c8602215aa,92c925b37bbad4f6e6f3bd27ee197b1c2c9f06df..5b9cae472a3e5373c6ac18a3b20fa3d4eb87f885
--- 1/docs/templates/pages/base-css.mustache
--- 2/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@@ -1468,5 -1473,33 +1479,33 @@@
          </ul>
        </div> <!-- /well -->
      </div>
+     <div class="span4">
+       <form>
+         <p>{{_i}}Use them with prepended forms.{{_i}}</p>
+         <div class="control-group">
+           <label class="control-label" for="prependedInput">{{_i}}Your Email Address:{{/i}}</label>
+           <div class="controls">
+             <div class="input-prepend">
+               <span class="add-on"><i class="icon envelope"></i></span>
+               <input class="span32" id="iconInput" size="16" type="text">
+             </div>
+           </div>
+         </div>
+         <div class="control-group">
+           <label class="control-label" for="iconSelect">{{_i}}Your Location:{{/i}}</label>
+           <div class="controls">
+             <div class="input-prepend">
+               <span class="add-on"><i class="icon map-marker"></i></span>
+               <select id="iconSelect">
+                 <option>Istanbul</option>
+                 <option>London</option>
+                 <option>New York</option>
+                 <option>Tokyo</option>
+               </select>
+             </div>
+           </div>
+         </div>
+       </form>
+     </div>
    </div>
 -</section>
 +</section>