aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2014-10-05 14:01:43 +0100
committerAbdelkader Boudih <terminale@gmail.com>2014-10-05 14:01:43 +0100
commit85c3d5b230b68eee1f598ae48867c4e1d9ec49ba (patch)
tree1c6c7702441c83793264e9ec451dd8b9e9a59863 /guides
parentb56d3adf9b221ba35f18ed5be1e9fc251123e5a0 (diff)
parent391f5dc1767d15f44b33be252325b657e0e8ce7e (diff)
downloadrails-85c3d5b230b68eee1f598ae48867c4e1d9ec49ba.tar.gz
rails-85c3d5b230b68eee1f598ae48867c4e1d9ec49ba.tar.bz2
rails-85c3d5b230b68eee1f598ae48867c4e1d9ec49ba.zip
Merge pull request #17183 from prathamesh-sonpatki/fix-typo-in-am-guide
Fix typo in Active Model guide
Diffstat (limited to 'guides')
-rw-r--r--guides/source/active_model_basics.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/active_model_basics.md b/guides/source/active_model_basics.md
index ccbb0d7489..a520b91a4d 100644
--- a/guides/source/active_model_basics.md
+++ b/guides/source/active_model_basics.md
@@ -266,7 +266,7 @@ end
When including `ActiveModel::Model` you get some features like:
-- model name instrospection
+- model name introspection
- conversions
- translations
- validations
@@ -511,7 +511,7 @@ features out of the box.
`ActiveModel::SecurePassword` provides a way to securely store any
password in an encrypted form. On including this module, a
-`has_secure_password` class method is provided which defines
+`has_secure_password` class method is provided which defines
an accessor named `password` with certain validations on it.
#### Requirements