fMerge branch '2.1.0-wip'

Conflicts:
	docs/index.html

Author: fat

.gitignore

@@ -34,3 +34,4 @@ nbproject
 .CVS
 .idea
 node_modules
+dist

.issue-guidelines.js

@@ -0,0 +1,85 @@
+/* ==========================================================
+ * issue-guidelines.js
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+var assert = require('assert')
+
+module.exports = {
+
+    'pull-requests': {
+
+        'should always be made against -wip branches': function (pull) {
+            assert.ok(/\-wip$/.test(pull.base.ref))
+        },
+
+        'should always be made from feature branches': function (pull) {
+            assert.notEqual(pull.head.ref, 'master')
+        },
+
+        'should always include a unit test if changing js files': function (pull) {
+            var hasJS    = false
+            var hasTests = false
+
+            pull.files.forEach(function (file) {
+                if (/^js\/[^./]+.js/.test(file.filename))             hasJS    = true
+                if (/^js\/tests\/unit\/[^.]+.js/.test(file.filename)) hasTests = true
+            })
+
+            assert.ok(!hasJS || hasJS && hasTests)
+        },
+
+        'after': function (pull) {
+            if (pull.reporter.stats.failures) {
+                pull.reportFailures(pull.close.bind(pull))
+            }
+        }
+
+    },
+
+    'issues': {
+
+        'before': function (issue) {
+            var plus   = {}
+            var labels = issue.labels.map(function (label) { return label.name });
+
+            if (~labels.indexOf('popular')) return
+
+            issue.comments.forEach(function (comment) {
+                if (/\+1/.test(comment.body)) plus[comment.user.login] = true
+            })
+
+            if (Object.keys(plus).length > 5) {
+                issue.tag('popular')
+                issue.comment('Tagging this issue as popular, please stop commenting on this issue with +1. thanks!')
+            }
+        },
+
+        'should include a jsfiddle/jsbin illustrating the problem if tagged with js but not a feature': function (issue) {
+            var labels = issue.labels.map(function (label) { return label.name });
+            if (~labels.indexOf('js') && !~labels.indexOf('feature')) assert.ok(/(jsfiddle|jsbin)/.test(issue.body))
+        },
+
+        'after': function (issue) {
+            if (issue.reporter.stats.failures) {
+                issue.reportFailures(issue.close.bind(issue))
+            }
+        }
+
+    }
+
+}

Makefile

@@ -26,7 +26,7 @@ build:
 	@cp js/*.js docs/assets/js/
 	@cp js/tests/vendor/jquery.js docs/assets/js/
 	@echo "Compiling documentation...                  ${CHECK} Done"
-	@cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > docs/assets/js/bootstrap.js
+	@cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js
 	@uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
 	@echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
 	@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
@@ -90,5 +90,12 @@ watch:
 	echo "Watching less files..."; \
 	watchr -e "watch('less/.*\.less') { system 'make' }"
 
+#
+# HAUNT GITHUB ISSUES 4 FAT & MDO ONLY (O_O  )
+#
+
+haunt:
+	@haunt .issue-guidelines.js https://github.com/twitter/bootstrap
+
 
 .PHONY: docs watch gh-pages

README.md

@@ -1,9 +1,9 @@
 [Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
 =================
 
-Bootstrap provides simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. In other words, it's a front-end toolkit for faster, more beautiful web development. It's created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
+Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
 
-To get started, checkout http://twitter.github.com/bootstrap!
+To get started, checkout http://getbootstrap.com!
 
 
 
@@ -19,7 +19,7 @@ Versioning
 
 For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
 
-Releases will be numbered with the follow format:
+Releases will be numbered with the following format:
 
 `<major>.<minor>.<patch>`
 
@@ -36,7 +36,7 @@ For more information on SemVer, please visit http://semver.org/.
 Bug tracker
 -----------
 
-Have a bug? Please create an issue here on GitHub! Also, when filing please make sure you're familiar with [necolas's guidelines](https://github.com/necolas/issue-guidelines). thanks! <3
+Have a bug? Please create an issue here on GitHub that conforms with [necolas's guidelines](https://github.com/necolas/issue-guidelines).
 
 https://github.com/twitter/bootstrap/issues
 
@@ -82,26 +82,28 @@ Developers
 We have included a makefile with convenience methods for working with the Bootstrap library.
 
 + **dependencies**
-Our makefile depends on you having recess, uglify.js, and jshint installed. To install, just run the following command in npm:
+Our makefile depends on you having recess, connect, uglify.js, and jshint installed. To install, just run the following command in npm:
 
 ```
-$ npm install recess uglify-js jshint -g
+$ npm install recess connect uglify-js jshint -g
 ```
 
 + **build** - `make`
 Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://twitter.github.com/bootstrap/less.html#compiling">Read more in our docs &raquo;</a>
 
 + **test** - `make test`
-Runs jshint and qunit tests headlessly in phantom js (used for ci). Depends on having phatomjs installed.
+Runs jshint and qunit tests headlessly in [phatomjs] (http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
 
 + **watch** - `make watch`
 This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
 
 
+
 Contributing
 ------------
 
-Please make all pull requests against wip-* branches. Also, if your unit test contains javascript patches or features - you must include relevant unit tests. Thanks!
+Please submit all pull requests against *-wip branches. If your unit test contains javascript patches or features, you must include relevant unit tests. Thanks!
+
 
 
 Authors