diff options
| author | Jaime Iniesta <jaimeiniesta@gmail.com> | 2010-07-20 14:22:30 +0200 |
|---|---|---|
| committer | Jaime Iniesta <jaimeiniesta@gmail.com> | 2010-07-20 14:22:30 +0200 |
| commit | 0f991786ee99f6793d2a9453422eeaf60f0c0464 (patch) | |
| tree | de5f9a7ace4e9af6c9f6a11ca4e96f65a4ed86ed /activemodel/lib | |
| parent | 2e4b741111b93d13b2b19537cf68645aff14c57e (diff) | |
| parent | 767de13ff4a19a53d3fe99edb5554040cb6e5e60 (diff) | |
| download | rails-0f991786ee99f6793d2a9453422eeaf60f0c0464.tar.gz rails-0f991786ee99f6793d2a9453422eeaf60f0c0464.tar.bz2 rails-0f991786ee99f6793d2a9453422eeaf60f0c0464.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/callbacks.rb | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/serializers/json.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb index e7aad17021..8c10c54b54 100644 --- a/activemodel/lib/active_model/callbacks.rb +++ b/activemodel/lib/active_model/callbacks.rb @@ -19,7 +19,7 @@ module ActiveModel # # define_model_callbacks :create, :update # - # This will provide all three standard callbacks (before, around and after) around + # This will provide all three standard callbacks (before, around and after) for # both the :create and :update methods. To implement, you need to wrap the methods # you want callbacks on in a block so that the callbacks get a chance to fire: # diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb index 918cd0ab76..500b2399a3 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -19,8 +19,8 @@ module ActiveModel # passed through +options+. # # The option <tt>ActiveModel::Base.include_root_in_json</tt> controls the - # top-level behavior of to_json. It is true by default. When it is <tt>true</tt>, - # to_json will emit a single root node named after the object's type. For example: + # top-level behavior of <tt>to_json</tt>. It is <tt>true</tt> by default. When it is <tt>true</tt>, + # <tt>to_json</tt> will emit a single root node named after the object's type. For example: # # konata = User.find(1) # konata.to_json |