Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip

docs/templates/pages/base-css.mustache

@@ -1194,7 +1194,7 @@
             <span class="input-xlarge uneditable-input">Some value here</span>
           </form>
 <pre class="prettyprint linenums">
-  &lt;span class="input-xlarge uneditable-input"&gt;Some value here&lt;/span&gt;
+&lt;span class="input-xlarge uneditable-input"&gt;Some value here&lt;/span&gt;
 </pre>
 
           <h3>{{_i}}Form actions{{/i}}</h3>

docs/templates/pages/customize.mustache

@@ -119,12 +119,16 @@
                   <input type="checkbox" checked="true" value="bootstrap-tooltip.js">
                   {{_i}}Tooltips{{/i}}
                 </label>
-              </div><!-- /span -->
-              <div class="span3">
                 <label class="checkbox">
                   <input type="checkbox" checked="true" value="bootstrap-popover.js">
                   {{_i}}Popovers <small>(requires Tooltips)</small>{{/i}}
                 </label>
+              </div><!-- /span -->
+              <div class="span3">
+                <label class="checkbox">
+                  <input type="checkbox" checked="true" value="bootstrap-affix.js">
+                  {{_i}}Affix{{/i}}
+                </label>
                 <label class="checkbox">
                   <input type="checkbox" checked="true" value="bootstrap-alert.js">
                   {{_i}}Alert messages{{/i}}
@@ -223,11 +227,11 @@
                 <label>@monoFontFamily</label>
                 <input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
                 <label>@baseFontSize</label>
-                <input type="text" class="span3" placeholder="13px">
+                <input type="text" class="span3" placeholder="14px">
                 <label>@baseFontFamily</label>
                 <input type="text" class="span3" placeholder="@sansFontFamily">
                 <label>@baseLineHeight</label>
-                <input type="text" class="span3" placeholder="18px">
+                <input type="text" class="span3" placeholder="20px">
                 <label>@altFontFamily</label>
                 <input type="text" class="span3" placeholder="@serifFontFamily">
                 <label>@headingsFontFamily</label>

docs/templates/pages/index.mustache

@@ -15,7 +15,7 @@
   <div class="container">
     <ul class="bs-docs-social-buttons">
       <li>
-        <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="112px" height="20px"></iframe>
+        <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
       </li>
       <li>
         <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>

docs/templates/pages/javascript.mustache

@@ -3,7 +3,7 @@
 <header class="jumbotron subhead" id="overview">
   <div class="container">
     <h1>{{_i}}JavaScript for Bootstrap{{/i}}</h1>
-    <p class="lead">{{_i}}Bring Bootstrap's components to life&mdash;now with 12 custom jQuery plugins.{{/i}}
+    <p class="lead">{{_i}}Bring Bootstrap's components to life&mdash;now with 13 custom jQuery plugins.{{/i}}
   </div>
 </header>