Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-10-13 16:30:17 +01:00
commit f8602817af

View File

@ -2062,7 +2062,7 @@ particular controller and/or exception type.
----
In the example above, if `YourException` is thrown by a controller defined in the same
package as `FooController`, a json representation of the `CustomerErrorType` POJO will be
package as `FooController`, a json representation of the `CustomErrorType` POJO will be
used instead of the `ErrorAttributes` representation.