From 2084204d15de5e81cc2f44f3590449d81fe35f3a Mon Sep 17 00:00:00 2001
From: nathanvda <nathan@dixis.com>
Date: Sun, 24 Jul 2011 00:57:57 +0200
Subject: [PATCH] Adapted history and readme accordingly.

---
 History.md      | 6 ++++++
 README.markdown | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 9d7e02a..1e28f01 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,11 @@
 # Change History / Release Notes
 
+## Version 1.0.9
+
+* is now rails 3.1 compatible. If you are not using Rails 3.1 yet, this should have no effect.
+  For rails 3.1 the cocoon.js no longer needs to be installed using the `rails g cocoon:install`. It is
+  automatically used from the gem.
+
 ## Version 1.0.8
 
 * Loosened the gem dependencies.
diff --git a/README.markdown b/README.markdown
index db145bc..b0b249c 100644
--- a/README.markdown
+++ b/README.markdown
@@ -24,7 +24,7 @@ Inside your `Gemfile` add the following:
 
     gem "cocoon"
 
-Run the installation task:
+If you are using Rails 3.0.x, you need to run the installation task (since rails 3.1 this is no longer needed):
 
     rails g cocoon:install