diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index ec52365c..d7e77f2c 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -8,11 +8,11 @@
 * Mailing list: http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss
 * Original developer: bsag (http://www.rousette.org.uk/)
 * Contributors: http://getontracks.org/wiki/Tracks/Contributing/Contributors
-* Version: 1.7
+* Version: 1.7RC2
 * Copyright: (cc) 2004-2008 rousette.org.uk.
 * License:  GNU GPL
 
-== Version 1.7RC
+== Version 1.7RC2
 
 New features:
 1. Recurring todos
@@ -25,9 +25,11 @@ New features:
 8. Support for OpenSearch. This means you can add a Tracks as a search provider in your webbrowser (tested on FF3 and IE7)
 
 Under the hood:
-1. Started to move selenium tests to RSpec 
-2. Upgrade to Rails 2.2.2
-2. Bugfixes, including fixing OpenID
+1. We now allow users again to stay logged in on two devices at the same time
+2. Started to move selenium tests to RSpec
+3. Upgrade to Rails 2.2.2
+4. Move site specific configuration out of environment.rb for easier updating
+5. Bugfixes, including fixing OpenID
 
 == Version 1.6
 1. upgrade to rails 2.0.2
diff --git a/doc/README_DEVELOPERS b/doc/README_DEVELOPERS
index 5a1306c3..1c5bd72b 100644
--- a/doc/README_DEVELOPERS
+++ b/doc/README_DEVELOPERS
@@ -1,6 +1,6 @@
 1. Wiki
 
-There are some pointers for setting up your Tracks copy for testing at http://www.rousette.org.uk/projects/wiki/Testing/
+There are some pointers for setting up your Tracks copy for testing at http://www.getontracks.org/wiki/Testing/
 
 2. SQLITE3 FOR TESTING
 
diff --git a/doc/manual b/doc/manual
index d3746adc..b2fcae53 160000
--- a/doc/manual
+++ b/doc/manual
@@ -1 +1 @@
-Subproject commit d3746adc39333f056f14969d40aa1f0072eb4eed
+Subproject commit b2fcae5326ff89f2ab5a5a8e5d55b41fd2787e51