From 54284a13c6b503d925bf6f75db2830f1af7fcf98 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 12 May 2014 12:54:10 -0700
Subject: [PATCH 1/2] Temporarily revert README deletions from #13470, pending
 the release of v3.2.0's updated hosted docs.

Fixes #13572.
---
 README.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/README.md b/README.md
index 802b4c7c42..5ef008d03b 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ To get started, check out <http://getbootstrap.com>!
  - [Quick start](#quick-start)
  - [Bugs and feature requests](#bugs-and-feature-requests)
  - [Documentation](#documentation)
+ - [Compiling CSS and JavaScript](#compiling-css-and-javascript)
  - [Contributing](#contributing)
  - [Community](#community)
  - [Versioning](#versioning)
@@ -77,6 +78,41 @@ Documentation for v2.3.2 has been made available for the time being at <http://g
 
 
 
+## Compiling CSS and JavaScript
+
+Bootstrap uses [Grunt](http://gruntjs.com/) with convenient methods for working with the framework. It's how we compile our code, run tests, and more. To use it, install the required dependencies as directed and then run some Grunt commands.
+
+### Install Grunt
+
+From the command line:
+
+1. Install `grunt-cli` globally with `npm install -g grunt-cli`.
+2. Navigate to the root `/bootstrap` directory, then run `npm install`. npm will look at [package.json](https://github.com/twbs/bootstrap/blob/master/package.json) and automatically install the necessary local dependencies listed there.
+
+When completed, you'll be able to run the various Grunt commands provided from the command line.
+
+**Unfamiliar with npm? Don't have node installed?** That's a-okay. npm stands for [node packaged modules](http://npmjs.org/) and is a way to manage development dependencies through node.js. [Download and install node.js](http://nodejs.org/download/) before proceeding.
+
+### Available Grunt commands
+
+#### Build - `grunt`
+Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
+
+#### Only compile CSS and JavaScript - `grunt dist`
+`grunt dist` creates the `/dist` directory with compiled files. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
+
+#### Tests - `grunt test`
+Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI).
+
+#### Watch - `grunt watch`
+This is a convenience method for watching just Less files and automatically building them whenever you save.
+
+### Troubleshooting dependencies
+
+Should you encounter problems with installing dependencies or running Grunt commands, uninstall all previous dependency versions (global and local). Then, rerun `npm install`.
+
+
+
 ## Contributing
 
 Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.

From 9900771aa7f1b3ddcee49aec84082104776ace70 Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Mon, 12 May 2014 19:15:23 -0700
Subject: [PATCH 2/2] fixes #12211: Scrollspy: Navs in different tabs can
 interfere with each othe

---
 js/scrollspy.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/scrollspy.js b/js/scrollspy.js
index 1f91535526..4ba733e787 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -46,6 +46,7 @@
 
     this.$body
       .find(this.selector)
+      .filter(':visible')
       .map(function () {
         var $el   = $(this)
         var href  = $el.data('target') || $el.attr('href')