diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfigurationAdvancedConfigurationIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfigurationAdvancedConfigurationIntegrationTests.java
index 52cf0bc984..f75b6a645e 100644
--- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfigurationAdvancedConfigurationIntegrationTests.java
+++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfigurationAdvancedConfigurationIntegrationTests.java
@@ -62,8 +62,9 @@ public class RestDocsAutoConfigurationAdvancedConfigurationIntegrationTests {
 	private RestDocumentationResultHandler document;
 
 	@Test
+	@Deprecated
 	public void snippetGeneration() throws Exception {
-		this.document.document(links(
+		this.document.snippets(links(
 				linkWithRel("self").description("Canonical location of this resource")));
 		this.mvc.perform(get("/"));
 		File defaultSnippetsDir = new File(
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java
index 5a9cf77e5f..e90b6c50bb 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java
@@ -39,7 +39,8 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean;
  * @see ServletContextInitializer
  * @see ServletContext#addFilter(String, Filter)
  * @see DelegatingFilterProxyRegistrationBean
- * @deprecated as of 1.4 in favor of org.springframework.boot.web.FilterRegistrationBean
+ * @deprecated as of 1.4 in favor of
+ * org.springframework.boot.web.servlet.FilterRegistrationBean
  */
 @Deprecated
 public class FilterRegistrationBean