diff doc/INSTALL @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/doc/INSTALL	Thu Jun 09 16:51:06 2011 +0100
+++ b/doc/INSTALL	Thu Jul 14 10:43:07 2011 +0100
@@ -1,7 +1,7 @@
 == Redmine installation
 
 Redmine - project management software
-Copyright (C) 2006-2010  Jean-Philippe Lang
+Copyright (C) 2006-2011  Jean-Philippe Lang
 http://www.redmine.org/
 
 
@@ -9,19 +9,21 @@
 
 * Ruby 1.8.6 or 1.8.7
 
-* Ruby on Rails 2.3.5 (official downloadable Redmine releases are packaged with
+* RubyGems 1.3.7
+
+* Ruby on Rails 2.3.11 (official downloadable Redmine releases are packaged with
   the appropriate Rails version)
 
-* Rack 1.0.1
+* Rack 1.1.0 gem
 
-* RubyGems 1.3.1
+* Rake 0.8.3 gem
 
-* Rake 0.8.3
+* I18n 0.4.2 gem
 
 * A database:
-  * MySQL (tested with MySQL 5)
-  * PostgreSQL (tested with PostgreSQL 8.1)
-  * SQLite (tested with SQLite 3)
+  * MySQL (tested with MySQL 5.1)
+  * PostgreSQL (tested with PostgreSQL 8.4)
+  * SQLite3 (tested with SQLite 3.6)
 
 Optional:
 * SCM binaries (e.g. svn), for repository browsing (must be available in PATH)
@@ -78,8 +80,8 @@
 
 == 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.