From 11f72f6aa22c9d2daa9a95846e6c786afd7bc3e1 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 7 Feb 2012 00:31:01 -0800
Subject: merge in #1782, remake to compile html, add some i18n tags

---
 docs/assets/bootstrap.zip                | Bin 52562 -> 52562 bytes
 docs/javascript.html                     |   3 +++
 docs/templates/pages/javascript.mustache |   2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 5d0083c2d..5f7a919de 100644
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 97dfc54a2..395394d02 100644
--- 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 815aa7f03..c24626f8a 100644
--- 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>
-- 
cgit v1.2.3