diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 43c716180230e03195e8ac414f46acab5180565e..712b023ce6c9d527a32ab5a06b5e7c9c3a7eab40 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 94946a351273ec3da43a8f8d6176df8d10d2f9ec..b4e053056a89fd4e07b91ec4fdf2b3e8c31e7931 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>