Merged r3448 and r3455 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3460 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/email.yml.example b/config/email.yml.example
index 2b6150688b9707b280f5eda0894713a6b2084986..884a5f298ecdb6a20cb15ca1059184e5019e43ef 100644 (file)
--- a/config/email.yml.example
+++ b/config/email.yml.example
@@ -1,4 +1,70 @@
-# Outgoing email settings
+# = Outgoing email settings
+#
+# Each environment has it's own configuration options.  If you are only
+# running in production, only the production block needs to be configured.
+#
+# == Common configurations
+#
+# === Sendmail command
+#
+# production:
+#   delivery_method: :sendmail
+#
+# === Simple SMTP server at localhost
+#
+# production:
+#   delivery_method: :smtp
+#   smtp_settings:
+#     address: "localhost"
+#     port: 25
+#
+# === SMTP server at example.com using LOGIN authentication and checking HELO for foo.com
+#
+# production:
+#   delivery_method: :smtp
+#   smtp_settings:
+#     address: "example.com"
+#     port: 25
+#     authentication: :login
+#     domain: 'foo.com'
+#     user_name: 'myaccount'
+#     password: 'password'
+#
+# === SMTP server at example.com using PLAIN authentication
+#
+# production:
+#   delivery_method: :smtp
+#   smtp_settings:
+#     address: "example.com"
+#     port: 25
+#     authentication: :plain
+#     domain: 'example.com'
+#     user_name: 'myaccount'
+#     password: 'password'
+#
+# === SMTP server at using TLS (GMail)
+#
+# This requires some additional configuration.  See the article at:
+# http://redmineblog.com/articles/setup-redmine-to-send-email-using-gmail/
+#
+# production:
+#   delivery_method: :smtp
+#   smtp_settings:
+#     tls: true
+#     address: "smtp.gmail.com"
+#     port: 587
+#     domain: "smtp.gmail.com" # 'your.domain.com' for GoogleApps
+#     authentication: :plain
+#     user_name: "your_email@gmail.com"
+#     password: "your_password"
+#
+#
+# == More configuration options
+#
+# See the "Configuration options" at the following website for a list of the
+# full options allowed:
+#
+# http://wiki.rubyonrails.org/rails/pages/HowToSendEmailsWithActionMailer
 
 production:
   delivery_method: :smtp

diff --git a/doc/INSTALL b/doc/INSTALL
index 1f3104644b93208be930ae0d3884dba743514fc1..eb7669c606124449c0b400a6e6b3c77c6a9d10fe 100644 (file)
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -30,15 +30,15 @@ Optional:
 3. Configure database parameters in config/database.yml
    for "production" environment (default database is MySQL)
 
-4. Create the database structure. Under the application main directory:
-   rake db:migrate RAILS_ENV="production"
-   It will create tables and an administrator account.
-   
-5. Generate a session store secret
+4. Generate a session store secret
    Redmine stores session data in cookies by default, which requires
    a secret to be generated. Run:
    rake config/initializers/session_store.rb
-
+   
+5. Create the database structure. Under the application main directory:
+   rake db:migrate RAILS_ENV="production"
+   It will create tables and an administrator account.
+   
 6. Setting up permissions
    The user who runs Redmine must have write permission on the following
    subdirectories: files, log, tmp (create the last one if not present).

diff --git a/doc/UPGRADING b/doc/UPGRADING
index 7413c4e52fbe5759803701bfd67c172c40a85a25..fe69676a23a5eb214994bf0b639de595bd4ca47e 100644 (file)
--- a/doc/UPGRADING
+++ b/doc/UPGRADING
@@ -13,17 +13,17 @@ http://www.redmine.org/
    and SMTP settings (RAILS_ROOT/config/email.yml)
    into the new config directory
    DO NOT REPLACE ANY OTHERS FILES.
-   
-3. Migrate your database (please make a backup before doing this):
-   rake db:migrate RAILS_ENV="production"
-
-4. Copy the RAILS_ROOT/files directory content into your new installation
-   This directory contains all the attached files
 
-5. Generate a session store secret
+3. Generate a session store secret
    Redmine stores session data in cookies by default, which requires
    a secret to be generated. Run:
    rake config/initializers/session_store.rb
+      
+4. Migrate your database (please make a backup before doing this):
+   rake db:migrate RAILS_ENV="production"
+
+5. Copy the RAILS_ROOT/files directory content into your new installation
+   This directory contains all the attached files
 
 == Notes