diff options
| author | Jacob Thornton <[email protected]> | 2012-07-22 14:52:13 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-07-22 14:52:13 -0700 |
| commit | fa1e1e34dfd9e8501ffdbb92a282ff5550685f3c (patch) | |
| tree | 75ae5bf530b047f6a879105da74068fa3843229f /docs | |
| parent | fae6c36874b102408b53c6e5d980b247a9779dea (diff) | |
| parent | 48fc0ad56953f260b0f926f0fd7564e75cd9e9f9 (diff) | |
| download | bootstrap-fa1e1e34dfd9e8501ffdbb92a282ff5550685f3c.tar.xz bootstrap-fa1e1e34dfd9e8501ffdbb92a282ff5550685f3c.zip | |
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 326f2b2e7..062e02863 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -780,7 +780,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p>{{_i}}Toggles an element's tooltip.{{/i}}</p> <pre class="prettyprint linenums">$('#element').tooltip('toggle')</pre> <h4>.tooltip('destroy')</h4> - <p>{{_i}}Destroys an element's tooltip.{{/i}}</p> + <p>{{_i}}Hides and destroys an element's tooltip.{{/i}}</p> <pre class="prettyprint linenums">$('#element').tooltip('destroy')</pre> </section> @@ -935,7 +935,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p>{{_i}}Toggles an elements popover.{{/i}}</p> <pre class="prettyprint linenums">$('#element').popover('toggle')</pre> <h4>.popover('destroy')</h4> - <p>{{_i}}Destroys an element's popover.{{/i}}</p> + <p>{{_i}}Hides and destroys an element's popover.{{/i}}</p> <pre class="prettyprint linenums">$('#element').popover('destroy')</pre> </section> |