Merge branch 'master' of github.com:rails/docrails

2 files changed, 7 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/attribute_methods/serialization.rb b/activerecord/lib/active_record/attribute_methods/serialization.rb
index 5701804168..d484659190 100644
--- a/activerecord/lib/active_record/attribute_methods/serialization.rb
+++ b/activerecord/lib/active_record/attribute_methods/serialization.rb
@@ -24,6 +24,9 @@ module ActiveRecord
         # serialized object must be of that class on retrieval or
         # <tt>SerializationTypeMismatch</tt> will be raised.
         #
+        # A notable side effect of serialized attributes is that the model will
+        # be updated on every save, even if it is not dirty.
+        #
         # ==== Parameters
         #
         # * +attr_name+ - The field name that should be serialized.
diff --git a/activerecord/lib/active_record/store.rb b/activerecord/lib/active_record/store.rb
index b841b977fc..301bc503c7 100644
--- a/activerecord/lib/active_record/store.rb
+++ b/activerecord/lib/active_record/store.rb
@@ -15,6 +15,10 @@ module ActiveRecord
   # You can set custom coder to encode/decode your serialized attributes to/from different formats.
   # JSON, YAML, Marshal are supported out of the box. Generally it can be any wrapper that provides +load+ and +dump+.
   #
+  # NOTE - If you are using special PostgreSQL columns like +hstore+ or +json+ there is no need for
+  # the serialization provieded by +store+. You can simply use +store_accessor+ instead to generate
+  # the accessor methods.
+  #
   # Examples:
   #
   #   class User < ActiveRecord::Base