aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2007-01-23 05:10:21 +0000
committerRick Olson <technoweenie@gmail.com>2007-01-23 05:10:21 +0000
commit8296c680d5f026b755ae1555933474d4be8c3377 (patch)
tree4c5bb68b4c79d8b4a38bec6e03f2fb05fc21e1f4 /activerecord/lib/active_record/associations.rb
parentbc97a871387650fc3daac6fd8f9e92cbe70168db (diff)
downloadrails-8296c680d5f026b755ae1555933474d4be8c3377.tar.gz
rails-8296c680d5f026b755ae1555933474d4be8c3377.tar.bz2
rails-8296c680d5f026b755ae1555933474d4be8c3377.zip
Remove useless code in #attribute_present? since 0 != blank?. Closes #7249 [Josh Susser]. Fix minor doc typos. Closes #7157 [Josh Susser]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6018 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rwxr-xr-xactiverecord/lib/active_record/associations.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index bd84bc8247..fc43dabbfa 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -98,7 +98,7 @@ module ActiveRecord
# ActiveRecord associations can be used to describe relations with one-to-one, one-to-many
# and many-to-many cardinality. Each model uses an association to describe its role in
# the relation. In each case, the belongs_to association is used in the model that has
- # the foreign key
+ # the foreign key.
#
# === One-to-one
#
@@ -119,7 +119,7 @@ module ActiveRecord
# has_many :employees
# end
# class Employee < ActiveRecord::Base
- # belongs_to :manager # foreign key - employee_id
+ # belongs_to :manager # foreign key - manager_id
# end
#
# === Many-to-many