diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-01-23 10:22:00 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-01-23 10:22:00 +0000 |
| commit | 4cefae0aaadfadae71d695b17468fca2dfe74541 (patch) | |
| tree | aeceb744a0d9c38c17f0408d953baf614497bf6a /doc | |
| parent | e173f7e72dff82dfe55656a0ea0b7cf25f0c45de (diff) | |
| download | redmine-4cefae0aaadfadae71d695b17468fca2dfe74541.tar.gz redmine-4cefae0aaadfadae71d695b17468fca2dfe74541.zip | |
Adds an application configuration file: config/configuration.yml (#7408).
Email delivery settings that were stored in config/email.yml should be moved to this new configuration file.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4752 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/INSTALL | 4 | ||||
| -rw-r--r-- | doc/UPGRADING | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/INSTALL b/doc/INSTALL index 99f862bb1..594e92e74 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -80,8 +80,8 @@ Optional: == SMTP server Configuration -Copy config/email.yml.example to config/email.yml and edit this file -to adjust your SMTP settings. +Copy config/configuration.yml.example to config/configuration.yml and +edit this file to adjust your SMTP settings. Do not forget to restart the application after any change to this file. Please do not enter your SMTP settings in environment.rb. diff --git a/doc/UPGRADING b/doc/UPGRADING index 87f169c9d..b34632055 100644 --- a/doc/UPGRADING +++ b/doc/UPGRADING @@ -10,8 +10,10 @@ http://www.redmine.org/ 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. |