aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSteven Harman <steven@harmanly.com>2014-03-14 12:09:26 -0400
committerSteven Harman <steven@harmanly.com>2014-03-14 12:09:26 -0400
commitcc4c6d405df8d4339112b44670dcce1b52e93f42 (patch)
treea8a33a0f52a73893aab8c3ae3d1e1a6f95a35c10 /activerecord
parent7ea0a50126a5b8f988fcf1c3fb0c57bdb52918c7 (diff)
downloadrails-cc4c6d405df8d4339112b44670dcce1b52e93f42.tar.gz
rails-cc4c6d405df8d4339112b44670dcce1b52e93f42.tar.bz2
rails-cc4c6d405df8d4339112b44670dcce1b52e93f42.zip
Fix misspelling in references docs
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 8c005a7222..3a5b3116eb 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -168,7 +168,7 @@ module ActiveRecord
# Use to indicate that the given +table_names+ are referenced by an SQL string,
# and should therefore be JOINed in any query rather than loaded separately.
- # This method only works in conjuction with +includes+.
+ # This method only works in conjunction with +includes+.
# See #includes for more details.
#
# User.includes(:posts).where("posts.name = 'foo'")