summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGELOG7
-rw-r--r--doc/INSTALL2
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 0984f3b8c..e72a704b2 100644
--- 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 660d94de7..7021dc671 100644
--- 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.