aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-23 12:14:28 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-23 12:14:28 +0000
commite58f2675dfdc1a3e3ae6d59456ec2297996598d5 (patch)
tree7f98d71e588e5155531b2638a877545ab262a976 /activerecord/lib
parenta4a8c5e7bf5afdf4deaad1b02aa204fba8292aae (diff)
downloadrails-e58f2675dfdc1a3e3ae6d59456ec2297996598d5.tar.gz
rails-e58f2675dfdc1a3e3ae6d59456ec2297996598d5.tar.bz2
rails-e58f2675dfdc1a3e3ae6d59456ec2297996598d5.zip
Documentation fixes #694
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@753 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-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 baa3f178f3..b2c30dafb3 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -43,7 +43,7 @@ module ActiveRecord
#
# == Example
#
- # link:../examples/associations.png
+ # link:../../examples/associations.png
#
# == Is it belongs_to or has_one?
#
@@ -320,7 +320,7 @@ module ActiveRecord
# * <tt>association.create(attributes = {})</tt> - returns a new object of the associated type that has been instantiated
# with +attributes+ and linked to this object through a foreign key and that has already been saved (if it passed the validation).
#
- # Example: A Post class declares <tt>has_one :author</tt>, which will add:
+ # Example: A Post class declares <tt>belongs_to :author</tt>, which will add:
# * <tt>Post#author</tt> (similar to <tt>Author.find(author_id)</tt>)
# * <tt>Post#author=(author)</tt> (similar to <tt>post.author_id = author.id</tt>)
# * <tt>Post#author?</tt> (similar to <tt>post.author == some_author</tt>)