Merge pull request twbs#854 from shawnacscott/readme-js-info

Include Javascript require caveat in README per twbs#829
andybenedict · Feb 20, 2015 · d1dd1fb · d1dd1fb
2 parents 1d35526 + c2a4ebb
commit d1dd1fb
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -51,6 +51,11 @@ Require Bootstrap Javascripts in `app/assets/javascripts/application.js`:
 //= require bootstrap-sprockets
 ```
 
+`bootstrap-sprockets` and `bootstrap` [should not both be included](https://github.com/twbs/bootstrap-sass/issues/829#issuecomment-75153827) in `application.js`.
+
+`bootstrap-sprockets` provides individual Bootstrap Javascript files (`alert.js` or `dropdown.js`, for example), while
+`bootstrap` provides a concatenated file containing all Bootstrap Javascripts.
+
 #### Bower with Rails
 
 When using [bootstrap-sass Bower package](#c-bower) instead of the gem in Rails, configure assets in `config/application.rb`: