Merge branch '2.2.x'

Closes gh-18947

spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -2122,7 +2122,6 @@ include::{code-examples}/cloudfoundry/CloudFoundryCustomContextPathExample.java[
 
 [[production-ready-whats-next]]
 == What to Read Next
-If you want to explore some of the concepts discussed in this chapter, you can take a look at the actuator {spring-boot-code}/spring-boot-samples[sample applications].
-You also might want to read about graphing tools such as https://graphiteapp.org[Graphite].
+You might want to read about graphing tools such as https://graphiteapp.org[Graphite].
 
 Otherwise, you can continue on, to read about <<deployment.adoc#deployment, '`deployment options`'>> or jump ahead for some in-depth information about Spring Boot's _<<build-tool-plugins.adoc#build-tool-plugins, build tool plugins>>_.

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -2916,8 +2916,6 @@ When running a Spring Boot application that uses an embedded servlet container (
 * Creating a custom `error.jsp` page does not override the default view for <<boot-features-error-handling,error handling>>.
   <<boot-features-error-handling-custom-error-pages,Custom error pages>> should be used instead.
 
-There is a {spring-boot-code}/spring-boot-samples/spring-boot-sample-web-jsp[JSP sample] so that you can see how to set things up.
-
 
 
 [[boot-features-reactive-server]]

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

@@ -972,7 +972,7 @@ A running remote client might resemble the following listing:
 	 =========|_|==============|___/===================================/_/_/_/
 	 :: Spring Boot Remote :: {spring-boot-version}
 
-	2015-06-10 18:25:06.632  INFO 14938 --- [           main] o.s.b.devtools.RemoteSpringApplication   : Starting RemoteSpringApplication on pwmbp with PID 14938 (/Users/pwebb/projects/spring-boot/code/spring-boot-devtools/target/classes started by pwebb in /Users/pwebb/projects/spring-boot/code/spring-boot-samples/spring-boot-sample-devtools)
+	2015-06-10 18:25:06.632  INFO 14938 --- [           main] o.s.b.devtools.RemoteSpringApplication   : Starting RemoteSpringApplication on pwmbp with PID 14938 (/Users/pwebb/projects/spring-boot/code/spring-boot-project/spring-boot-devtools/target/classes started by pwebb in /Users/pwebb/projects/spring-boot/code)
 	2015-06-10 18:25:06.671  INFO 14938 --- [           main] s.c.a.AnnotationConfigApplicationContext : Refreshing org.springframework.context.annotation.AnnotationConfigApplicationContext@2a17b7b6: startup date [Wed Jun 10 18:25:06 PDT 2015]; root of context hierarchy
 	2015-06-10 18:25:07.043  WARN 14938 --- [           main] o.s.b.d.r.c.RemoteClientConfiguration    : The connection to http://localhost:8080 is insecure. You should use a URL starting with 'https://'.
 	2015-06-10 18:25:07.074  INFO 14938 --- [           main] o.s.b.d.a.OptionalLiveReloadServer       : LiveReload server is running on port 35729