diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/AbstractBasicCacheFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/AbstractBasicCacheFactoryBean.java
index b0dc1a69..84d1c737 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/AbstractBasicCacheFactoryBean.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/AbstractBasicCacheFactoryBean.java
@@ -379,7 +379,7 @@ public abstract class AbstractBasicCacheFactoryBean extends AbstractFactoryBeanS
 	 * By default, returns {@link GemFireCache} {@link Class}.
 	 *
 	 * @return {@link GemFireCache} {@link Class} by default.
-	 * @see org.apache.geode.cache.GemFireCache#getClass()
+	 * @see org.apache.geode.cache.GemFireCache
 	 * @see #getObjectType()
 	 * @see java.lang.Class
 	 */
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java
index b13b501b..fae4e2e0 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.client;
 
 import java.util.Optional;
@@ -42,7 +41,7 @@ public class ClientRegionShortcutToDataPolicyConverter implements Converter<Clie
 	/**
 	 * Converts the given {@link ClientRegionShortcut} into a corresponding {@link DataPolicy}.
 	 *
-	 * @param regionShortcut {@link ClientRegionShortcut} to convert.
+	 * @param clientRegionShortcut {@link ClientRegionShortcut} to convert.
 	 * @return a corresponding {@link DataPolicy} for the given {@link ClientRegionShortcut}.
 	 * @see org.apache.geode.cache.client.ClientRegionShortcut
 	 * @see org.apache.geode.cache.DataPolicy
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java
index 7c3356e0..9bb9252b 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java
@@ -87,7 +87,7 @@ public @interface EnableHttpService {
 	 *
 	 * To enable SSL communications for the HTTP service, use the {@link EnableSsl} annotation and set the
 	 * {@link EnableSsl#components()} to contain
-	 * {@link org.springframework.data.gemfire.config.annotation.EnableSsl.Component#HTTP}.
+	 * {@link org.springframework.data.gemfire.config.annotation.EnableSsl.Component#WEB}.
 	 *
 	 * Defaults to {@literal false}.
 	 *
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java
index 64b4b485..53b41ed0 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java
@@ -14,7 +14,6 @@
  * limitations under the License.
  *
  */
-
 package org.springframework.data.gemfire.config.annotation;
 
 import java.lang.annotation.Documented;
@@ -26,17 +25,15 @@ import java.lang.annotation.Target;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.type.AnnotationMetadata;
 
 /**
  * The {@link EnablePdx} annotation marks a Spring {@link Configuration @Configuration} annotated {@link Class}
- * to enable the Pivotal GemFire/Apache Geode PDX features and functionality in this peer cache, cluster member
- * or cache client application.
+ * to enable the Apache Geode PDX features and functionality in this peer cache, cluster member or cache client
+ * application.
  *
  * @author John Blum
  * @see java.lang.annotation.Annotation
  * @see org.springframework.context.annotation.Import
- * @see org.springframework.data.gemfire.config.annotation.AbstractCacheConfiguration#configurePdx(AnnotationMetadata)
  * @see org.springframework.data.gemfire.config.annotation.PdxConfiguration
  * @since 1.9.0
  */
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java
index c8eaaa96..0c8cb28f 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.mapping;
 
 import static org.springframework.data.gemfire.util.CollectionUtils.asSet;
@@ -54,7 +53,6 @@ public class GemfirePersistentProperty extends AnnotationBasedPersistentProperty
 	 * @see org.springframework.data.mapping.PersistentProperty
 	 * @see org.springframework.data.mapping.model.Property
 	 * @see org.springframework.data.mapping.model.SimpleTypeHolder
-	 * @see AnnotationBasedPersistentProperty(Property, PersistentEntity, SimpleTypeHolder)
 	 */
 	public GemfirePersistentProperty(Property property, PersistentEntity<?, GemfirePersistentProperty> owner,
 			SimpleTypeHolder simpleTypeHolder) {
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java
index d5f4fb2b..74530aa7 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java
@@ -45,7 +45,7 @@ import org.springframework.util.Assert;
 
 /**
  * {@link GemfireRepositoryQuery} using plain {@link String} based OQL queries.
- * <p>
+ *
  * @author Oliver Gierke
  * @author David Turanski
  * @author John Blum
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/support/PagingUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/support/PagingUtils.java
index 595b3a25..225a26ca 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/support/PagingUtils.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/support/PagingUtils.java
@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
  * @see java.util.Collection
  * @see org.springframework.data.domain.Page
  * @see org.springframework.data.domain.Pageable
- * @see org.springframework.data.repository.support.PageableExecutionUtils
+ * @see org.springframework.data.repository.query.QueryMethod
  * @since 2.4.0
  */
 public abstract class PagingUtils {