diff doc/.svn/text-base/UPGRADING.svn-base @ 210:0579821a129a

Update to Redmine trunk rev 4802
author Chris Cannam
date Tue, 08 Feb 2011 13:51:46 +0000
parents 513646585e45
children cbce1fd3b1b7
line wrap: on
line diff
--- a/doc/.svn/text-base/UPGRADING.svn-base	Wed Jan 19 15:04:22 2011 +0000
+++ b/doc/.svn/text-base/UPGRADING.svn-base	Tue Feb 08 13:51:46 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.