Merge branch '1.4.x' into 1.5.x

Author: snicoll

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -439,11 +439,11 @@ content into your application; rather pick only the properties that you need.
 	security.user.password= # Password for the default user name. A random password is logged on startup by default.
 	security.user.role=USER # Granted roles for the default user name.
 
-	# SECURITY OAUTH2 CLIENT ({sc-spring-boot-autoconfigure}/security/oauth2/OAuth2ClientProperties.{sc-ext}[OAuth2ClientProperties]
+	# SECURITY OAUTH2 CLIENT ({sc-spring-boot-autoconfigure}/security/oauth2/OAuth2ClientProperties.{sc-ext}[OAuth2ClientProperties])
 	security.oauth2.client.client-id= # OAuth2 client id.
 	security.oauth2.client.client-secret= # OAuth2 client secret. A random secret is generated by default
 
-	# SECURITY OAUTH2 RESOURCES ({sc-spring-boot-autoconfigure}/security/oauth2/resource/ResourceServerProperties.{sc-ext}[ResourceServerProperties]
+	# SECURITY OAUTH2 RESOURCES ({sc-spring-boot-autoconfigure}/security/oauth2/resource/ResourceServerProperties.{sc-ext}[ResourceServerProperties])
 	security.oauth2.resource.id= # Identifier of the resource.
 	security.oauth2.resource.jwt.key-uri= # The URI of the JWT token. Can be set if the value is not available and the key is public.
 	security.oauth2.resource.jwt.key-value= # The verification key of the JWT token. Can either be a symmetric secret or PEM-encoded RSA public key.
@@ -453,7 +453,7 @@ content into your application; rather pick only the properties that you need.
 	security.oauth2.resource.token-type= # The token type to send when using the userInfoUri.
 	security.oauth2.resource.user-info-uri= # URI of the user endpoint.
 
-	# SECURITY OAUTH2 SSO ({sc-spring-boot-autoconfigure}/security/oauth2/client/OAuth2SsoProperties.{sc-ext}[OAuth2SsoProperties]
+	# SECURITY OAUTH2 SSO ({sc-spring-boot-autoconfigure}/security/oauth2/client/OAuth2SsoProperties.{sc-ext}[OAuth2SsoProperties])
 	security.oauth2.sso.filter-order= # Filter order to apply if not providing an explicit WebSecurityConfigurerAdapter
 	security.oauth2.sso.login-path=/login # Path to the login page, i.e. the one that triggers the redirect to the OAuth2 Authorization Server
 

spring-boot-docs/src/main/asciidoc/howto.adoc

@@ -2004,9 +2004,10 @@ NOTE: You can output the schema creation by enabling the `org.hibernate.SQL` log
 is done for you automatically if you enable the <<boot-features-logging-console-output,debug mode>>.
 
 In addition, a file named `import.sql` in the root of the classpath will be executed on
-startup. This can be useful for demos and for testing if you are careful, but probably
-not something you want to be on the classpath in production. It is a Hibernate feature
-(nothing to do with Spring).
+startup if Hibernate creates the schema from scratch (that is if the `ddl-auto` property
+is set to `create` or `create-drop`). This can be useful for demos and for testing if you
+are careful, but probably not something you want to be on the classpath in production. It
+is a Hibernate feature (nothing to do with Spring).
 
 
 [[howto-initialize-a-database-using-spring-jdbc]]