diff options
| author | Mark Otto <[email protected]> | 2012-02-27 21:22:20 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-27 21:22:20 -0800 |
| commit | 5cc4fcf6a2ace006b8b4023c3e75d819d611b2e1 (patch) | |
| tree | daa7f9bc48b416aefca6e4b99830475e093e0c51 /docs/javascript.html | |
| parent | 4e17b1975e1b38e3a1fe7851a0b59c645dba755f (diff) | |
| parent | be9ae7006033f2be11f3547f30425417830158ba (diff) | |
| download | bootstrap-5cc4fcf6a2ace006b8b4023c3e75d819d611b2e1.tar.xz bootstrap-5cc4fcf6a2ace006b8b4023c3e75d819d611b2e1.zip | |
Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip
Conflicts:
docs/javascript.html
docs/templates/pages/javascript.mustache
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 8f1d160ca..800f0ca7a 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1319,7 +1319,7 @@ $('#myCollapsible').on('hidden', function () { </tbody> </table> <h3>Markup</h3> - <p>Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.</p> + <p>Data attributes are used for the previous and next conrols. Check out the example markup below.</p> <pre class="prettyprint linenums"> <div id="myCarousel" class="carousel"> <!-- Carousel items --> @@ -1352,7 +1352,7 @@ $('.carousel').carousel({ <h4>.carousel('next')</h4> <p>Cycles to the next item.</p> <h3>Events</h3> - <p>Bootstrap's carousel class exposes a few events for hooking into carousel functionality.</p> + <p>Bootstrap's carousel class exposes two events for hooking into carousel functionality.</p> <table class="table table-bordered table-striped"> <thead> <tr> |