diff --git a/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java
index 066fb9371..17aed5887 100644
--- a/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java
+++ b/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java
@@ -29,11 +29,11 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * methods. Request properties to be parsed can be configured. Default configuration uses request parameters beginning
  * with {@link #DEFAULT_PAGE_PARAMETER}{@link #DEFAULT_QUALIFIER_DELIMITER}.
  *
- * @since 1.6
  * @author Oliver Gierke
  * @author Nick Williams
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @since 1.6
  */
 public class PageableHandlerMethodArgumentResolver extends PageableHandlerMethodArgumentResolverSupport
 		implements PageableArgumentResolver {
diff --git a/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverSupport.java b/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverSupport.java
index 959f8f692..0256bbd78 100644
--- a/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverSupport.java
+++ b/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverSupport.java
@@ -37,11 +37,11 @@ import org.springframework.util.StringUtils;
  * configured. Default configuration uses request parameters beginning with
  * {@link #DEFAULT_PAGE_PARAMETER}{@link #DEFAULT_QUALIFIER_DELIMITER}.
  *
- * @since 2.2
- * @see PageableHandlerMethodArgumentResolver
- * @see ReactivePageableHandlerMethodArgumentResolver
  * @author Mark Paluch
  * @author Vedran Pavic
+ * @see ReactivePageableHandlerMethodArgumentResolver
+ * @see PageableHandlerMethodArgumentResolver
+ * @since 2.2
  */
 public abstract class PageableHandlerMethodArgumentResolverSupport {
 
diff --git a/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java b/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java
index 2a2fb98fd..39e0bf08f 100644
--- a/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java
+++ b/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java
@@ -27,11 +27,11 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * {@link HandlerMethodArgumentResolver} to allow injection of {@link PagedResourcesAssembler} into Spring MVC
  * controller methods.
  *
- * @since 1.6
  * @author Oliver Gierke
  * @author Nick Williams
  * @author Christoph Strobl
  * @author Johannes Englmeier
+ * @since 1.6
  */
 public class PagedResourcesAssemblerArgumentResolver implements HandlerMethodArgumentResolver {
 
diff --git a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java
index fd590e7c7..580a7da24 100644
--- a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java
+++ b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java
@@ -27,15 +27,15 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
 /**
- * {@link HandlerMethodArgumentResolver} to automatically create {@link Sort} instances from request parameters or
- * {@link SortDefault} annotations.
+ * {@link org.springframework.web.method.support.HandlerMethodArgumentResolver} to automatically create {@link Sort}
+ * instances from request parameters or {@link SortDefault} annotations.
  *
- * @since 1.6
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Nick Williams
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @since 1.6
  */
 public class SortHandlerMethodArgumentResolver extends SortHandlerMethodArgumentResolverSupport
 		implements SortArgumentResolver {
diff --git a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolverSupport.java b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolverSupport.java
index 032997a0f..616212186 100644
--- a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolverSupport.java
+++ b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolverSupport.java
@@ -38,12 +38,12 @@ import org.springframework.util.StringUtils;
  * Base class providing methods for handler method argument resolvers to create {@link Sort} instances from request
  * parameters or {@link SortDefault} annotations.
  *
- * @since 2.2
- * @see SortHandlerMethodArgumentResolver
- * @see ReactiveSortHandlerMethodArgumentResolver
  * @author Mark Paluch
  * @author Vedran Pavic
  * @author Johannes Englmeier
+ * @see SortHandlerMethodArgumentResolver
+ * @see ReactiveSortHandlerMethodArgumentResolver
+ * @since 2.2
  */
 public abstract class SortHandlerMethodArgumentResolverSupport {