diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisPubSubCommands.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisPubSubCommands.java
index 42ec175ff..56c20bc64 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisPubSubCommands.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisPubSubCommands.java
@@ -27,7 +27,8 @@ public interface RedisPubSubCommands {
 	 * or not.
 	 * 
 	 * @return true if the connection is subscribed, false otherwise
-	 * @see #subscribe(Subscription, byte[]...)
+	 * @see #subscribe(listener, channels)
+	 * @see #pSubscribe(listener, channels)
 	 */
 	boolean isSubscribed();
 
@@ -36,7 +37,8 @@ public interface RedisPubSubCommands {
 	 * not subscribed.
 	 * 
 	 * @return the current subscription, null if none is available
-	 * @see #subscribe(Subscription, byte[]...)
+	 * @see #subscribe(listener, channels)
+	 * @see #pSubscribe(listener, channels)
 	 */
 	Subscription getSubscription();
 
@@ -58,7 +60,7 @@ public interface RedisPubSubCommands {
 	 * Note that this operation is blocking and the current thread starts waiting
 	 * for new messages immediately.
 	 * 
-	 * @param subscription message subscription
+	 * @param listener message listener
 	 * @param channels channel names
 	 */
 	void subscribe(MessageListener listener, byte[]... channels);
@@ -72,7 +74,7 @@ public interface RedisPubSubCommands {
 	 * Note that this operation is blocking and the current thread starts waiting
 	 * for new messages immediately.
 	 * 
-	 * @param subscription message subscription
+	 * @param listener message listener
 	 * @param patterns channel name patterns
 	 */
 	void pSubscribe(MessageListener listener, byte[]... patterns);
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
index bbc6d861c..21866fe86 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
@@ -289,7 +289,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 	/**
 	 * Sets the key serializer to be used by this template. Defaults to {@link getDefaultSerializer}.
 	 * 
-	 * @param serializer
+	 * @param serializer the key serializer to be used by this template.
 	 */
 	public void setKeySerializer(RedisSerializer<?> serializer) {
 		this.keySerializer = serializer;
@@ -298,7 +298,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 	/**
 	 * Returns the key serializer used by this template.
 	 * 
-	 * @return
+	 * @return the key serializer used by this template.
 	 */
 	public RedisSerializer<?> getKeySerializer() {
 		return keySerializer;
@@ -307,7 +307,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 	/**
 	 * Sets the value serializer to be used by this template. Defaults to {@link getDefaultSerializer}.
 	 * 
-	 * @param serializer
+	 * @param serializer the value serializer to be used by this template.
 	 */
 	public void setValueSerializer(RedisSerializer<?> serializer) {
 		this.valueSerializer = serializer;
@@ -316,7 +316,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 	/**
 	 * Returns the value serializer used by this template.
 	 * 
-	 * @return
+	 * @return the value serializer used by this template.
 	 */
 	public RedisSerializer<?> getValueSerializer() {
 		return valueSerializer;
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SessionCallback.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SessionCallback.java
index 904dc2c48..d80e2ca3a 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SessionCallback.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SessionCallback.java
@@ -26,7 +26,6 @@ public interface SessionCallback<T> {
 	/**
 	 * Executes all the given operations inside the same session.
 	 * 
-	 * @param <T> return type
 	 * @param operations Redis operations
 	 * @return return value
 	 */
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/ChannelTopic.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/ChannelTopic.java
index c76c2ad39..654c34b7a 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/ChannelTopic.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/ChannelTopic.java
@@ -36,7 +36,7 @@ public class ChannelTopic implements Topic {
 	/**
 	 * Returns the channel name.
 	 *  
-	 * @return
+	 * @return channel name
 	 */
 	public String getTopic() {
 		return channelName;
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java
index 5cf29e489..1c9676e4c 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java
@@ -382,8 +382,8 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
 	 * Adds a message listener to the (potentially running) container. If the container is running,
 	 * the listener starts receiving (matching) messages as soon as possible.
 	 * 
-	 * @param listener
-	 * @param topics
+	 * @param listener message listener
+	 * @param topic message topic
 	 */
 	public void addMessageListener(MessageListener listener, Topic topic) {
 		addMessageListener(listener, Collections.singleton(topic));