diff options
| author | Mark Otto <[email protected]> | 2013-07-18 19:53:53 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-18 19:53:53 -0700 |
| commit | 49f2f7fad9a0364a2d971b4c9f8e2969b29cc15b (patch) | |
| tree | 56309b7c3580af6a00bf57f6279ace2c325d8f72 | |
| parent | e440ff4b3f872af175873283899cb40f50b8010f (diff) | |
| parent | e160b14223e2778af23c5ca90329b735da5b2ea7 (diff) | |
| download | bootstrap-49f2f7fad9a0364a2d971b4c9f8e2969b29cc15b.tar.xz bootstrap-49f2f7fad9a0364a2d971b4c9f8e2969b29cc15b.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | CONTRIBUTING.md | 1 | ||||
| -rw-r--r-- | javascript.html | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 43c716180..712b023ce 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/javascript.html b/javascript.html index 94946a351..b4e053056 100644 --- a/javascript.html +++ b/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> |