aboutsummaryrefslogtreecommitdiff
path: root/docs/templates/pages/javascript.mustache
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-31 13:23:29 -0800
committerJacob Thornton <[email protected]>2012-01-31 13:23:29 -0800
commitb9de88890e3db18b48ef10cd5a718002cb5dc4a0 (patch)
tree852e83d716eb715edb6cdc44ea24ab9bb6dca294 /docs/templates/pages/javascript.mustache
parent0bfbe5058d61ae93d82b09f1dff7eb30dc22426e (diff)
parentcfc1c8a8cd69e86dc70a48766cd7cd318537dee3 (diff)
downloadbootstrap-b9de88890e3db18b48ef10cd5a718002cb5dc4a0.tar.xz
bootstrap-b9de88890e3db18b48ef10cd5a718002cb5dc4a0.zip
Merge branch '2.0-wip'
Conflicts: docs/assets/bootstrap.zip
Diffstat (limited to 'docs/templates/pages/javascript.mustache')
-rw-r--r--docs/templates/pages/javascript.mustache2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 8841b1f7b..f2bbf0216 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1212,7 +1212,7 @@ $('#myCollapsible').on('hidden', function () {
<td>{{_i}}interval{{/i}}</td>
<td>{{_i}}number{{/i}}</td>
<td>5000</td>
- <td>{{_i}}The amount of type to delay between automatically cycling an item.{{/i}}</td>
+ <td>{{_i}}The amount of time to delay between automatically cycling an item.{{/i}}</td>
</tr>
</tbody>
</table>