Merge branch '1.1.x'

Conflicts:
	spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java

spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc

@@ -154,6 +154,9 @@ need to mark the embedded container dependencies as "`provided`", e.g:
 	</project>
 ----
 
+TIP: See the "`<<howto-create-a-deployable-war-file>>`" section for more details on
+how to create a deployable war file.
+
 Advanced configuration options and examples are available in the
 {spring-boot-maven-plugin-site}/[plugin info page].
 
@@ -359,6 +362,10 @@ named "`providedRuntime`", e.g:
 	}
 ----
 
+TIP: See the "`<<howto-create-a-deployable-war-file>>`" section for more details on
+how to create a deployable war file.
+
+
 
 [[build-tool-plugins-gradle-running-applications]]
 === Running a project in-place