Merge branch '1.1.x'

pull/1989/merge
Andy Wilkinson 10 years ago
commit 092b861ee3

@ -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.

Loading…
Cancel
Save