Merged r14217 (#19185).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14218 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/doc/INSTALL b/doc/INSTALL
index 2adc7364130b112b637d174de9af5770cf1b5397..cf36dd86b0deecb71c0e2200f0797d97bbf78970 100644 (file)
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -53,6 +53,9 @@ Optional:
    a secret to be generated. Under the application main directory run:
      bundle exec rake generate_secret_token
 
+   Alternatively, you can store this secret in config/secrets.yml:
+   http://guides.rubyonrails.org/upgrading_ruby_on_rails.html#config-secrets-yml
+
 6. Create the database structure
    
    Under the application main directory run:

diff --git a/doc/UPGRADING b/doc/UPGRADING
index 9bf0536d810a2cf2700b5a6c7a80af1fee275749..729b006ce41c2ce74e223aea1692739cf4311c3a 100644 (file)
--- a/doc/UPGRADING
+++ b/doc/UPGRADING
@@ -44,10 +44,16 @@ http://www.redmine.org/
 
 6. Generate a session store secret
    
-   Redmine stores session data in cookies by default, which requires
-   a secret to be generated. Under the new application directory run:
+   If you're upgrading from Redmine 2.x or below, remove the following file
+   if it exists: config/initializers/secret_token.rb
+
+   Then generate a new secret by running the following command under the
+   application directory:
      bundle exec rake generate_secret_token
-   
+
+   Alternatively, you can store this secret in config/secrets.yml:
+   http://guides.rubyonrails.org/upgrading_ruby_on_rails.html#config-secrets-yml
+
    DO NOT REPLACE OR EDIT ANY OTHER FILES.
 
 7. Migrate your database