diff options
| author | Brian Fontenot <fontenotbrian@gmail.com> | 2013-06-01 00:39:15 -0500 |
|---|---|---|
| committer | Brian Fontenot <fontenotbrian@gmail.com> | 2013-06-01 00:39:15 -0500 |
| commit | 0435d0ebcc7a31d19b9b7b8eb3c5b8afd22212a1 (patch) | |
| tree | 4bbdcf2aa96e11b0f4e375eb38af43cd2eff04e3 | |
| parent | 6df9c595ad8e473d15a81a9291e891476bc833c2 (diff) | |
| parent | b9822cc354011c5c624ec5ac2db9eab2bdf5302e (diff) | |
| download | rails-0435d0ebcc7a31d19b9b7b8eb3c5b8afd22212a1.tar.gz rails-0435d0ebcc7a31d19b9b7b8eb3c5b8afd22212a1.tar.bz2 rails-0435d0ebcc7a31d19b9b7b8eb3c5b8afd22212a1.zip | |
Merge remote-tracking branch 'upstream/master'
his merge is necessary,
| -rw-r--r-- | guides/source/active_record_basics.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/active_record_basics.md b/guides/source/active_record_basics.md index fc8fac4651..42bb63700c 100644 --- a/guides/source/active_record_basics.md +++ b/guides/source/active_record_basics.md @@ -62,9 +62,9 @@ may be necessary to write a lot of configuration code. This is particularly true for ORM frameworks in general. However, if you follow the conventions adopted by 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 times then this -should be the default way. In this cases, explicit configuration would be needed -only in those cases where you can't follow the conventions for any reason. +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. ### Naming Conventions |