Updates for 2.0.0 release.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9696 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 0984f3b8c0991bcdd2a92bb7302be858161bd881..e72a704b2121c6167e30a0a5b59240f0edd846d4 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,13 @@ Redmine - project management software
 Copyright (C) 2006-2012  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2012-05-15 v2.0.0
+
+* Feature #4796: Rails 3 support
+* Feature #7720: Limit the pagination-limit when max-results is fewer than max-pagination-limit
+* Feature #9034: Add an id to the flash messages
+* Patch #10782: Better translation for Estonian language
+
 == 2012-05-13 v1.4.2
 
 * Defect #10744: rake task redmine:email:test broken

diff --git a/doc/INSTALL b/doc/INSTALL
index 660d94de782d8253d771c55dcec6cc4c26e751ec..7021dc67168c7dc78b471f185706e2f5c6a7adc8 100644 (file)
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -65,7 +65,7 @@ Optional:
 8. Test the installation by running the WEBrick web server
    
    Under the main application directory run:
-     ruby script/server -e production
+     ruby script/rails server -e production
    
    Once WEBrick has started, point your browser to http://localhost:3000/
    You should now see the application welcome page.