Skip to content

S
spring-boot
Commit 092b861e authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.1.x'

parents a708b28d 9ef83358
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
spring-boot-docs/src/main/asciidoc/getting-started.adoc
View file @ 092b861e
...@@ -566,10 +566,9 @@ that any HTTP request with the path "`/`" should be mapped to the `home` method. ...@@ -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 `@RestController` annotation tells Spring to render the resulting string directly
back to the caller. back to the caller.
TIP: The `@RestController` and `@RequestMapping` annotations are Spring MVC TIP: The `@RestController` and `@RequestMapping` annotations are Spring MVC annotations
annotations (they are not specific to Spring Boot). See the (they are not specific to Spring Boot). See the {spring-reference}#mvc[MVC section] in
<{spring-reference}/#mvc>[MVC section] in the Spring the Spring Reference Documentation for more details.
Reference Documentation for more details.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment