Browse files

update an obsolete piece of documentation about "(master/slave)_datab…

…ase" settings in database.yml
  • Loading branch information...
1 parent 783853b commit 88dee1a93b19ff687de9f3638b7d75241bfb0e4a @mislav committed Mar 20, 2009
Showing with 7 additions and 7 deletions.
  1. +7 −7 README.markdown
@@ -30,12 +30,12 @@ First, setup your database.yml:
<<: *defaults
-To enable masochism, this is required:
+To enable masochism, this call is required:
# enable masochism
-Example usage:
+Example usage for a Rails application:
# in environment.rb
config.after_initialize do
@@ -119,13 +119,13 @@ the `setup!` call if your connection hasn't been initialized, like:
-The ActiveReload::MasterDatabase model uses a 'master\_database' setting that can either be
-defined for all of your environments, or for each environment as a nested declaration.
+The ActiveReload::MasterDatabase and ActiveReload::SlaveDatabase abstract models use the
+'master\_database' and 'slave\_database' settings, respectively.
-The ActiveReload::SlaveDatabase model uses a 'slave\_database' setting that can only be
-defined per environment.
+In 'database.yml' configuration file, both settings can be specified either per-environment or
+global (like in the first example of this document).
login: &login
adapter: postgresql

0 comments on commit 88dee1a

Please sign in to comment.