comparison doc/UPGRADING @ 524:1248a47e81b3 feature_36

Merge from branch "luisf"

 == Redmine upgrade
 
 Redmine - project management software
-Copyright (C) 2006-2010  Jean-Philippe Lang
+Copyright (C) 2006-2011  Jean-Philippe Lang
 http://www.redmine.org/
 
 
 == Upgrading
 
 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.
 
 4. Copy the folders of the installed plugins and themes into new installation

    
    DO NOT REPLACE OR EDIT ANY OTHER FILES.
 
 6. Migrate your database
 
-   If you are upgrading to Rails 2.3.5 as part of this migration, you
+   If you are upgrading to Rails 2.3.11 as part of this migration, you
    need to upgrade the plugin migrations before running the plugin migrations
    using:
      rake db:migrate:upgrade_plugin_migrations RAILS_ENV="production"
    
    Please make a backup before doing this! Under the new application

 9. Finally go to "Administration -> Roles & permissions" to check/set permissions
    for new features, if any
 
 == Notes
 
-* Rails 2.3.5 is required for versions 0.9.x and 1.0.x.
+* Rails 2.3.11 is required for versions 1.2.x.
 
 == References
 
 * http://www.redmine.org/wiki/redmine/RedmineUpgrade