Merge branch '1.5.x'

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

@@ -1114,7 +1114,7 @@ modules when you add new features to your application.
 If you want to replace the default `ObjectMapper` completely, either define a `@Bean` of
 that type and mark it as `@Primary`, or, if you prefer the builder-based
 approach, define a `Jackson2ObjectMapperBuilder` `@Bean`. Note that in either case this
-will disable all auto-configuration of the `ObjectMapper.
+will disable all auto-configuration of the `ObjectMapper`.
 
 If you provide any `@Beans` of type `MappingJackson2HttpMessageConverter` then
 they will replace the default value in the MVC configuration. Also, a convenience bean is
@@ -1564,7 +1564,7 @@ translation for you, you can configure it like this:
 
 NOTE: Because your custom configuration chooses to go with Hikari, `app.datasource.type`
 will have no effect. In practice the builder will be initialized with whatever value you
-might set there and then overridden by the call to `.type()``.
+might set there and then overridden by the call to `.type()`.
 
 See _<<spring-boot-features.adoc#boot-features-configure-datasource>>_ in the
 '`Spring Boot features`' section and the