Merge branch 'master' into docs_derp

Conflicts:
	docs/getting-started.html

docs/_includes/footer.html

@@ -30,12 +30,8 @@
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 <script src="{{ site.baseurl }}dist/js/bootstrap.min.js"></script>
-
-<script src="{{ site.baseurl }}assets/js/holder.js"></script>
-<script src="{{ site.baseurl }}assets/js/application.js"></script>
-
+<script src="{{ site.baseurl }}assets/js/docs.min.js"></script>
 {% if page.slug == "customize" %}
-<script src="{{ site.baseurl }}assets/js/raw-files.js"></script>
 <script src="{{ site.baseurl }}assets/js/customize.min.js"></script>
 {% endif %}
 

docs/_includes/header.html

@@ -17,8 +17,7 @@
 <link href="{{ site.baseurl }}dist/css/bootstrap.min.css" rel="stylesheet">
 
 <!-- Documentation extras -->
-<link href="{{ site.baseurl }}assets/css/docs.css" rel="stylesheet">
-<link href="{{ site.baseurl }}assets/css/pygments-manni.css" rel="stylesheet">
+<link href="{{ site.baseurl }}assets/css/pack.min.css" rel="stylesheet">
 <!--[if lt IE 9]><script src="{{ site.baseurl }}assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
 
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->

docs/components.html

@@ -760,8 +760,8 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
       <p>When using tooltips or popovers on elements within an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).</p>
     </div>
     <div class="bs-callout bs-callout-info">
-      <h4>Don't mix with form groups</h4>
-      <p>Do not apply input group classes directly to form groups. An input group is an isolated component.</p>
+      <h4>Don't mix with other components</h4>
+      <p>Do not mix form group or grid column classes directly with input groups.</p>
     </div>
 
 

docs/css.html

@@ -1882,12 +1882,13 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>We remove the default <code>outline</code> styles on some form controls and apply a <code>box-shadow</code> in its place for <code>:focus</code>.</p>
     <div class="bs-example">
       <form role="form">
-        <input class="form-control" id="focusedInput" type="text" value="This is focused...">
+        <input class="form-control" id="focusedInput" type="text" value="Demonstrative focus state">
       </form>
     </div>
-{% highlight html %}
-<input class="form-control" id="focusedInput" type="text" value="This is focused...">
-{% endhighlight %}
+<div class="bs-callout bs-callout-info">
+  <h4>Demo <code>:focus</code> state</h4>
+  <p>The above example input uses custom styles in our documentation to demonstrate the <code>:focus</code> state on a <code>.form-control</code>.</p>
+</div>
 
 
     <h2 id="forms-control-disabled">Disabled inputs</h2>
@@ -2082,7 +2083,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Set heights using classes like <code>.input-lg</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p>
 
     <h3>Height sizing</h3>
-    <p>Create larger or smaller form controls that match button sizes.</p>
+    <p>Create taller or shorter form controls that match button sizes.</p>
     <div class="bs-example bs-example-control-sizing">
       <form role="form">
         <div class="controls">

docs/getting-started.html

@@ -354,10 +354,6 @@ bootstrap/
           </tr>
         </thead>
         <tbody>
-          <tr>
-            <td><code>.container-fluid</code></td>
-            <td><code>.container</code></td>
-          </tr>
           <tr>
             <td><code>.row-fluid</code></td>
             <td><code>.row</code></td>
@@ -682,11 +678,6 @@ bootstrap/
             <td><code>.input-block-level</code></td>
             <td>No direct equivalent, but <a href="../css/#forms-controls">forms controls</a> are similar.</td>
           </tr>
-          <tr>
-            <td>Fluid container</td>
-            <td><code>.container-fluid</code></td>
-            <td><code>.container</code> (no more fixed grid)</td>
-          </tr>
           <tr>
             <td>Fluid row</td>
             <td><code>.row-fluid</code></td>
@@ -749,7 +740,7 @@ bootstrap/
       <li>Text-based form controls with the <code>.form-control</code> class applied are now 100% wide by default. Wrap inputs inside <code>&lt;div class="col-*"&gt;&lt;/div&gt;</code> to control input widths.</li>
       <li><code>.badge</code> no longer has contextual (-success,-primary,etc..) classes.</li>
       <li><code>.btn</code> must also use <code>.btn-default</code> to get the "default" button.</li>
-      <li><code>.container</code> and <code>.row</code> are now fluid (percentage-based).</li>
+      <li><code>.row</code> is now fluid.</li>
       <li>Images are no longer responsive by default. Use <code>.img-responsive</code> for fluid <code>&lt;img&gt;</code> size.</li>
       <li>The icons, now <code>.glyphicon</code>, are now font based. Icons also require a base and icon class (e.g. <code>.glyphicon .glyphicon-asterisk</code>).</li>
       <li>Typeahead has been dropped, in favor of using <a href="http://twitter.github.io/typeahead.js/">Twitter Typeahead</a>.</li>