diff options
author | Jason Voegele <jason@jvoegele.com> | 2011-05-05 10:03:07 -0700 |
---|---|---|
committer | Jason Voegele <jason@jvoegele.com> | 2011-05-05 10:03:07 -0700 |
commit | f649d137c06ecac585432647a01170d85e068eb4 (patch) | |
tree | 5d984933a4dee21700601f25a9d408ac0586f723 | |
parent | 0f7827ca3489e73855f8cb9e9aa25efc1435d059 (diff) | |
parent | 210ebd362308a6964797a898fab9a5de35da1dab (diff) | |
download | rails-f649d137c06ecac585432647a01170d85e068eb4.tar.gz rails-f649d137c06ecac585432647a01170d85e068eb4.tar.bz2 rails-f649d137c06ecac585432647a01170d85e068eb4.zip |
Merge branch 'master' of github.com:lifo/docrails
-rw-r--r-- | activemodel/lib/active_model/conversion.rb | 8 | ||||
-rw-r--r-- | railties/guides/source/testing.textile | 2 |
2 files changed, 5 insertions, 5 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 diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile index efa2bbdca6..061d597ae1 100644 --- a/railties/guides/source/testing.textile +++ b/railties/guides/source/testing.textile @@ -38,7 +38,7 @@ When you do end up destroying your testing database (and it will happen, trust m h4. Rails Sets up for Testing from the Word Go -Rails creates a +test+ folder for you as soon as you create a Rails project using +rails _application_name_+. If you list the contents of this folder then you shall see: +Rails creates a +test+ folder for you as soon as you create a Rails project using +rails new _application_name_+. If you list the contents of this folder then you shall see: <shell> $ ls -F test/ |