aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-03 13:20:06 -0700
committerMark Otto <[email protected]>2012-11-03 13:20:06 -0700
commit72e2d4bb771c40c7bac7beb1fd71c6c703e0f9f8 (patch)
tree411bd99cb2144e73f37682503538a8f41d988f0a /docs/javascript.html
parent2f39f86bd78457fd010d91c94604d271ce674892 (diff)
parent46b5e0cbc6cc82cfcfef45c0eb69a0daac8ceb3c (diff)
downloadbootstrap-72e2d4bb771c40c7bac7beb1fd71c6c703e0f9f8.tar.xz
bootstrap-72e2d4bb771c40c7bac7beb1fd71c6c703e0f9f8.zip
Merge pull request #5766 from bradly/spelling-fixes-in-docs
Fixing various spelling typos in the docs.
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 2a3836289..4418e89be 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -136,7 +136,7 @@ $("#myModal").modal('show') // initializes and invokes show immed
<h3>Events</h3>
<p>Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.</p>
- <p>All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.</p>
+ <p>All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.</p>
<pre class="prettyprint linenums">
$('#myModal').on('show', function (e) {
if (!data) return e.preventDefault() // stops modal from being shown
@@ -507,7 +507,7 @@ $('#myModal').on('hidden', function () {
<h3>Methods</h3>
<h4>$().dropdown('toggle')</h4>
- <p>A programatic api for toggling menus for a given navbar or tabbed navigation.</p>
+ <p>A programmatic api for toggling menus for a given navbar or tabbed navigation.</p>
</section>
@@ -636,7 +636,7 @@ $('[data-spy="scroll"]').each(function () {
<h2>Example tabs</h2>
- <p>Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.</p>
+ <p>Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.</p>
<div class="bs-docs-example">
<ul id="myTab" class="nav nav-tabs">
<li class="active"><a href="#home" data-toggle="tab">Home</a></li>