Merge branch '2.0.x'

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/SchedulerFactoryBeanCustomizer.java

@@ -26,7 +26,7 @@
  * configuration.
  * <p>
  * For customization of the {@link DataSource} used by Quartz, use of
- * {@link QuartzDataSource @QuartDataSource} is preferred. It will ensure consistent
+ * {@link QuartzDataSource @QuartzDataSource} is preferred. It will ensure consistent
  * customization of both the {@link SchedulerFactoryBean} and the
  * {@link QuartzDataSourceInitializer}.
  *

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -2000,7 +2000,7 @@ Jackson is the preferred and default library.
 [[boot-features-json-jackson]]
 === Jackson
 Auto-configuration for Jackson is provided and Jackson is part of
-`spring-boot-starer-json`. When Jackson is on the classpath an `ObjectMapper`
+`spring-boot-starter-json`. When Jackson is on the classpath an `ObjectMapper`
 bean is automatically configured. Several configuration properties are provided for
 <<howto.adoc#howto-customize-the-jackson-objectmapper,customizing the configuration of the
 `ObjectMapper`>>.

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestServletFilterRegistrationDisabledIntegrationTests.java

@@ -43,7 +43,7 @@ public class WebMvcTestServletFilterRegistrationDisabledIntegrationTests {
 	private MockMvc mvc;
 
 	@Test
-	public void shouldApplyFilter() throws Exception {
+	public void shouldNotApplyFilter() throws Exception {
 		this.mvc.perform(get("/one")).andExpect(header().string("x-test", (String) null));
 	}