From 67d92ed6847498b04e1fe0a1d017938f4b9378f3 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 12 Nov 2009 17:14:19 +0000
Subject: [PATCH] updates for site

---
 src/site/apt/migration/2.1.0.M1-2.1.0.M2.apt | 4 ----
 src/site/docbook/reference/scalability.xml   | 2 +-
 src/site/site.xml                            | 4 +++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/site/apt/migration/2.1.0.M1-2.1.0.M2.apt b/src/site/apt/migration/2.1.0.M1-2.1.0.M2.apt
index d259f09bb..dd7d8389f 100644
--- a/src/site/apt/migration/2.1.0.M1-2.1.0.M2.apt
+++ b/src/site/apt/migration/2.1.0.M1-2.1.0.M2.apt
@@ -12,8 +12,6 @@ Release Notes - Spring Batch - Version 2.1.0.M2
 
   * {{{http://jira.springsource.org/browse/BATCH-1401}[BATCH-1401]}} - All inserts of JobId should be of Types.BIGINT
 
-  * {{{http://jira.springsource.org/browse/BATCH-1418}[BATCH-1418]}} - Upon job restart, step with FlatFileItemReader doesn't honor skippable-exception-classes
-
   * {{{http://jira.springsource.org/browse/BATCH-1420}[BATCH-1420]}} - Late Binding only happens first time when using inner bean definition with collection property
 
   * {{{http://jira.springsource.org/browse/BATCH-1427}[BATCH-1427]}} - SimpleRetryExceptionHandler treats AbstractStep$FatalException as non-fatal
@@ -42,8 +40,6 @@ Release Notes - Spring Batch - Version 2.1.0.M2
 
   * {{{http://jira.springsource.org/browse/BATCH-1399}[BATCH-1399]}} - Expose StepExecutionAggregator as a strategy interface in PartitionStep
 
-  * {{{http://jira.springsource.org/browse/BATCH-1407}[BATCH-1407]}} - Integration tests for core (including multi-threaded long running tests)
-
   * {{{http://jira.springsource.org/browse/BATCH-1416}[BATCH-1416]}} - Namespace support for max varchar length in execution context and execution daos
 
   * {{{http://jira.springsource.org/browse/BATCH-1421}[BATCH-1421]}} - Add method to get all job names to JobExplorer
diff --git a/src/site/docbook/reference/scalability.xml b/src/site/docbook/reference/scalability.xml
index 1cc56c274..90da191de 100644
--- a/src/site/docbook/reference/scalability.xml
+++ b/src/site/docbook/reference/scalability.xml
@@ -47,7 +47,7 @@
     attribute of the <literal>tasklet</literal>:</para>
 
     <programlisting>&lt;step id="loading"&gt;
-    &lt;tasklet task-executor="taskExecutor"&gt;...<&lt/tasklet&gt;
+    &lt;tasklet task-executor="taskExecutor"&gt;...<&lt;/tasklet&gt;
 &lt;/step&gt;</programlisting>
 
     <para>In this example the taskExecutor is a reference to another bean
diff --git a/src/site/site.xml b/src/site/site.xml
index cc1800621..c5750b7ab 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -15,6 +15,8 @@
 		<logo name="" href="" img="images/shim.gif" />
 	</poweredBy>
 
+	<version position="left"/>
+
 	<skin>
 		<groupId>org.springframework.maven.skins
 		</groupId>
@@ -64,7 +66,7 @@
 			<item name="Samples" href="spring-batch-samples/index.html" />
 		</menu>
 
-		<menu ref="reports"/>
+		<menu ref="reports" inheritAsRef="true"/>
 
 	</body>