aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-27 09:42:33 -0800
committerMark Otto <[email protected]>2014-01-27 09:42:33 -0800
commit45ea456468b331f3c1fef8ec1598c723608264b4 (patch)
tree71a00500b130bd3c29c4405a0676305dd4a8ed50
parente08e871f01fd8848101e152c9afdd758280de27d (diff)
parent72a31db2100246224306ce9c6cd376de76a2b80b (diff)
downloadbootstrap-45ea456468b331f3c1fef8ec1598c723608264b4.tar.xz
bootstrap-45ea456468b331f3c1fef8ec1598c723608264b4.zip
Merge branch 'master' of github.com:twbs/bootstrap
-rw-r--r--docs/javascript.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 225f48dab..f5c8516fe 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -2034,7 +2034,7 @@ $('#myCarousel').on('slide.bs.carousel', function () {
<h1 id="affix" class="page-header">Affix <small>affix.js</small></h1>
<h2 id="affix-examples">Example</h2>
- <p>The subnavigation on the left is a live demo of the affix plugin.</p>
+ <p>The subnavigation on the right is a live demo of the affix plugin.</p>
<hr class="bs-docs-separator">