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: [PATCH] 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(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 5d0083c2d5473020843b0f95c0d0737b96bd1236..5f7a919dea081b242851a5b7113a755b8454aec8 100644
GIT binary patch
delta 452
zcmcaKi}}(lW}X0VW)?065O89e$fKxibI-uv4v0%DxEUB(zB4i~u!sO95z3sICMOoi
zOw8eAvjr=i+*2UU<jgd2hAmjY_TI+ZXE}fZlUH#%LPa)z<P2tKa$=h7CTPS4vcUG<
z<~qSO1|U^BPG(?LHupAXIDOXzsY)zR1*@{V2R0ihva-M#rtechr2t4#Zlf(sXhUPQ
z0LUoaNh+vrnp`r;04lP1)g(qmkfODlP1r#G13KaP<|`r~qxPQAXR^6Bx&D+m2P7nb
z%6Ly2GueW~WI>t|PkJNq&Ytv#@qoH*PdPwzgH_Hu<pPm|nFUnAds1ey{AqERDxgUC
k=|Cjj$<y8#_M4tDg4qGIzvGM@67TsLCnjLnXrEOF04#Z#9RL6T

delta 452
zcmcaKi}}(lW}X0VW)?065cthFkw;N^=UoH;T|it~!Og(P@|}@^fkgx;iL7jLVu8%W
z98NZnvR!v4_Y_Do0rk$X1q<xFyYco}4xqr~Rh*7cC7VBT2D5{N+ysr-AQo({6I^2e
z64G%pg9&9geb)sEB^Ibcg`j3nURmG_Q}n5zQUIhVx6u|Rw4t#YETlV01=UTHOC}k>
zoUm#VqasM(+RY{~q34^gh=7Flp3rC7d3SRCDRB;1NKEEEY0L!lTm30nu!~N5Bk|6j
z^he^^o^pWb2CJNR$_0yAGLz*`izBHDKOKm~J9*k0LyzehBP2UI&e$RGo}Y07@wCsX
F0|4mvyS4xT

diff --git a/docs/javascript.html b/docs/javascript.html
index 97dfc54a22..395394d027 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 815aa7f033..c24626f8a3 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>