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

CONTRIBUTING.md

@@ -26,7 +26,6 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
 ## Pull requests
 
 - Try to submit pull requests against the latest `*-wip` branch for easier merging
-- Any changes to the docs must be made to the Mustache templates, not just the compiled HTML pages
 - CSS changes must be done in .less files first, never just the compiled files
 - If modifying the .less files, always recompile and commit the compiled files bootstrap.css and bootstrap.min.css
 - Try not to pollute your pull request with unintended changes--keep them simple and small

javascript.html

@@ -815,7 +815,7 @@ $('#example').tooltip(options)
                <td>trigger</td>
                <td>string</td>
                <td>'hover focus'</td>
-               <td>how tooltip is triggered - click | hover | focus | manual. Note you case pass trigger multiple, space separated, trigger types.</td>
+               <td>how tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td>
              </tr>
              <tr>
                <td>delay</td>