diff options
| author | Jacob Thornton <[email protected]> | 2012-02-13 18:42:57 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-13 18:42:57 -0800 |
| commit | a8c478e05189d195d4b921c5d0eb6c601ea35711 (patch) | |
| tree | 592350f61d1a4ba91ed587ea8615b5a850ea13d7 /docs/javascript.html | |
| parent | 6e77c9d1233c1621deeaa2dd00e6eca3fd618610 (diff) | |
| parent | 64ea59234f30f51ab5497830d1825c7e043a575e (diff) | |
| download | bootstrap-a8c478e05189d195d4b921c5d0eb6c601ea35711.tar.xz bootstrap-a8c478e05189d195d4b921c5d0eb6c601ea35711.zip | |
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
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 c30282f28..4ab4f5af3 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -15,7 +15,7 @@ <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> - <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> + <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> <!-- Le fav and touch icons --> @@ -930,7 +930,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { </p> </div> <hr> - <h2>Using bootstrap-alerts.js</h2> + <h2>Using bootstrap-alert.js</h2> <p>Enable dismissal of an alert via javascript:</p> <pre class="prettyprint linenums">$(".alert").alert()</pre> <h3>Markup</h3> |