Merge branch '2.0.x'

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java

@@ -89,28 +89,28 @@ public class OAuth2ClientProperties {
 		private String clientSecret;
 
 		/**
-		 * Client authentication method. May be left blank then using a pre-defined
+		 * Client authentication method. May be left blank when using a pre-defined
 		 * provider.
 		 */
 		private String clientAuthenticationMethod;
 
 		/**
-		 * Authorization grant type. May be left blank then using a pre-defined provider.
+		 * Authorization grant type. May be left blank when using a pre-defined provider.
 		 */
 		private String authorizationGrantType;
 
 		/**
-		 * Redirect URI. May be left blank then using a pre-defined provider.
+		 * Redirect URI. May be left blank when using a pre-defined provider.
 		 */
 		private String redirectUriTemplate;
 
 		/**
-		 * Authorization scopes. May be left blank then using a pre-defined provider.
+		 * Authorization scopes. May be left blank when using a pre-defined provider.
 		 */
 		private Set<String> scope;
 
 		/**
-		 * Client name. May be left blank then using a pre-defined provider.
+		 * Client name. May be left blank when using a pre-defined provider.
 		 */
 		private String clientName;