Merge branch '1.3.x'

This commit is contained in:
Phillip Webb
2016-06-20 18:50:00 -07:00
7 changed files with 51 additions and 48 deletions

View File

@@ -2133,9 +2133,9 @@ packaged as an executable archive), there are some limitations in the JSP suppor
* Undertow does not support JSPs.
* Creating a custom `error.jsp` page won't override the default view for
<<boot-features-error-handling,error handling>>.
<<boot-features-error-handling-custom-error-pages,Custom error pages>> should be used
instead.
<<boot-features-error-handling,error handling>>,
<<boot-features-error-handling-custom-error-pages,custom error pages>> should be used
instead.
There is a {github-code}/spring-boot-samples/spring-boot-sample-web-jsp[JSP sample] so you
can see how to set things up.