diff --git a/dictionary.txt b/dictionary.txt
index 1cd88af5c..d46efa409 100644
--- a/dictionary.txt
+++ b/dictionary.txt
@@ -50,3 +50,4 @@ tasklet
 bespoke
 standalone
 kasanicky
+remedial
diff --git a/docs/src/site/docbook/reference/retry.xml b/docs/src/site/docbook/reference/retry.xml
index 644b997df..c3d4a3e78 100644
--- a/docs/src/site/docbook/reference/retry.xml
+++ b/docs/src/site/docbook/reference/retry.xml
@@ -147,26 +147,24 @@ Object result = template.execute(new RetryCallback() {
         recognise the failed operations when they come back in a new
         transaction. To facilitate this in the commonest case where an object
         (like a message or message payload) is being processed, Spring Batch
-        provides the <classname>ItemReaderRetryPolicy</classname>. This works
+        provides the <classname>ItemWriterRetryPolicy</classname>. This works
         in conjunction with a special <classname>RetryCallback</classname>
-        implementation <classname>ItemReaderRetryCallback</classname>, which
+        implementation <classname>ItemWriterRetryCallback</classname>, which
         in turn relies on the user providing an
-        <classname>ItemReader</classname> and an
         <classname>ItemWriter</classname>. This callback implements the common
-        pattern where it reads from a reader and passes the result to a
-        writer.</para>
+        pattern where it passes the item to a writer.</para>
 
         <para>The way the failed operations are recognised in this
-        implementation is by identifying the object that is returned from the
-        <classname>ItemReader</classname>. To identify the item the user can
-        provide an <classname>ItemKeyGenerator</classname> strategy, and this
-        is responsible for returning a unique key identifying the item. The
+        implementation is by identifying the item across multiple invocations
+        of the retry. To identify the item the user can provide an
+        <classname>ItemKeyGenerator</classname> strategy, and this is
+        responsible for returning a unique key identifying the item. The
         identifier is used as a key in the
         <classname>RetryContextCache</classname>. An
         <classname>ItemKeyGenerator</classname> can be provided either by
         injecting it directly into the
-        <classname>ItemReaderRetryCallback</classname>, or by implementing the
-        interface in the <classname>ItemReader</classname>, or by accepting
+        <classname>ItemWriterRetryCallback</classname>, or by implementing the
+        interface in the <classname>ItemWriter</classname>, or by accepting
         the default which is to simply use the item itself as a key.</para>
 
         <para>When the retry is exhausted, because a stateful retry is always
@@ -176,13 +174,12 @@ Object result = template.execute(new RetryCallback() {
         almost certain to fail). This option is provided by the
         <classname>ItemRecoverer</classname> strategy. Like the key generator,
         it can be directly injected or provided by implementing the interface
-        in either the <classname>ItemReader</classname> or
-        <classname>ItemWriter</classname>.</para>
+        in the <classname>ItemWriter</classname>.</para>
 
         <para>The decision to retry or not is actually delegated to a regular
         stateless retry policy, so the usual concerns about limits and
         timeouts can be injected into the
-        <classname>ItemReaderRetryPolicy</classname> through the delegate
+        <classname>ItemWriterRetryPolicy</classname> through the delegate
         property.</para>
       </section>
     </section>
diff --git a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
index 50be87399..1e5c0fe7a 100644
--- a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
@@ -17,7 +17,7 @@
 						class="org.springframework.batch.core.launch.support.SimpleExportedJobLauncher">
 						<property name="launcher" ref="jobLauncher" />
 						<property name="jobLocator"
-							ref="jobConfigurationRegistry" />
+							ref="jobRegistry" />
 					</bean>
 				</entry>
 				<entry
@@ -58,7 +58,7 @@
 
 	<bean id="loader"
 		class="org.springframework.batch.sample.DefaultJobLoader">
-		<property name="registry" ref="jobConfigurationRegistry" />
+		<property name="registry" ref="jobRegistry" />
 	</bean>
 
 </beans>
diff --git a/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml b/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml
index 349b28e32..9999996e5 100644
--- a/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml
@@ -23,7 +23,7 @@
 		<property name="jobDataAsMap">
 			<map>
 				<entry key="jobName" value="footballJob"/>
-				<entry key="jobLocator" value-ref="jobConfigurationRegistry"/>
+				<entry key="jobLocator" value-ref="jobRegistry"/>
 				<entry key="jobLauncher" value-ref="jobLauncher"/>
 			</map>
 		</property>
diff --git a/src/site/apt/downloads.apt b/src/site/apt/downloads.apt
index aeeba588a..23bcbe284 100644
--- a/src/site/apt/downloads.apt
+++ b/src/site/apt/downloads.apt
@@ -7,7 +7,7 @@
 
 Milestone Builds
 
-  These builds are provided for evaluation and community feedback.  They will have a release identifier ending in "mX" where X is the milestone number, or "rcX" for a release candidate.  The current release is <<1.0.0.rc1>>.
+  These builds are provided for evaluation and community feedback.  They will have a release identifier ending in "mX" where X is the milestone number, or "rcX" for a release candidate.  The current release is <<1.0.0>>.
 
 * Zip Downloads
 
@@ -33,7 +33,7 @@ Milestone Builds
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>1.0.0.rc1</version>
+    <version>1.0.0</version>
 </dependency>
 +---------------
 
diff --git a/src/site/apt/snapshots.apt b/src/site/apt/snapshots.apt
index e3ab84966..95ca74059 100644
--- a/src/site/apt/snapshots.apt
+++ b/src/site/apt/snapshots.apt
@@ -27,7 +27,7 @@ Snapshot Builds
 <dependency>
     <groupId>org.springframework.batch</groupId>
     <artifactId>spring-batch-core</artifactId>
-    <version>1.0.0.-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
 </dependency>
 +---------------