diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java
index 794b0dd69..827de6120 100644
--- a/ebean-api/src/main/java/io/ebean/ExpressionList.java
+++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java
@@ -54,7 +54,7 @@ public interface ExpressionList<T> {
   Query<T> orderById(boolean orderById);
 
   /**
-   * Deprecated migrate to {@link #orderBy(String)}
+   * @deprecated migrate to {@link #orderBy(String)}
    */
   @Deprecated(since = "13.19", forRemoval = true)
   default ExpressionList<T> order(String orderByClause) {
@@ -72,7 +72,7 @@ public interface ExpressionList<T> {
   ExpressionList<T> orderBy(String orderBy);
 
   /**
-   * Deprecated migrate to orderBy().
+   * @deprecated migrate to {@link #orderBy()}.
    */
   @Deprecated(forRemoval = true)
   default OrderBy<T> order() {
@@ -508,7 +508,7 @@ public interface ExpressionList<T> {
   ExpressionList<T> filterMany(String manyProperty);
 
   /**
-   * Deprecated for removal - migrate to filterManyRaw()
+   * @deprecated for removal - migrate to {@link #filterManyRaw(String, String, Object...)}.
    * <p>
    * Add filter expressions to the many property.
    *
diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index fb4d0c1f1..3a7b1e920 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -1396,7 +1396,7 @@ public interface Query<T> extends CancelableQuery {
   Query<T> orderBy(String orderByClause);
 
   /**
-   * Deprecated migrate to orderBy().
+   * @deprecated migrate to {@link #orderBy()}.
    */
   @Deprecated(since = "13.19", forRemoval = true)
   default Query<T> order(String orderByClause) {
@@ -1415,7 +1415,7 @@ public interface Query<T> extends CancelableQuery {
   OrderBy<T> orderBy();
 
   /**
-   * Deprecated migrate to orderBy().
+   * @deprecated migrate to {@link #orderBy()}.
    */
   @Deprecated(since = "13.19", forRemoval = true)
   default OrderBy<T> order() {
@@ -1428,7 +1428,7 @@ public interface Query<T> extends CancelableQuery {
   Query<T> setOrderBy(OrderBy<T> orderBy);
 
   /**
-   * Deprecated migrate to setOrderBy().
+   * @deprecated migrate to {@link #setOrderBy(OrderBy)}.
    */
   @Deprecated(since = "13.19", forRemoval = true)
   default Query<T> setOrder(OrderBy<T> orderBy) {
diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index cee280992..bcd30b7c0 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -2371,7 +2371,7 @@ public class DatabaseConfig {
   }
 
   /**
-   * Deprecated - migrate to classes().
+   * @deprecated - migrate to {@link #classes()}.
    * <p>
    * Sorry if returning Set rather than List breaks code but it feels safer to
    * do that than a subtle change to return a shallow copy which you will not detect.
@@ -3387,7 +3387,7 @@ public class DatabaseConfig {
   }
 
   /**
-   * Deprecated - migrate to isLoadModuleInfo().
+   * @deprecated - migrate to {@link #isLoadModuleInfo()}.
    */
   @Deprecated(forRemoval = true)
   public boolean isAutoLoadModuleInfo() {
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java
index aaf62c6bb..f94fb267b 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java
@@ -25,7 +25,7 @@ public abstract class PBaseString<R, T> extends PBaseComparable<R, T> {
   }
 
   /**
-   * Deprecated migrate to eq().
+   * @deprecated migrate to {@link #eq(Object)}.
    * <p>
    * Is equal to. The same as <code>eq</code> but uses the strong type as argument rather than String.
    *
@@ -39,7 +39,7 @@ public abstract class PBaseString<R, T> extends PBaseComparable<R, T> {
   }
 
   /**
-   * Deprecated migrate to ne().
+   * @deprecated migrate to {@link #ne(Object)}.
    * <p>
    * Is not equal to. The same as <code>ne</code> but uses the strong type as argument rather than String.
    *
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
index 653da9fe3..e14a78d06 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
@@ -188,7 +188,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
   }
 
   /**
-   * Deprecated for removal - migrate to filterManyRaw()
+   * @deprecated for removal - migrate to {@link #filterManyRaw(String, Object...)}.
    * <p>
    * Apply a filter when fetching these beans.
    * <p>
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 8a4360117..01f007553 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -1273,7 +1273,7 @@ public abstract class TQRootBean<T, R> {
   }
 
   /**
-   * Deprecated migrate to orderBy().
+   * @deprecated migrate to {@link #orderBy()}.
    */
   @Deprecated(since = "13.19")
   public R order() {
@@ -1293,7 +1293,7 @@ public abstract class TQRootBean<T, R> {
   }
 
   /**
-   * Deprecated migrate to {@link #orderBy(String)}
+   * @deprecated migrate to {@link #orderBy(String)}
    */
   @Deprecated(since = "13.19")
   public R order(String orderByClause) {