Merge pull request #280 from jasonkriss/typos

fix a couple minor typos
This commit is contained in:
Steve Klabnik 2013-04-18 13:50:06 -07:00
commit 9eb2e281c6
2 changed files with 2 additions and 2 deletions

View File

@ -2,7 +2,7 @@ module ActionController
# Action Controller Serialization
#
# Overrides render :json to check if the given object implements +active_model_serializer+
# as a method. If so, use the returned serializer instead of calling +to_json+ in the object.
# as a method. If so, use the returned serializer instead of calling +to_json+ on the object.
#
# This module also provides a serialization_scope method that allows you to configure the
# +serialization_scope+ of the serializer. Most apps will likely set the +serialization_scope+

View File

@ -5,7 +5,7 @@ require 'active_support/descendants_tracker'
module ActiveModel
# Active Model Array Serializer
#
# It serializes an Array, checking if each element that implements
# Serializes an Array, checking if each element implements
# the +active_model_serializer+ method.
#
# To disable serialization of root elements: