Merge branch '1.3.x' into 1.4.x

Author: wilkinsona

README.adoc

@@ -102,11 +102,7 @@ Boot applications can run on Java 1.6).
 ----
 
 If you want to build with the regular `mvn` command, you will need
-<<<<<<< HEAD
-http://maven.apache.org/run-maven/index.html[Maven v3.2.1 or above].
-=======
-https://maven.apache.org/run-maven/index.html[Maven v3.0.5 or above].
->>>>>>> 1.3.x
+https://maven.apache.org/run-maven/index.html[Maven v3.2.1 or above].
 
 NOTE: You may need to increase the amount of memory available to Maven by setting
 a `MAVEN_OPTS` environment variable with the value `-Xmx512m`. Remember

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

@@ -612,20 +612,20 @@ For example, the following YAML document:
 ----
 	environments:
 		dev:
-			url: http://dev.example.com
+			url: https://dev.example.com
 			name: Developer Setup
 		prod:
-			url: http://another.example.com
+			url: https://another.example.com
 			name: My Cool App
 ----
 
 Would be transformed into these properties:
 
 [source,properties,indent=0]
 ----
-	environments.dev.url=http://dev.example.com
+	environments.dev.url=https://dev.example.com
 	environments.dev.name=Developer Setup
-	environments.prod.url=http://another.example.com
+	environments.prod.url=https://another.example.com
 	environments.prod.name=My Cool App
 ----