aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-04-11 12:21:58 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-04-11 12:21:58 +0200
commitcf57502b0250e5098dd26dab2718faf7fe316750 (patch)
tree697f8b4a9a453ef31a00550f363f74c53eb09f0b
parent409460e440783b315077cca1b1e435107aa270a0 (diff)
parent478a755387e0782dfadd433c3638d5d42c724c9a (diff)
downloadrails-cf57502b0250e5098dd26dab2718faf7fe316750.tar.gz
rails-cf57502b0250e5098dd26dab2718faf7fe316750.tar.bz2
rails-cf57502b0250e5098dd26dab2718faf7fe316750.zip
Merge pull request #19728 from jonatack/patch-4
[skip ci] primay_key -> primary_key
-rw-r--r--guides/source/association_basics.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/association_basics.md b/guides/source/association_basics.md
index d8dcf75740..d215d8b30f 100644
--- a/guides/source/association_basics.md
+++ b/guides/source/association_basics.md
@@ -923,7 +923,7 @@ For example, given we have a `users` table with `guid` as the primary key. If we
```ruby
class User < ActiveRecord::Base
- self.primay_key = 'guid' # primary key is guid and not id
+ self.primary_key = 'guid' # primary key is guid and not id
end
class Todo < ActiveRecord::Base