diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-05-12 15:57:14 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-05-12 15:57:14 +0530 |
| commit | d8b8c0ef8717508c01ab21687666941008413906 (patch) | |
| tree | bc148d9244b01f88a8547b4581818abe4ec138a5 /activerecord/README.rdoc | |
| parent | a395c22fd3f55040c041a330c14b3676bfee29fc (diff) | |
| parent | 1a9766f1280f9550ba1de4538fccd5ad51c557ac (diff) | |
| download | rails-d8b8c0ef8717508c01ab21687666941008413906.tar.gz rails-d8b8c0ef8717508c01ab21687666941008413906.tar.bz2 rails-d8b8c0ef8717508c01ab21687666941008413906.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activesupport/lib/active_support/callbacks.rb
Diffstat (limited to 'activerecord/README.rdoc')
| -rw-r--r-- | activerecord/README.rdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/README.rdoc b/activerecord/README.rdoc index 822e460918..e04abe9b37 100644 --- a/activerecord/README.rdoc +++ b/activerecord/README.rdoc @@ -175,7 +175,7 @@ by relying on a number of conventions that make it easy for Active Record to inf complex relations and structures from a minimal amount of explicit direction. Convention over Configuration: -* No XML-files! +* No XML files! * Lots of reflection and run-time extension * Magic is not inherently a bad word |