diff --git a/spring-kafka/src/main/java/org/springframework/kafka/config/KafkaListenerContainerFactory.java b/spring-kafka/src/main/java/org/springframework/kafka/config/KafkaListenerContainerFactory.java
index 62001748..9b9ce10d 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/config/KafkaListenerContainerFactory.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/config/KafkaListenerContainerFactory.java
@@ -16,14 +16,13 @@
 
 package org.springframework.kafka.config;
 
-import org.springframework.kafka.listener.AbstractMessageListenerContainer;
 import org.springframework.kafka.listener.MessageListenerContainer;
 
 /**
  * Factory of {@link MessageListenerContainer} based on a
  * {@link KafkaListenerEndpoint} definition.
  *
- * @param <C> the {@link AbstractMessageListenerContainer} implementation type.
+ * @param <C> the {@link MessageListenerContainer} implementation type.
  *
  * @author Stephane Nicoll
  *
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaException.java b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaException.java
index 7407a8f7..cf55a6e3 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaException.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaException.java
@@ -19,7 +19,7 @@ package org.springframework.kafka.core;
 import org.springframework.core.NestedRuntimeException;
 
 /**
- * The Spring Kafka specif {@link NestedRuntimeException} implementation.
+ * The Spring Kafka specific {@link NestedRuntimeException} implementation.
  *
  * @author Gary Russell
  * @author Artem Bilan
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaOperations.java b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaOperations.java
index aeecc0a0..c3a9cdec 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaOperations.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaOperations.java
@@ -22,7 +22,7 @@ import java.util.concurrent.Future;
 import org.apache.kafka.clients.producer.RecordMetadata;
 
 /**
- * The basic Kafka operation contract.
+ * The basic Kafka operations contract.
  *
  * @param <K> the key type.
  * @param <V> the value type.
@@ -156,7 +156,8 @@ public interface KafkaOperations<K, V> {
 	 * @throws ExecutionException execution exception while awaiting result.
 	 * @throws InterruptedException thread interrupted while awaiting result.
 	 */
-	RecordMetadata syncConvertAndSend(String topic, int partition, K key, V data) throws InterruptedException, ExecutionException;
+	RecordMetadata syncConvertAndSend(String topic, int partition, K key, V data)
+		throws InterruptedException, ExecutionException;
 
 	/**
 	 * Flush the producer.
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/ListenerExecutionFailedException.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/ListenerExecutionFailedException.java
index cacbac14..8a0ef0c9 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/ListenerExecutionFailedException.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/ListenerExecutionFailedException.java
@@ -19,7 +19,7 @@ package org.springframework.kafka.listener;
 import org.springframework.kafka.core.KafkaException;
 
 /**
- * The listener specif {@link KafkaException} extension.
+ * The listener specific {@link KafkaException} extension.
  *
  * @author Gary Russell
  */
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/AbstractAdaptableMessageListener.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/AbstractAdaptableMessageListener.java
index 06d3599a..112b6964 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/AbstractAdaptableMessageListener.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/AbstractAdaptableMessageListener.java
@@ -44,7 +44,7 @@ public abstract class AbstractAdaptableMessageListener<K, V> implements MessageL
 
 	/**
 	 * Kafka {@link MessageListener} entry point.
-	 * <p> Delegates the message to the target listener method, with appropriate conversion of the message argument.
+	 * <p> Delegate the message to the target listener method, with appropriate conversion of the message argument.
 	 * In case of an exception, the {@link #handleListenerException(Throwable)} method will be invoked.
 	 * @param record the incoming Kafka {@link ConsumerRecord}.
 	 * @see #handleListenerException
@@ -63,8 +63,7 @@ public abstract class AbstractAdaptableMessageListener<K, V> implements MessageL
 	/**
 	 * Handle the given exception that arose during listener execution.
 	 * The default implementation logs the exception at error level.
-	 * <p>
-	 * This method only applies when using a Kafka {@link MessageListener}. With
+	 * <p> This method only applies when using a Kafka {@link MessageListener}. With
 	 * {@link AcknowledgingMessageListener}, exceptions get handled by the
 	 * caller instead.
 	 * @param ex the exception to handle