Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v
diff -u -r1.17 -r1.18
--- lams_common/db/sql/insert_lams_unix_config_data.sql	9 Dec 2007 23:24:29 -0000	1.17
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	17 Dec 2007 04:52:37 -0000	1.18
@@ -5,7 +5,7 @@
 values ('ServerURLContextPath','lams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('Version','2.0.4 DEV', 'config.version', 'config.header.system', 'STRING', 1);
+values ('Version','2.1 Beta', 'config.version', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('TempDir','/var/opt/lams/temp', 'config.temp.dir', 'config.header.system', 'STRING', 1);
@@ -50,16 +50,16 @@
 values ('AuthoringActivitiesColour', 'true', 'config.authoring.activities.colour', 'config.header.look.feel', 'BOOLEAN', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('AuthoringClientVersion','2.0.4.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1);
+values ('AuthoringClientVersion','2.0.99.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('MonitorClientVersion','2.0.4.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1);
+values ('MonitorClientVersion','2.0.99.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('LearnerClientVersion','2.0.4.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1);
+values ('LearnerClientVersion','2.0.99.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('ServerVersionNumber','2.0.4.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1);
+values ('ServerVersionNumber','2.0.99.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('ServerLanguage','en_AU', 'config.server.language', 'config.header.look.feel', 'STRING', 1);
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v
diff -u -r1.13 -r1.14
--- lams_common/db/sql/insert_lams_windows_config_data.sql	9 Dec 2007 23:24:29 -0000	1.13
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	17 Dec 2007 04:52:37 -0000	1.14
@@ -5,7 +5,7 @@
 values ('ServerURLContextPath','lams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('Version','2.0.4', 'config.version', 'config.header.system', 'STRING', 1);
+values ('Version','2.1 Beta', 'config.version', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('TempDir','C:/lams/temp', 'config.temp.dir', 'config.header.system', 'STRING', 1);
@@ -50,16 +50,16 @@
 values ('AuthoringActivitiesColour', 'true', 'config.authoring.activities.colour', 'config.header.look.feel', 'BOOLEAN', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('AuthoringClientVersion','2.0.4.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1);
+values ('AuthoringClientVersion','2.0.99.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('MonitorClientVersion','2.0.4.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1);
+values ('MonitorClientVersion','2.0.99.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('LearnerClientVersion','2.0.4.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1);
+values ('LearnerClientVersion','2.0.99.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('ServerVersionNumber','2.0.4.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1);
+values ('ServerVersionNumber','2.0.99.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('ServerLanguage','en_AU', 'config.server.language', 'config.header.look.feel', 'STRING', 1);
Index: lams_www/conf/lams/news.html
===================================================================
RCS file: /usr/local/cvsroot/lams_www/conf/lams/news.html,v
diff -u -r1.4 -r1.5
--- lams_www/conf/lams/news.html	22 Jun 2007 03:12:51 -0000	1.4
+++ lams_www/conf/lams/news.html	17 Dec 2007 04:59:04 -0000	1.5
@@ -1,9 +1,16 @@
 <h2>Latest News &amp; Updates</h2>
   <ul>
   	<li>
-	  	<h3>Welcome to LAMS 2.0.4!</h3> 
-	 	  <p> <a href="http://bugs.lamsfoundation.org/secure/ReleaseNote.jspa?projectId=10020&styleName=Html&version=10061" title="LAMS 2.0.4 Release Notes" target="_new">LAMS 2.0.4</a> is a new release with bug fixes, improvements and key new feature: <a href="http://www.lamscommunity.org/dotlrn/clubs/technicalcommunity/forums/message-view?message_id=416657" target="_new" title="Live Edit">Live Edit</a>, which allows teachers to modify a lesson on-the-fly directly in Monitor.<br/>
+	  	<h3>Welcome to LAMS 2.1 Beta!</h3> 
+	  		<P>This is a pre-release version of LAMS 2.1, designed give you a chance to play with Branching and give us your 
+	  		feedback on how it works, what you like and don’t like, etc. We are still developing this release so there are bugs.<BR/>
 
+			Other changes that will be in LAMS 2.1 are: allowing you to edit an activity even after the learners have started it, 
+			the ability to name your groups in authoring, the ability to rearrange the lessons on the main page and indicators on 
+			the main page to show if you have completed a lesson or if a lesson is disabled.
+			For a full list of all the items changed in this release (and the outstanding issues) see our 
+			<a href="http://bugs.lamsfoundation.org/secure/ReleaseNote.jspa?version=10013&styleName=Html&projectId=10020" title="LAMS 2.1 Fixes and Outstanding Issues" target="_new">Issues Tracker</a>.<BR/>
+	  	
            If you want to learn more about <a href="http://wiki.lamsfoundation.org/display/lamsdocs" target="_new" title="LAMS Documentation">LAMS</a>, join the <a href="http://lamscommunity.org" title="LAMS Community" target="_new">LAMS Community</a> where teachers and developers share their experiences and ideas on the usage of LAMS.<br/>
 
 		   Found a bug or wanted to share new features? <a href="http://lamscommunity.org/dotlrn/clubs/technicalcommunity/forums/forum-view?forum_id=4930" target="_new">Let us know about it</a>. Also have a look at the <a href="http://wiki.lamsfoundation.org/display/lams/Roadmap" target="_new" title="LAMS Roadmap">LAMS Roadmap</a> for upcoming features.<br/>