aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-11-30 22:05:49 -0800
committerJacob Thornton <[email protected]>2011-11-30 22:05:49 -0800
commitb1cba98aab5ee2d0576bbbbb92ba3488516290eb (patch)
treecb938e0ba8f666ffbd8e6436b8e3b4fb1490adc4 /docs/javascript.html
parentdc628c9115b74e49940c0cc200a8914232c9d2a2 (diff)
parentbc51c15709469fd0c2e78886a15e849626a8f191 (diff)
downloadbootstrap-b1cba98aab5ee2d0576bbbbb92ba3488516290eb.tar.xz
bootstrap-b1cba98aab5ee2d0576bbbbb92ba3488516290eb.zip
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts: bootstrap.css
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 2db37a9fe..09cdc714c 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -83,7 +83,7 @@
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Javascript for Bootstrap</h1>
- <p class="lead">Bring Bootstrap's components to life with custom plugins for <a href="http://jquery.com/" target="_blank">jQuery</a> and <a href="http://ender.no.de" target="_blank">Ender</a></p>
+ <p class="lead">Bring Bootstrap's components to life with flexible, custom javascript plugins for many of our custom components that work with <a href="http://jquery.com/" target="_blank">jQuery</a> and <a href="http://ender.no.de" target="_blank">Ender</a>.</p>
</header>