merge in #1782, remake to compile html, add some i18n tags

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 5d0083c2d5473020843b0f95c0d0737b96bd1236..5f7a919dea081b242851a5b7113a755b8454aec8 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/javascript.html b/docs/javascript.html
index 97dfc54a22498f99625defb6a454e89d1dd53a24..395394d027f04f24bafd8b43ae319ef05ae66d7a 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -773,6 +773,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           </div>
           <h3>Markup</h3>
           <p>For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.</p>
+<pre class="prettyprint linenums">
+&lt;a href="#" rel="tooltip" title="first tooltip"&gt;hover over me&lt;/a&gt;
+</pre>
           <h3>Methods</h3>
           <h4>$().tooltip(options)</h4>
           <p>Attaches a tooltip handler to an element collection.</p>

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 815aa7f03361a90e6e2e7fbe7623df6c07f490d4..c24626f8a39a93f60d20eb503ebf38a734d7d64c 100644 (file)
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -698,7 +698,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           <h3>{{_i}}Markup{{/i}}</h3>
           <p>{{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}</p>
 <pre class="prettyprint linenums">
-&lt;a href="#" rel="tooltip" title="first tooltip"&gt;{{_i}}hover over me{{/i}}&lt;/a&gt;
+&lt;a href="#" rel="tooltip" title="{{_i}}first tooltip{{/i}}"&gt;{{_i}}hover over me{{/i}}&lt;/a&gt;
 </pre>
           <h3>{{_i}}Methods{{/i}}</h3>
           <h4>$().tooltip({{_i}}options{{/i}})</h4>