13 files changed, 117 insertions, 75 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index c3c82a659..ff6e37fe0 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -260,6 +260,7 @@ hr.soften {
   padding: 70px 0;
   margin-top: 70px;
   border-top: 1px solid #e5e5e5;
+  background-color: #f5f5f5;
 }
 .footer p {
   margin-bottom: 0;
diff --git a/docs/base-css.html b/docs/base-css.html
index b79d5295a..b829dc3ae 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1671,10 +1671,14 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
   </div>
 </div>
 
+    </div>
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
@@ -1684,9 +1688,8 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
         </ul>
-      </footer>
-
-    </div>
+      </div>
+    </footer>
 
 
 
diff --git a/docs/components.html b/docs/components.html
index 40cd2e19e..b176a6d7e 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -2196,10 +2196,14 @@ class="clearfix"
   </div>
 </div>
 
+    </div>
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
@@ -2209,9 +2213,8 @@ class="clearfix"
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
         </ul>
-      </footer>
-
-    </div>
+      </div>
+    </footer>
 
 
 
diff --git a/docs/download.html b/docs/download.html
index 9aebb74d2..6419d1317 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -416,10 +416,14 @@
   </section><!-- /download -->
 </form>
 
+    </div>
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
@@ -429,9 +433,8 @@
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
         </ul>
-      </footer>
-
-    </div>
+      </div>
+    </footer>
 
 
 
diff --git a/docs/examples.html b/docs/examples.html
index a2c7447b8..568d846c8 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -100,10 +100,14 @@
   </li>
 </ul>
 
+    </div>
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
@@ -113,9 +117,8 @@
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
         </ul>
-      </footer>
-
-    </div>
+      </div>
+    </footer>
 
 
 
diff --git a/docs/extend.html b/docs/extend.html
index a372361a0..71a9dddc2 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -172,10 +172,14 @@
   </div>
 </div>
 
+    </div>
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
@@ -185,9 +189,8 @@
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
         </ul>
-      </footer>
-
-    </div>
+      </div>
+    </footer>
 
 
 
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 26a9bc38e..856964bd9 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -211,10 +211,14 @@
 
   </div>
 </div>
+    </div>
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
@@ -224,9 +228,8 @@
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
         </ul>
-      </footer>
-
-    </div>
+      </div>
+    </footer>
 
 
 
diff --git a/docs/index.html b/docs/index.html
index ae841b3c1..274a9df9e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -158,10 +158,14 @@
 
   </div><!-- /.marketing -->
 
+    </div>
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
@@ -171,9 +175,8 @@
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
         </ul>
-      </footer>
-
-    </div>
+      </div>
+    </footer>
 
 
 
diff --git a/docs/javascript.html b/docs/javascript.html
index 0b475ae3b..1792f75c4 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1588,10 +1588,14 @@ $('.carousel').carousel({
   </div>
 </div>
 
+    </div>
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
@@ -1601,9 +1605,8 @@ $('.carousel').carousel({
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
         </ul>
-      </footer>
-
-    </div>
+      </div>
+    </footer>
 
 
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b703ad89d..0a94cf49a 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -590,10 +590,14 @@
   </div>
 </div>
 
+    </div>
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
@@ -603,9 +607,8 @@
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
         </ul>
-      </footer>
-
-    </div>
+      </div>
+    </footer>
 
 
 
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index dbec68eeb..9808c7b66 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -82,10 +82,14 @@
 
 {{>body}}
 
+    </div>{{! /container }}
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">{{_i}}Back to top{{/i}}</a></p>
         <p>{{_i}}Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.{{/i}}</p>
         <p>{{_i}}Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
@@ -95,9 +99,8 @@
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Submit issues{{/i}}</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">{{_i}}Roadmap and changelog{{/i}}</a></li>
         </ul>
-      </footer>
-
-    </div>{{! /container }}
+      </div>
+    </footer>
 
 
 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index e32233762..5d6985725 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -263,10 +263,14 @@
 </section>
 
 
+    </div>
+
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
+
+   <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
@@ -276,9 +280,8 @@
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
           <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
         </ul>
-      </footer>
-
-    </div>
+      </div>
+    </footer>
 
 
 
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 341c80264..6cc48a608 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -1054,17 +1054,25 @@
 
 
 
+    </div><!-- /container -->
 
-     <!-- Footer
-      ================================================== -->
-      <footer class="footer">
-        <p class="pull-right"><a href="#">Back to top</a></p>
-        <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
-        <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
-        <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
-      </footer>
 
-    </div><!-- /container -->
+
+    <!-- Footer
+    ================================================== -->
+    <footer class="footer">
+      <div class="container">
+        <p class="pull-right"><a href="#">{{_i}}Back to top{{/i}}</a></p>
+        <p>{{_i}}Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.{{/i}}</p>
+        <p>{{_i}}Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
+        <p>{{_i}}Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
+        <ul class="footer-links">
+          <li><a href="http://blog.getbootstrap.com">{{_i}}Read the blog{{/i}}</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Submit issues{{/i}}</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/wiki">{{_i}}Roadmap and changelog{{/i}}</a></li>
+        </ul>
+      </div>
+    </footer>