Merge branch '1.1.x'

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

@@ -1285,7 +1285,7 @@ If the above customization techniques are too limited, you can register the
 		TomcatEmbeddedServletContainerFactory factory = new TomcatEmbeddedServletContainerFactory();
 		factory.setPort(9000);
 		factory.setSessionTimeout(10, TimeUnit.MINUTES);
-		factory.addErrorPages(new ErrorPage(HttpStatus.404, "/notfound.html");
+		factory.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/notfound.html");
 		return factory;
 	}
 ----