diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-28 14:18:47 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-28 14:18:47 +0000 |
| commit | e3b49c052b497827c9f058feaa066bbfe184f4da (patch) | |
| tree | 4224be14c405d38f7a8911f52360bdd0150673ce /activerecord/lib/active_record/associations.rb | |
| parent | 7cb1f93bcccb2fe476c85e4df71eea06db9a3a5b (diff) | |
| download | rails-e3b49c052b497827c9f058feaa066bbfe184f4da.tar.gz rails-e3b49c052b497827c9f058feaa066bbfe184f4da.tar.bz2 rails-e3b49c052b497827c9f058feaa066bbfe184f4da.zip | |
Fixed spelling errors (closes #9706) [tarmo/rmm5t]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7666 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index cb821ba7f0..e269775fd5 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -716,7 +716,7 @@ module ActiveRecord # # Option examples: # has_one :credit_card, :dependent => :destroy # destroys the associated credit card - # has_one :credit_card, :dependent => :nullify # updates the associated records foriegn key value to null rather than destroying it + # has_one :credit_card, :dependent => :nullify # updates the associated records foreign key value to null rather than destroying it # has_one :last_comment, :class_name => "Comment", :order => "posted_on" # has_one :project_manager, :class_name => "Person", :conditions => "role = 'project_manager'" # has_one :attachment, :as => :attachable @@ -857,7 +857,7 @@ module ActiveRecord # # Deprecated: Any additional fields added to the join table will be placed as attributes when pulling records out through # +has_and_belongs_to_many+ associations. Records returned from join tables with additional attributes will be marked as - # +ReadOnly+ (because we can't save changes to the additional attrbutes). It's strongly recommended that you upgrade any + # +ReadOnly+ (because we can't save changes to the additional attributes). It's strongly recommended that you upgrade any # associations with attributes to a real join model (see introduction). # # Adds the following methods for retrieval and query: |