From 3e8b3a246a3a7142f969ade63bbe21948085f4f2 Mon Sep 17 00:00:00 2001 From: Christopher Canipe Date: Thu, 18 Jul 2013 19:41:42 -0600 Subject: [PATCH 1/2] Clean up tooltip's trigger description in the docs. --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascript.html b/javascript.html index 94946a3512..b4e053056a 100644 --- a/javascript.html +++ b/javascript.html @@ -815,7 +815,7 @@ $('#example').tooltip(options) trigger string 'hover focus' - how tooltip is triggered - click | hover | focus | manual. Note you case pass trigger multiple, space separated, trigger types. + how tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. delay From 896d159987299749b00909ed8fd68af3b2b9ff32 Mon Sep 17 00:00:00 2001 From: Christopher Canipe Date: Thu, 18 Jul 2013 20:09:33 -0600 Subject: [PATCH 2/2] Remove Mustache comment regarding contribution: it's going away. --- CONTRIBUTING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 43c7161802..712b023ce6 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