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

Conflicts:
	guides/source/getting_started.md

2 files changed, 1 insertions, 19 deletions

diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
index 3262bf61ac..3cc2d9ad8e 100644
--- a/activemodel/README.rdoc
+++ b/activemodel/README.rdoc
@@ -133,24 +133,6 @@ behavior out of the box:
 
   {Learn more}[link:classes/ActiveModel/Naming.html]
 
-* Observer support
-
-  ActiveModel::Observers allows your object to implement the Observer
-  pattern in a Rails App and take advantage of all the standard observer
-  functions.
-
-    class PersonObserver < ActiveModel::Observer
-      def after_create(person)
-        person.logger.info("New person added!")
-      end
-
-      def after_destroy(person)
-        person.logger.warn("Person with an id of #{person.id} was destroyed!")
-      end
-    end
-
-  {Learn more}[link:classes/ActiveModel/Observer.html]
-
 * Making objects serializable
 
   ActiveModel::Serialization provides a standard interface for your object
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index db5759ada9..6d11c0fbdc 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -436,7 +436,7 @@ module ActiveModel
     # attribute_missing is like method_missing, but for attributes. When method_missing is
     # called we check to see if there is a matching attribute method. If so, we call
     # attribute_missing to dispatch the attribute. This method can be overloaded to
-    # customise the behaviour.
+    # customize the behavior.
     def attribute_missing(match, *args, &block)
       __send__(match.target, match.attr_name, *args, &block)
     end