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

5 files changed, 1 insertions, 67 deletions

diff --git a/README.md b/README.md
index b76a8da23..35e9295eb 100644
--- a/README.md
+++ b/README.md
@@ -12,20 +12,11 @@ Three quick start options are available:
 
 * [Download the latest release](https://github.com/twitter/bootstrap/zipball/master).
 * Clone the repo: `git clone git://github.com/twitter/bootstrap.git`.
-* Install with Twitter's [Bower](http://github.com/bower/bower): `bower install bootstrap`.
+* Install with Twitter's [Bower](http://bower.io): `bower install bootstrap`.
 
 Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, basic template guidelines, and more.
 
 
-## Bootstrap elsewhere
-
-Beyond getting started with the Bootstrap core, there are ways to use Bootstrap in other tools and services:
-
-* [Roots WordPress theme](https://github.com/retlehs/roots) - A WordPress starter theme based on HTML5 Boilerplate & Bootstrap from Twitter.
-
-Have suggestions? Let us know with a [new issue](https://github.com/twitter/bootstrap/issues).
-
-
 
 ## Bugs and feature requests
 
diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html
index f1596f7ef..437b2e3bd 100644
--- a/docs/_includes/nav-css.html
+++ b/docs/_includes/nav-css.html
@@ -54,7 +54,6 @@
     <li><a href="#forms-control-states">Control states</a></li>
     <li><a href="#forms-input-groups">Input groups</a></li>
     <li><a href="#forms-control-sizes">Control sizing</a></li>
-    <li><a href="#forms-actions">Form actions</a></li>
     <li><a href="#forms-help-text">Help text</a></li>
   </ul>
 </li>
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index bec7260c2..326ae4990 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1535,34 +1535,6 @@ select:focus:invalid:focus {
           box-shadow: 0 0 6px #f8b9b7;
 }
 
-.form-actions {
-  padding: 20px 20px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #e5e5e5;
-}
-
-.form-actions:before,
-.form-actions:after {
-  display: table;
-  content: " ";
-}
-
-.form-actions:after {
-  clear: both;
-}
-
-.form-actions:before,
-.form-actions:after {
-  display: table;
-  content: " ";
-}
-
-.form-actions:after {
-  clear: both;
-}
-
 .help-block {
   display: block;
   margin-top: 5px;
diff --git a/docs/css.html b/docs/css.html
index 36b5208e6..90f6f490f 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -1663,21 +1663,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 </div>
 {% endhighlight %}
 
-    <h3 id="forms-actions">Form actions</h3>
-    <p>End a form with a group of actions (buttons). When placed within a <code>.form-horizontal</code>, the buttons will automatically indent to line up with the form controls.</p>
-    <form class="bs-example">
-      <div class="form-actions">
-        <button type="submit" class="btn btn-primary">Save changes</button>
-        <button type="button" class="btn btn-default">Cancel</button>
-      </div>
-    </form>
-{% highlight html %}
-<div class="form-actions">
-  <button type="submit" class="btn btn-primary">Save changes</button>
-  <button type="button" class="btn btn-default">Cancel</button>
-</div>
-{% endhighlight %}
-
     <h3 id="forms-help-text">Help text</h3>
     <p>Block level help text for form controls.</p>
     <form class="bs-example">
diff --git a/less/forms.less b/less/forms.less
index 2c696945d..4e028bf49 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -295,19 +295,6 @@ select:focus:invalid {
 
 
 
-// FORM ACTIONS
-// ------------
-
-.form-actions {
-  padding: @line-height-computed 20px;
-  margin-top: @line-height-computed;
-  margin-bottom: @line-height-computed;
-  background-color: @form-actions-bg;
-  border-top: 1px solid #e5e5e5;
-  .clearfix(); // Adding clearfix to allow for .pull-right button containers
-}
-
-
 
 // HELP TEXT
 // ---------