Browse files

Merge remote-tracking branch 'upstream/master'

his merge is necessary,
  • Loading branch information...
2 parents 6df9c59 + b9822cc commit 0435d0ebcc7a31d19b9b7b8eb3c5b8afd22212a1 @fontno fontno committed Jun 1, 2013
Showing with 3 additions and 3 deletions.
  1. +3 −3 guides/source/active_record_basics.md
View
6 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

0 comments on commit 0435d0e

Please sign in to comment.