aboutsummaryrefslogtreecommitdiff
path: root/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-17 19:00:35 -0700
committerMark Otto <[email protected]>2013-08-17 19:00:35 -0700
commitb31ce3204dff864f3c68d6a595b0a86b17301217 (patch)
treee3d392677e995566bb2ec91cc698a920bfac17fb /javascript.html
parentc56a749323836b7e0b7401d41de1d0c68a7cb7a8 (diff)
parent0098c358c8605876a247e9a93269ef24dd145e8f (diff)
downloadbootstrap-b31ce3204dff864f3c68d6a595b0a86b17301217.tar.xz
bootstrap-b31ce3204dff864f3c68d6a595b0a86b17301217.zip
Merge branch '3.0.0-wip' into bs3_theme
Diffstat (limited to 'javascript.html')
-rw-r--r--javascript.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/javascript.html b/javascript.html
index 1d4604afc..c9228c211 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1104,7 +1104,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
<td>string | false</td>
<td>false</td>
<td>
- <p>Appends the popover to a specific element. Example: <code>container: 'body'</code>. This option is particularly useful inthat it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.</p>
+ <p>Appends the popover to a specific element. Example: <code>container: 'body'</code>. This option is particularly useful in that it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.</p>
</td>
</tr>
</tbody>