Merge branch '1.1.x'

philwebb · philwebb · commit 6ddabb871a84 · 2015-01-05T11:57:38.000-08:00
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/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;
 	}
 ----

Original file line number	Diff line number	Diff line change
`@@ -1285,7 +1285,7 @@ If the above customization techniques are too limited, you can register the`
`1285`	`1285`	`TomcatEmbeddedServletContainerFactory factory = new TomcatEmbeddedServletContainerFactory();`
`1286`	`1286`	`factory.setPort(9000);`
`1287`	`1287`	`factory.setSessionTimeout(10, TimeUnit.MINUTES);`
`1288`		`- factory.addErrorPages(new ErrorPage(HttpStatus.404, "/notfound.html");`
	`1288`	`+ factory.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/notfound.html");`
`1289`	`1289`	`return factory;`
`1290`	`1290`	`}`
`1291`	`1291`	`----`