diff --git a/docs/src/site/docbook/reference/readersAndWriters.xml b/docs/src/site/docbook/reference/readersAndWriters.xml
index d4189ffe4..2e8244e90 100644
--- a/docs/src/site/docbook/reference/readersAndWriters.xml
+++ b/docs/src/site/docbook/reference/readersAndWriters.xml
@@ -2017,7 +2017,7 @@
 
   public class FooTransformer implements ItemProcessor{
 
-    //Preform simple transformation, convert a Foo to a Barr
+    //Perform simple transformation, convert a Foo to a Bar
     public Object transform(Object item) throws Exception {
       assertTrue(item instanceof Foo);
       Foo foo = (Foo)item;
@@ -2097,7 +2097,7 @@
 
   public class FooTransformer implements ItemTransformer{
 
-    //Preform simple transformation, convert a Foo to a Barr
+    //Perform simple transformation, convert a Foo to a Bar
     public Object transform(Object item) throws Exception {
       assertTrue(item instanceof Foo);
       Foo foo = (Foo)item;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java
index 6254638c4..014c28875 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java
@@ -16,7 +16,7 @@
 package org.springframework.batch.core;
 
 /**
- * Batch domain interface representing the configuration of a step. As with the (@link Job), a {@link Step} is meant to
+ * Batch domain interface representing the configuration of a step. As with the {@link Job}, a {@link Step} is meant to
  * explicitly represent a the configuration of a step by a developer, but also the ability to execute the step.
  * 
  * @author Dave Syer
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java
index 794ddad16..cf17d210f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java
@@ -20,6 +20,7 @@ import java.util.Date;
 import java.util.List;
 
 import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobExecutionException;
 import org.springframework.batch.core.JobInstance;
@@ -32,7 +33,7 @@ import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.repeat.ExitStatus;
 
 /**
- * Simple implementation of (@link Job} interface providing the ability to run a
+ * Simple implementation of {@link Job} interface providing the ability to run a
  * {@link JobExecution}. Sequentially executes a job by iterating through its
  * list of steps.
  * 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryMapper.java
index 903f28d4b..fea712fd0 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryMapper.java
@@ -22,7 +22,7 @@ import org.springframework.batch.sample.domain.football.PlayerSummary;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 
 /**
- * RowMapper used to map a ResultSet to a (@link PlayerSummary)
+ * RowMapper used to map a ResultSet to a {@link PlayerSummary}
  * 
  * @author Lucas Ward
  *
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryRowMapper.java
index 7d5f3f787..e821833d4 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryRowMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryRowMapper.java
@@ -22,7 +22,7 @@ import org.springframework.batch.sample.domain.football.PlayerSummary;
 import org.springframework.jdbc.core.RowMapper;
 
 /**
- * RowMapper used to map a ResultSet to a (@link PlayerSummary)
+ * RowMapper used to map a ResultSet to a {@link PlayerSummary}
  * 
  * @author Lucas Ward
  *
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractValidatingBatchLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractValidatingBatchLauncherTests.java
index 338e2dd5e..e22f15c59 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractValidatingBatchLauncherTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractValidatingBatchLauncherTests.java
@@ -17,9 +17,10 @@
 package org.springframework.batch.sample;
 
 import org.junit.Test;
+import org.springframework.context.Lifecycle;
 
 /**
- * Abstract TestCase that automatically starts a Spring (@link Lifecycle) after
+ * Abstract TestCase that automatically starts a Spring {@link Lifecycle} after
  * obtaining it automatically via autowiring by type.
  *
  * This implemenation is based on JUnit4 and SpringJUnit4ClassRunner being used