Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip

Conflicts:
	docs/javascript.html
	docs/templates/pages/javascript.mustache

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">
 &lt;div id="myCarousel" class="carousel"&gt;
   &lt;!-- Carousel items --&gt;
@@ -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>

docs/templates/pages/javascript.mustache

@@ -1243,7 +1243,7 @@ $('#myCollapsible').on('hidden', function () {
             </tbody>
           </table>
           <h3>{{_i}}Markup{{/i}}</h3>
-          <p>{{_i}}Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.{{/i}}</p>
+          <p>{{_i}}Data attributes are used for the previous and next conrols. Check out the example markup below.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;div id="myCarousel" class="carousel"&gt;
   &lt;!-- {{_i}}Carousel items{{/i}} --&gt;
@@ -1276,7 +1276,7 @@ $('.carousel').carousel({
           <h4>.carousel('next')</h4>
           <p>{{_i}}Cycles to the next item.{{/i}}</p>
           <h3>{{_i}}Events{{/i}}</h3>
-          <p>{{_i}}Bootstrap's carousel class exposes a few events for hooking into carousel functionality.{{/i}}</p>
+          <p>{{_i}}Bootstrap's carousel class exposes two events for hooking into carousel functionality.{{/i}}</p>
           <table class="table table-bordered table-striped">
             <thead>
              <tr>