Mercurial > hg > soundsoftware-site

diff doc/UPGRADING @ 246:eeebe205a056 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merge from default branch, bringing us up to SVN trunk rev 4993
author Chris Cannam
date Thu, 03 Mar 2011 12:02:03 +0000
parents 0579821a129a
children cbce1fd3b1b7
line wrap: on
line diff
--- a/doc/UPGRADING	Thu Jan 20 09:59:02 2011 +0000
+++ b/doc/UPGRADING	Thu Mar 03 12:02:03 2011 +0000
@@ -10,8 +10,10 @@
 1. Uncompress the program archive in a new directory
 
 2. Copy your database settings (RAILS_ROOT/config/database.yml)
-   and SMTP settings (RAILS_ROOT/config/email.yml) into the new
-   config directory
+   and your configuration file (RAILS_ROOT/config/configuration.yml)
+   into the new config directory
+   Note: before Redmine 1.2, SMTP configuration was stored in
+   config/email.yml. It should now be stored in config/configuration.yml. 
 
 3. Copy the RAILS_ROOT/files directory content into your new installation
    This directory contains all the attached files.