aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/active_record_basics.md
diff options
context:
space:
mode:
authorThiago Pinto <tapgyn@gmail.com>2013-06-07 19:12:47 -0400
committerThiago Pinto <tapgyn@gmail.com>2013-06-07 19:12:47 -0400
commit04417f3eb5decfe2df77f227e679c8360e7e6e97 (patch)
tree4e30b618b513ae81579dca5a6e3728b069819388 /guides/source/active_record_basics.md
parent3f18fa008c352a2f3dbfcda6d5044225050b891c (diff)
parentf1d453b4fd3697c9b5bd9b130d4fd7cce6a776ad (diff)
downloadrails-04417f3eb5decfe2df77f227e679c8360e7e6e97.tar.gz
rails-04417f3eb5decfe2df77f227e679c8360e7e6e97.tar.bz2
rails-04417f3eb5decfe2df77f227e679c8360e7e6e97.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/source/active_record_basics.md')
-rw-r--r--guides/source/active_record_basics.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/active_record_basics.md b/guides/source/active_record_basics.md
index 42bb63700c..1f25c6ae95 100644
--- a/guides/source/active_record_basics.md
+++ b/guides/source/active_record_basics.md
@@ -64,7 +64,7 @@ Rails, you'll need to write very little configuration (in some case no
configuration at all) when creating Active Record models. The idea is that if
you configure your applications in the very same way most of the time then this
should be the default way. Thus, explicit configuration would be needed
-only in those cases where you can't follow the standar convention.
+only in those cases where you can't follow the standard convention.
### Naming Conventions