Merge branch '6.2.x'

Author: sbrannen

spring-core/src/main/java/org/springframework/util/backoff/FixedBackOff.java

@@ -100,14 +100,14 @@ public long getInterval() {
 	}
 
 	/**
-	 * Set the maximum number of attempts in milliseconds.
+	 * Set the maximum number of attempts.
 	 */
 	public void setMaxAttempts(long maxAttempts) {
 		this.maxAttempts = maxAttempts;
 	}
 
 	/**
-	 * Return the maximum number of attempts in milliseconds.
+	 * Return the maximum number of attempts.
 	 */
 	public long getMaxAttempts() {
 		return this.maxAttempts;