diff options
author | Xavier Noria <fxn@hashref.com> | 2011-05-14 11:21:27 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-05-14 11:21:27 +0200 |
commit | d49113023676fbf0b6653730f5bde759990caede (patch) | |
tree | de8a47655ad3a1fa1e73dbc307ec9b806637b3ec /activemodel/lib/active_model | |
parent | db886c817c3620ceaa68a988947e49e5219532fd (diff) | |
parent | e5524d538c0d0f39d655a78fc45d2122c0ff2f2a (diff) | |
download | rails-d49113023676fbf0b6653730f5bde759990caede.tar.gz rails-d49113023676fbf0b6653730f5bde759990caede.tar.bz2 rails-d49113023676fbf0b6653730f5bde759990caede.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/date_helper.rb
railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r-- | activemodel/lib/active_model/conversion.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb index e3992e842a..1405b1bfe3 100644 --- a/activemodel/lib/active_model/conversion.rb +++ b/activemodel/lib/active_model/conversion.rb @@ -21,8 +21,8 @@ module ActiveModel # module Conversion # If your object is already designed to implement all of the Active Model - # you can use the default to_model implementation, which simply returns - # self. + # you can use the default <tt>:to_model</tt> implementation, which simply + # returns self. # # If your model does not act like an Active Model object, then you should # define <tt>:to_model</tt> yourself returning a proxy object that wraps @@ -35,13 +35,13 @@ module ActiveModel # if the object is persisted or not. # # Note the default implementation uses persisted? just because all objects - # in Ruby 1.8.x responds to :id. + # in Ruby 1.8.x responds to <tt>:id</tt>. def to_key persisted? ? [id] : nil end # Returns a string representing the object's key suitable for use in URLs, - # or nil if persisted? is false + # or nil if <tt>persisted?</tt> is false. def to_param persisted? ? to_key.join('-') : nil end |