diff --git a/httpClient/src/main/java/org/jfrog/artifactory/client/httpClient/http/HttpBuilderBase.java b/httpClient/src/main/java/org/jfrog/artifactory/client/httpClient/http/HttpBuilderBase.java
index 5be76fde..e7431478 100644
--- a/httpClient/src/main/java/org/jfrog/artifactory/client/httpClient/http/HttpBuilderBase.java
+++ b/httpClient/src/main/java/org/jfrog/artifactory/client/httpClient/http/HttpBuilderBase.java
@@ -159,11 +159,21 @@ public T maxTotalConnections(int maxTotalConnections) {
         return self();
     }
 
+    /**
+     * Sets the connection timeout in milliseconds (Apache HttpClient 4.x {@link RequestConfig.Builder#setConnectTimeout(int)}).
+     *
+     * @param connectionTimeout timeout in milliseconds
+     */
     public T connectionTimeout(int connectionTimeout) {
         config.setConnectTimeout(connectionTimeout);
         return self();
     }
 
+    /**
+     * Sets the socket (read) timeout in milliseconds (Apache HttpClient 4.x {@link RequestConfig.Builder#setSocketTimeout(int)}).
+     *
+     * @param soTimeout timeout in milliseconds
+     */
     public T socketTimeout(int soTimeout) {
         config.setSocketTimeout(soTimeout);
         return self();
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/ArtifactoryClientBuilder.java b/services/src/main/groovy/org/jfrog/artifactory/client/ArtifactoryClientBuilder.java
index ab70ed22..71253565 100644
--- a/services/src/main/groovy/org/jfrog/artifactory/client/ArtifactoryClientBuilder.java
+++ b/services/src/main/groovy/org/jfrog/artifactory/client/ArtifactoryClientBuilder.java
@@ -34,7 +34,13 @@ public class ArtifactoryClientBuilder {
     private String url;
     private String username;
     private String password;
+    /**
+     * Connection timeout in milliseconds (Apache HttpClient 4.x {@code RequestConfig#setConnectTimeout}).
+     */
     private Integer connectionTimeout;
+    /**
+     * Socket timeout in milliseconds (Apache HttpClient 4.x {@code RequestConfig#setSocketTimeout}).
+     */
     private Integer socketTimeout;
     private ProxyConfig proxy;
     private String userAgent;
@@ -71,11 +77,21 @@ public ArtifactoryClientBuilder setPassword(String password) {
         return this;
     }
 
+    /**
+     * Sets the HTTP connection timeout.
+     *
+     * @param connectionTimeout timeout in milliseconds (Apache HttpClient 4.x)
+     */
     public ArtifactoryClientBuilder setConnectionTimeout(Integer connectionTimeout) {
         this.connectionTimeout = connectionTimeout;
         return this;
     }
 
+    /**
+     * Sets the HTTP socket (read) timeout.
+     *
+     * @param socketTimeout timeout in milliseconds (Apache HttpClient 4.x)
+     */
     public ArtifactoryClientBuilder setSocketTimeout(Integer socketTimeout) {
         this.socketTimeout = socketTimeout;
         return this;
@@ -226,10 +242,16 @@ public String getPassword() {
         return password;
     }
 
+    /**
+     * @return connection timeout in milliseconds, or {@code null} if unset
+     */
     public Integer getConnectionTimeout() {
         return connectionTimeout;
     }
 
+    /**
+     * @return socket timeout in milliseconds, or {@code null} if unset
+     */
     public Integer getSocketTimeout() {
         return socketTimeout;
     }