Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip...

Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html

diff --cc docs/assets/css/docs.css
Simple merge

diff --cc docs/components.html
index cf504ebfa80f3fbfd09fbf8dda59d28487900e5e,634b8bde07b8ea5f8a0aad3443cd0fca22aaa89d..365eeb0d6b2639cdc0c07f0451e9e678e8049108
--- 1/docs/components.html
--- 2/docs/components.html
+++ b/docs/components.html
@@@ -167,7 -571,13 +167,13 @@@ lead: "Dozens of reusable components bu
  {% endhighlight %}
  
      <h3 id="btn-groups-justified">Justified button groups</h3>
-     <p>Make a group of buttons stretch at the same size to span the entire width of its parent. <strong>This only works with <code>&lt;a&gt;</code> elements</strong> as the <code>&lt;button&gt;</code> doesn't pick up these styles.</p>
+     <p>Make a group of buttons stretch at the same size to span the entire width of its parent.</p>
 -    
++
+     <div class="bs-callout bs-callout-warning">
+       <h4>Element-specific usage</h4>
+       <p>This only works with <code>&lt;a&gt;</code> elements as the <code>&lt;button&gt;</code> doesn't pick up these styles.</p>
+     </div>
 -    
++
      <div class="bs-example">
        <div class="btn-group btn-group-justified">
          <a href="#" class="btn btn-default">Left</a>
@@@ -193,9 -603,9 +199,9 @@@
      </div>
      <p class="lead">Use any button to trigger a dropdown menu by placing it within a <code>.btn-group</code> and providing the proper menu markup.</p>
  
-     <div class="bs-callout">
+     <div class="bs-callout bs-callout-danger">
        <h4>Plugin dependency</h4>
 -      <p>Button dropdowns require the <a href="#dropdown-plugin">dropdown plugin</a> to be included in your version of Bootstrap.</p>
 +      <p>Button dropdowns require the <a href="/javascript/#dropdowns">dropdown plugin</a> to be included in your version of Bootstrap.</p>
      </div>
  
      <h3 id="btn-dropdowns-single">Single button dropdowns</h3>
@@@ -944,9 -1354,9 +950,9 @@@ body { padding-bottom: 70px; 
  </div><!-- /.navbar -->
  {% endhighlight %}
  
-     <div class="bs-callout">
+     <div class="bs-callout bs-callout-danger">
        <h4>Plugin dependency</h4>
 -      <p>The responsive navbar requires the <a href="#collapse">collapse plugin</a> to be included in your version of Bootstrap.</p>
 +      <p>The responsive navbar requires the <a href="/javascript/#collapse">collapse plugin</a> to be included in your version of Bootstrap.</p>
      </div>
  
  
@@@ -1452,10 -1862,16 +1458,16 @@@
      <div class="page-header">
        <h1>Alerts</h1>
      </div>
 -    <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="./docs/#js-alerts">alerts jQuery plugin</a>.</p>
 +    <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="/javascript/#js-alerts">alerts jQuery plugin</a>.</p>
  
      <h3 id="alerts-default">Default alert</h3>
-     <p>Wrap any text and an optional dismiss button in <code>.alert</code> for a basic warning alert message. <strong>To ensure proper behavior across all devices</strong>, be sure to use <code>&lt;button&gt;</code> element with the <code>data-dismiss="alert"</code> data attribute.</p>
+     <p>Wrap any text and an optional dismiss button in <code>.alert</code> for a basic warning alert message.</p>
+ 
+     <div class="bs-callout bs-callout-warning">
+       <h4>Ensure proper behavior across all devices</h4>
+       <p>Be sure to use the <code>&lt;button&gt;</code> element with the <code>data-dismiss="alert"</code> data attribute.</p>
+     </div>
+ 
      <div class="bs-example">
        <div class="alert">
          <button type="button" class="close" data-dismiss="alert">&times;</button>

diff --cc docs/css.html
index e87abfbc0d8b7acd8d611c9395e8d9662d6cab7b,658f2ea9ae7d65984ba405ed0acc3cd4bf11e9a6..e15157fba4cc991f7990d3adc8b060b2431ce993
--- 1/docs/css.html
--- 2/docs/css.html
+++ b/docs/css.html
@@@ -259,9 -245,9 +259,9 @@@ lead: "Fundamental HTML elements style
  </div>
  {% endhighlight %}
  
-     <div class="bs-callout">
+     <div class="bs-callout bs-callout-danger">
        <h4>Need more examples?</h4>
 -      <p>We dive into more grid layouts in a separte page, free of chrome and documentation to better show you the power of the grid.</p>
 +      <p>We dive into more grid layouts in a separate page, free of chrome and documentation to better show you the power of the grid.</p>
        <p><a class="btn btn-danger" target="_blank" href="../examples/grid/">More grid examples</a></p>
      </div>
  
@@@ -1502,9 -1512,9 +1505,9 @@@ For example, <code>&lt;section&gt;</cod
      <p>Adding on top of existing browser controls, Bootstrap includes other useful form components.</p>
  
      <h3 id="forms-input-groups">Input groups</h3>
 -    <p>Add text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with a <code>.add-on</code> to prepend or append elements to an <code>&lt;input&gt;</code>.</p>
 +    <p>Add text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with an <code>.add-on</code> to prepend or append elements to an <code>&lt;input&gt;</code>.</p>
  
-     <div class="bs-callout">
+     <div class="bs-callout bs-callout-danger">
        <h4>Cross-browser compatibility</h4>
        <p>Avoid using <code>&lt;select&gt;</code> elements here as they cannot be fully styled in WebKit browsers.</p>
      </div>

diff --cc docs/customize.html
index 7d2b4f2540b44253921fa85232f314ccb43269ee,c91a23c14b50691506772d1351bf21652bfef973..876d81ddee305c9130d5337f8ecbf08880888d81
--- 1/docs/customize.html
--- 2/docs/customize.html
+++ b/docs/customize.html
@@@ -349,9 -355,14 +349,15 @@@ lead: Customize Bootstrap's components
            </div>
          </div>
        </div>
-       <div class="bs-callout">
-         <h4>Heads up!</h4>
-         <p>All checked plugins will be compiled into a single file, <code>bootstrap.js</code>. All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
++
+       <div class="bs-callout bs-callout-info">
+         <h4>Produces two files</h4>
+         <p>All checked plugins will be compiled into a readable <code>bootstrap.js</code> and a minified <code>bootstrap.min.js</code>. We recommend you use the minified version in production.</p>
+       </div>
+ 
+       <div class="bs-callout bs-callout-danger">
+         <h4>jQuery required</h4>
+         <p>All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
        </div>
      </div>
  

diff --cc docs/getting-started.html
Simple merge

diff --cc docs/javascript.html
Simple merge