diff options
| author | Mark Otto <[email protected]> | 2013-07-26 22:18:16 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-26 22:18:16 -0700 |
| commit | 88dd20e6ac7df964837960fe6b7df68b698d3644 (patch) | |
| tree | de8835d04cdb48967356c18365b258a32cd1aba7 /javascript.html | |
| parent | bed8e959b3abe67ac6128ca74625839b991be3b2 (diff) | |
| parent | 2cf1851d9f9ea73a9c2e446db88f5c2179ea2f40 (diff) | |
| download | bootstrap-88dd20e6ac7df964837960fe6b7df68b698d3644.tar.xz bootstrap-88dd20e6ac7df964837960fe6b7df68b698d3644.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'javascript.html')
| -rw-r--r-- | javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/javascript.html b/javascript.html index 069e9cbd3..c513e353d 100644 --- a/javascript.html +++ b/javascript.html @@ -14,7 +14,7 @@ lead: "Bring Bootstrap's components to life with over a dozen custom jQuery plug </div> <h3 id="js-individual-compiled">Individual or compiled</h3> - <p>Plugins can be included individually (using <code>bootstrap-*.js</code> original files, or all at once (using <code>bootstrap.js</code> or the minified <code>bootstrap.min.js</code>.</p> + <p>Plugins can be included individually (using bootstrap's individual <code>*.js</code> files, or all at once (using <code>bootstrap.js</code> or the minified <code>bootstrap.min.js</code>.</p> <div class="bs-callout bs-callout-danger"> <h4>Do not attempt to include both.</h4> |