From c2a4ebb98b988b2771012e4af4096b478cefe11a Mon Sep 17 00:00:00 2001
From: "Shawna C. Scott" <shawnatyger@gmail.com>
Date: Thu, 19 Feb 2015 16:04:41 -0800
Subject: Include Javascript require caveat in README per #829

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 27c6353..4c42481 100644
--- 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`:
-- 
cgit v1.2.3