Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-11-25 12:32:21 +00:00
commit 092b861ee3

View File

@ -566,10 +566,9 @@ that any HTTP request with the path "`/`" should be mapped to the `home` method.
`@RestController` annotation tells Spring to render the resulting string directly
back to the caller.
TIP: The `@RestController` and `@RequestMapping` annotations are Spring MVC
annotations (they are not specific to Spring Boot). See the
<{spring-reference}/#mvc>[MVC section] in the Spring
Reference Documentation for more details.
TIP: The `@RestController` and `@RequestMapping` annotations are Spring MVC annotations
(they are not specific to Spring Boot). See the {spring-reference}#mvc[MVC section] in
the Spring Reference Documentation for more details.