1 files changed, 16 insertions, 4 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index e53d688ad9..11fd0e7047 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,17 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   It's not possible anymore to destroy a model marked as read only.
+
+    *Johannes Barre*
+
+
+*   Added ability to ActiveRecord::Relation#from to accept other ActiveRecord::Relation objects
+
+      Record.from(subquery)
+      Record.from(subquery, :a)
+
+    *Radoslav Stankov*
+
 *   Added custom coders support for ActiveRecord::Store. Now you can set
     your custom coder like this:
 
@@ -633,7 +645,7 @@
           has_one :account
         end
 
-        user.build_account{ |a| a.credit_limit => 100.0 }
+        user.build_account{ |a| a.credit_limit = 100.0 }
 
     The block is called after the instance has been initialized. *Andrew White*
 
@@ -4006,7 +4018,7 @@
 
 *   Fixed that adding a record to a has_and_belongs_to collection would always save it -- now it only saves if its a new record #1203 *Alisdair McDiarmid*
 
-*   Fixed saving of in-memory association structures to happen as a after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
+*   Fixed saving of in-memory association structures to happen as an after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
 
 *   Allow any Enumerable, not just Array, to work as bind variables #1344 *Jeremy Kemper*
 
@@ -5519,7 +5531,7 @@
 
 *   Fixed that adding a record to a has_and_belongs_to collection would always save it -- now it only saves if its a new record #1203 *Alisdair McDiarmid*
 
-*   Fixed saving of in-memory association structures to happen as a after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
+*   Fixed saving of in-memory association structures to happen as an after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
 
 *   Allow any Enumerable, not just Array, to work as bind variables #1344 *Jeremy Kemper*
 
@@ -6441,7 +6453,7 @@
         post.categories.push_with_attributes(category, :added_on => Date.today)
         post.categories.first.added_on # => Date.today
 
-    NOTE: The categories table doesn't have a added_on column, it's the categories_post join table that does!
+    NOTE: The categories table doesn't have an added_on column, it's the categories_post join table that does!
 
 *   Fixed that :exclusively_dependent and :dependent can't be activated at the same time on has_many associations *Jeremy Kemper*