Merge branch '1.5.x'

Author: snicoll

spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc

@@ -268,7 +268,6 @@ you don't want to use the `spring-boot-antlib` module.
 
 
 
-[[using-boot-starter-poms]]
 [[using-boot-starter]]
 === Starters
 Starters are a set of convenient dependency descriptors that you can include in your

spring-boot-starters/README.adoc

@@ -8,14 +8,14 @@ JPA for database access just include the `spring-boot-starter-data-jpa` dependen
 your project, and you are good to go.
 
 For complete details see the
-http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-starter-poms[reference documentation]
+http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-starter[reference documentation]
 
 == Community Contributions
 If you create a starter for a technology that is not already in the standard list we can
 list it here. Just send a pull request for this page.
 
 WARNING: While the
-http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-starter-poms[reference documentation]
+http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-starter[reference documentation]
 mentions that 3rd party starters should not start with `spring-boot`, some starters
 do as they were designed before this was clarified.