diff options
| author | Mark Otto <[email protected]> | 2013-09-11 20:22:33 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-11 20:22:33 -0700 |
| commit | ecc6978241b86af14ea07c19b59e3c67e10fc43c (patch) | |
| tree | 3b966bfc432b9ae8719e9221324593e9edc09b20 | |
| parent | 0e54a49b9d1c1710022b639c6727017cbeb90978 (diff) | |
| parent | a1b0311597fdf79965044e6cb17c1c1acf08b1b6 (diff) | |
| download | bootstrap-ecc6978241b86af14ea07c19b59e3c67e10fc43c.tar.xz bootstrap-ecc6978241b86af14ea07c19b59e3c67e10fc43c.zip | |
Merge pull request #10590 from twbs/doc-jquery-version
document jQuery version requirement; fixes #10355
| -rw-r--r-- | getting-started.html | 2 | ||||
| -rw-r--r-- | javascript.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/getting-started.html b/getting-started.html index e116b9c3d..ddd8ebc9f 100644 --- a/getting-started.html +++ b/getting-started.html @@ -84,7 +84,7 @@ bootstrap/ <p>This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). Fonts from Glyphicons are included, as is the optional Bootstrap theme.</p> <div class="bs-callout bs-callout-danger"> <h4>jQuery required</h4> - <p>Please note that <strong>all JavaScript plugins require jQuery</strong> to be included, as shown in the <a href="#template">starter template</a>.</p> + <p>Please note that <strong>all JavaScript plugins require jQuery</strong> to be included, as shown in the <a href="#template">starter template</a>. <a href="{{ site.repo }}/blob/v{{ site.current_version }}/bower.json">Consult our <code>bower.json</code></a> to see which versions of jQuery are supported.</p> </div> </div> diff --git a/javascript.html b/javascript.html index 8305632ac..ecab0bf9e 100644 --- a/javascript.html +++ b/javascript.html @@ -24,7 +24,7 @@ base_url: "../" <div class="bs-callout bs-callout-danger"> <h4>Plugin dependencies</h4> - <p>Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that all plugins depend on jQuery (this means jQuery must be included <strong>before</strong> the plugin files).</p> + <p>Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that all plugins depend on jQuery (this means jQuery must be included <strong>before</strong> the plugin files). <a href="{{ site.repo }}/blob/v{{ site.current_version }}/bower.json">Consult our <code>bower.json</code></a> to see which versions of jQuery are supported.</p> </div> <h3 id="js-data-attrs">Data attributes</h3> |