aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormhutchin <mike@mhutchinson.com>2011-10-09 15:56:01 -0700
committermhutchin <mike@mhutchinson.com>2011-10-09 15:56:01 -0700
commit5f632a88a63142a2cd4e734b0ab7486bf34d64bf (patch)
treed65e40f334334b631324d4cb8f636d483a202201
parentc2f03d19c2c4ccb344cd2ba2c683050c3ec54b24 (diff)
downloadrails-5f632a88a63142a2cd4e734b0ab7486bf34d64bf.tar.gz
rails-5f632a88a63142a2cd4e734b0ab7486bf34d64bf.tar.bz2
rails-5f632a88a63142a2cd4e734b0ab7486bf34d64bf.zip
Minor copy editing
-rw-r--r--railties/guides/source/association_basics.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/association_basics.textile b/railties/guides/source/association_basics.textile
index 5f8997e7be..56f51e6ae7 100644
--- a/railties/guides/source/association_basics.textile
+++ b/railties/guides/source/association_basics.textile
@@ -1551,7 +1551,7 @@ The <tt><em>collection</em>.find</tt> method finds objects within the collection
:conditions => ["created_at > ?", 2.days.ago])
</ruby>
-NOTE: Starting Rails 3, supplying options to +ActiveRecord::Base.find+ method is discouraged. Use <tt><em>collection</em>.where</tt> instead when you need to pass conditions.
+NOTE: Beginning with Rails 3, supplying options to the +ActiveRecord::Base.find+ method is discouraged. Use <tt><em>collection</em>.where</tt> instead when you need to pass conditions.
h6(#has_and_belongs_to_many-collection-where). <tt><em>collection</em>.where(...)</tt>