diff --git a/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java
index ff802c3ab..02aa6f80d 100644
--- a/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java
+++ b/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java
@@ -137,7 +137,6 @@ static ClientConfiguration create(InetSocketAddress socketAddress) {
 	 * Returns the {@link java.time.Duration connect timeout}.
 	 *
 	 * @see java.net.Socket#connect(SocketAddress, int)
-	 * @see io.netty.channel.ChannelOption#CONNECT_TIMEOUT_MILLIS
 	 */
 	Duration getConnectTimeout();
 
@@ -145,8 +144,6 @@ static ClientConfiguration create(InetSocketAddress socketAddress) {
 	 * Returns the {@link java.time.Duration socket timeout} which is typically applied as SO-timeout/read timeout.
 	 *
 	 * @see java.net.Socket#setSoTimeout(int)
-	 * @see io.netty.handler.timeout.ReadTimeoutHandler
-	 * @see io.netty.handler.timeout.WriteTimeoutHandler
 	 */
 	Duration getSocketTimeout();
 
@@ -294,7 +291,6 @@ default TerminalClientConfigurationBuilder withConnectTimeout(long millis) {
 		 * @param timeout the timeout to use. Must not be {@literal null}.
 		 * @return the {@link TerminalClientConfigurationBuilder}
 		 * @see java.net.Socket#connect(SocketAddress, int)
-		 * @see io.netty.channel.ChannelOption#CONNECT_TIMEOUT_MILLIS
 		 */
 		TerminalClientConfigurationBuilder withConnectTimeout(Duration timeout);
 
@@ -315,8 +311,6 @@ default TerminalClientConfigurationBuilder withSocketTimeout(long millis) {
 		 * @param timeout the timeout to use. Must not be {@literal null}.
 		 * @return the {@link TerminalClientConfigurationBuilder}
 		 * @see java.net.Socket#setSoTimeout(int)
-		 * @see io.netty.handler.timeout.ReadTimeoutHandler
-		 * @see io.netty.handler.timeout.WriteTimeoutHandler
 		 */
 		TerminalClientConfigurationBuilder withSocketTimeout(Duration timeout);
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/config/EnableElasticsearchAuditing.java b/src/main/java/org/springframework/data/elasticsearch/config/EnableElasticsearchAuditing.java
index 7b4825bfb..6bad2445b 100644
--- a/src/main/java/org/springframework/data/elasticsearch/config/EnableElasticsearchAuditing.java
+++ b/src/main/java/org/springframework/data/elasticsearch/config/EnableElasticsearchAuditing.java
@@ -55,7 +55,7 @@
 	boolean modifyOnCreate() default true;
 
 	/**
-	 * Configures a {@link DateTimeProvider} bean name that allows customizing the {@link org.joda.time.DateTime} to be
+	 * Configures a {@link DateTimeProvider} bean name that allows customizing the date and time to be
 	 * used for setting creation and modification dates.
 	 */
 	String dateTimeProviderRef() default "";
diff --git a/src/main/java/org/springframework/data/elasticsearch/config/EnableReactiveElasticsearchAuditing.java b/src/main/java/org/springframework/data/elasticsearch/config/EnableReactiveElasticsearchAuditing.java
index 0646637c7..cae34e4eb 100644
--- a/src/main/java/org/springframework/data/elasticsearch/config/EnableReactiveElasticsearchAuditing.java
+++ b/src/main/java/org/springframework/data/elasticsearch/config/EnableReactiveElasticsearchAuditing.java
@@ -55,8 +55,8 @@
 	boolean modifyOnCreate() default true;
 
 	/**
-	 * Configures a {@link DateTimeProvider} bean name that allows customizing the {@link org.joda.time.DateTime} to be
-	 * used for setting creation and modification dates.
+	 * Configures a {@link DateTimeProvider} bean name that allows customizing the date and time to be used for setting
+	 * creation and modification dates.
 	 */
 	String dateTimeProviderRef() default "";
 }