Index: src/webapp/WEB-INF/conf/jetspeed.properties
===================================================================
--- src/webapp/WEB-INF/conf/jetspeed.properties	(revision 383869)
+++ src/webapp/WEB-INF/conf/jetspeed.properties	(working copy)
@@ -21,13 +21,13 @@
 # ------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------
-# override for jetspeed.properties.  This include needs to be come before
+# Overrides the properties in this file. This include needs to come before
 # any other prop definitions.
 #-------------------------------------------------------------------------
 include=override.properties
 
 portal.name = Jetspeed
-portal.version = 2.0
+portal.version = 2.1-SNAPSHOT
 
 # By setting this to true, the Engine will create its own
 # JNDI context.  Not needed in deployment.  We use Tomcat's JNDI
@@ -60,7 +60,6 @@
 # -------------------------------------------------------------------
 #  Security Information
 # -------------------------------------------------------------------
-
 # if no user has been setup, default.user.principal will be
 # automatically added via HttpRequestContext.setUserPrincpal()
 default.user.principal=guest
@@ -77,17 +76,14 @@
 container.impl = org.apache.pluto.PortletContainerImpl
 container.wrapper = org.apache.jetspeed.container.JetspeedPortletContainerWrapper
 
-
 # -------------------------------------------------------------------
 #  P I P E L I N E
 # -------------------------------------------------------------------
 pipeline.default = jetspeed-pipeline
 
-
 # -------------------------------------------------------------------
 #  F A C T O R Y
 # -------------------------------------------------------------------
-
 factory.container.response = org.apache.jetspeed.container.ContainerResponse
 factory.container.request = org.apache.jetspeed.container.ContainerRequest
 
@@ -105,7 +101,6 @@
 #--------------------------------------------------------------------
 deployment.descriptor.mapping.xml=/WEB-INF/conf/portletdefinitionmapping.xml
 
-
 #-------------------------------------------------------------------------
 # C A P A B I L I T Y,  C O N T E N T  E N C O D I N G
 #-------------------------------------------------------------------------
@@ -178,10 +173,9 @@
 #-------------------------------------------------------------------------
 # R E G I S T R A T I O N
 #-------------------------------------------------------------------------
-# PSML Folder Template to copy during new user creation and registration
+# Registration default roles assigned during registration or new user creation
 # comma separated list
 registration.roles.default = user
-
 # Registration default groups assigned during registration or new user creation
 # comma separated list    
 registration.groups.default = 
Index: docs/release/RELEASE-TODO.txt
===================================================================
--- docs/release/RELEASE-TODO.txt	(revision 383869)
+++ docs/release/RELEASE-TODO.txt	(working copy)
@@ -1,6 +1,7 @@
 0. Vote on the Final Release before doing anything !!!!!
 
-1. update project.xml and etc/project-dependencies/*.xml in all projects to 2.x
+1. update project.xml src/webapp/WEB-INF/conf/jetspeed.properties and 
+   etc/project-dependencies/*.xml in all projects to 2.x
 
 2. delete old versions of jars from shared/lib