Merge branch '1.1.x'

spring-boot-docs/src/main/asciidoc/getting-started.adoc

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