diff --git a/src/main/java/org/springframework/data/redis/connection/FutureResult.java b/src/main/java/org/springframework/data/redis/connection/FutureResult.java
index 67fc0a29a..2a1f82e19 100644
--- a/src/main/java/org/springframework/data/redis/connection/FutureResult.java
+++ b/src/main/java/org/springframework/data/redis/connection/FutureResult.java
@@ -82,7 +82,7 @@ abstract public class FutureResult<T> {
 	 * Indicates if this result is the status of an operation. Typically status results will be
 	 * discarded on conversion.
 	 *
-	 * @status true if this is a status result (i.e. OK)
+	 * @return true if this is a status result (i.e. OK)
 	 */
 	public void setStatus(boolean status) {
 		this.status = status;
diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java
index 58c8dc88b..30a2a8e21 100644
--- a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java
@@ -2183,7 +2183,7 @@ public class SrpConnection implements RedisConnection {
 	 * type. If false, results of {@link #closePipeline()} and {@link #exec()} will be of the
 	 * type returned by the Lettuce driver
 	 *
-	 * @param convertPipelineResults Whether or not to convert pipeline results
+	 * @param convertPipelineAndTxResults Whether or not to convert pipeline results
 	 */
 	public void setConvertPipelineAndTxResults(boolean convertPipelineAndTxResults) {
 		this.convertPipelineAndTxResults = convertPipelineAndTxResults;
diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java
index 21e5f089b..101064bcb 100644
--- a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java
+++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java
@@ -133,7 +133,7 @@ public class SrpConnectionFactory implements InitializingBean, DisposableBean, R
 	 * type. If false, results of {@link SrpConnection#closePipeline()} and {@link SrpConnection#exec()}
 	 * will be of the type returned by the SRP driver
 	 *
-	 * @param convertPipelineResults Whether or not to convert pipeline and tx results
+	 * @param convertPipelineAndTxResults Whether or not to convert pipeline and tx results
 	 */
 	public void setConvertPipelineAndTxResults(boolean convertPipelineAndTxResults) {
 		this.convertPipelineAndTxResults = convertPipelineAndTxResults;
diff --git a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java
index 8c0cf779a..83daae30c 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java
@@ -511,7 +511,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 	 * any results that are byte[]s or Collections or Maps of byte[]s or Tuples. Other result
 	 * types (Long, Boolean, etc) are left as-is in the converted results.
 	 *
-	 * If conversion of tx results has been disabled in the {@link ConnectionFactory},
+	 * If conversion of tx results has been disabled in the {@link RedisConnectionFactory},
 	 * the results of exec will be returned without deserialization. This check is mostly for
 	 * backwards compatibility with 1.0.
 	 *