diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 9fc8fd04b..a180b6621 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -4,6 +4,7 @@
 	<artifactId>org.springframework.batch.archetype</artifactId>
 	<packaging>pom</packaging>
 	<name>Archetypes</name>
+	<url>http://static.springframework.org/spring-batch/${artifactId}</url>
 	<description>
 		<![CDATA[
 	Spring Batch archetypes are simple project templates containing just enough code
@@ -19,7 +20,7 @@
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>org.springframework.batch</artifactId>
 		<version>2.0.0.CI-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<relativePath>../spring-batch-parent</relativePath>
 	</parent>
 
 	<modules>
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index cb201d82e..4a5ae4111 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -4,6 +4,7 @@
 	<artifactId>org.springframework.batch.core</artifactId>
 	<packaging>jar</packaging>
 	<name>Core</name>
+	<url>http://static.springframework.org/spring-batch/${artifactId}</url>
 	<description>
 		<!--  Use CDATA to keep it on a single line in the manifest -->
 		<![CDATA[Core domain for batch processing, expressing a domain of Jobs, Steps, Chunks, etc.]]>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 998afcc4a..f5dac8668 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -3,6 +3,7 @@
 	<artifactId>org.springframework.batch.infrastructure</artifactId>
 	<packaging>jar</packaging>
 	<name>Infrastructure</name>
+	<url>http://static.springframework.org/spring-batch/${artifactId}</url>
 	<description>
 		<!--  Use CDATA to keep it on a single line in the manifest -->
 		<![CDATA[The Spring Batch Infrastructure is a set of low-level components, interfaces and tools for batch processing applications and optimisations.]]>
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index 74c9945cb..0f99b8e11 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>org.springframework.batch.parent</artifactId>
 	<version>2.0.0.CI-SNAPSHOT</version>
 	<name>Spring Batch Parent</name>
-	<url>http://static.springframework.org/spring-batch</url>
+	<url>http://static.springframework.org/spring-batch/${artifactId}</url>
 	<description>
 		Spring Batch parent project.  Defines dependencies and common configuration for the 
 		build process.
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 950f132bc..1f20e56ff 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -3,6 +3,7 @@
 	<artifactId>org.springframework.batch.samples</artifactId>
 	<packaging>jar</packaging>
 	<name>Samples</name>
+	<url>http://static.springframework.org/spring-batch/${artifactId}</url>
 	<description>
 		<!--  Use CDATA to keep it on a single line in the manifest -->
 		<![CDATA[Example batch jobs using Spring Batch Core and Execution.]]>
diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml
index 22370f3bc..8ee5da344 100755
--- a/spring-batch-test/pom.xml
+++ b/spring-batch-test/pom.xml
@@ -3,6 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.springframework.batch.test</artifactId>
 	<name>Test</name>
+	<url>http://static.springframework.org/spring-batch/${artifactId}</url>
 	<packaging>jar</packaging>
 	<description>Domain for batch job testing</description>
 
diff --git a/src/site/apt/migration/index.apt b/src/site/apt/migration/index.apt
index b2aa87eeb..c52a125e2 100644
--- a/src/site/apt/migration/index.apt
+++ b/src/site/apt/migration/index.apt
@@ -15,6 +15,8 @@
 
     * {{{2.0-highlights.html}Highlights of changes between 1.x and 2.0}}
   
+    * {{{2.0-rc1-rc2.html}2.0.0.RC1 to 2.0.0.RC2}}
+
     * {{{2.0-m4-rc1.html}2.0.0.M4 to 2.0.0.RC1}}
 
     * {{{2.0-m3-m4.html}2.0.0.M3 to 2.0.0.M4}}
diff --git a/src/site/apt/stateful.apt b/src/site/apt/stateful.apt
index 3d484f61c..3455085c4 100644
--- a/src/site/apt/stateful.apt
+++ b/src/site/apt/stateful.apt
@@ -9,7 +9,7 @@ State and Thread Safety in Spring Batch
 
   A stateless component is thread safe, but sometimes not practical (you need to store some state).  A stateful component can be thread safe, if its contract is clearly explained to and met by its clients.  Spring Batch has a lot of stateful components, which by and large are not capable of being used in a thread safe manner, but that doesn't have to be the case for ever. 
 
-  Components with private non-final fields are not necessarily stateful in practice - Spring components often have fields that are injected or initialized after the object is created.  The working definition of "stateless" for the present purposes is a component with fields that do not change after initialization, which has the usual Spring lifecycle meaning (i.e. once "released into the wild" with <<<BeanFactory.getBean()>>, or the equivalent).
+  Components with private non-final fields are not necessarily stateful in practice - Spring components often have fields that are injected or initialized after the object is created.  The working definition of "stateless" for the present purposes is a component with fields that do not change after initialization, which has the usual Spring lifecycle meaning (i.e. once "released into the wild" with <<<BeanFactory.getBean()>>>, or the equivalent).
 
   Conversely, even components with only final fields are not necessarily stateless.  They can have the appearance of statelessness (and thread safety), but if they mutate their final fields, then they are stateful by association.  It is not always possible to tell from the implementation of a component whether it is stateful by association, since it depends entirely on the implementation of its fields, whose concrete type may not even be known at compile time.