diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index a4e799b4df..d54cce9ee3 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -631,7 +631,7 @@ content into your application; rather pick only the properties that you need.
 	spring.jta.log-dir= # Transaction logs directory.
 	spring.jta.transaction-manager-id= # Transaction manager unique identifier.
 
-	# ATOMIKOS
+	# ATOMIKOS ({sc-spring-boot}/jta/atomikos/AtomikosProperties.{sc-ext}[AtomikosProperties])
 	spring.jta.atomikos.connectionfactory.borrow-connection-timeout=30 # Timeout, in seconds, for borrowing connections from the pool.
 	spring.jta.atomikos.connectionfactory.ignore-session-transacted-flag=true # Whether or not to ignore the transacted flag when creating session.
 	spring.jta.atomikos.connectionfactory.local-transaction-mode=false # Whether or not local transactions are desired.
@@ -736,7 +736,7 @@ content into your application; rather pick only the properties that you need.
 	spring.jta.bitronix.properties.skip-corrupted-logs=false # Skip corrupted transactions log entries.
 	spring.jta.bitronix.properties.warn-about-zero-resource-transaction=true # Log a warning for transactions executed without a single enlisted resource.
 
-	# NARAYANA
+	# NARAYANA ({sc-spring-boot}/jta/narayana/NarayanaProperties.{sc-ext}[NarayanaProperties])
 	spring.jta.narayana.default-timeout=60 # Transaction timeout in seconds.
 	spring.jta.narayana.expiry-scanners=com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner # Comma-separated list of expiry scanners.
 	spring.jta.narayana.log-dir= # Transaction object store directory.
diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc
index 86d2d4e90f..7aed1a95d4 100644
--- a/spring-boot-docs/src/main/asciidoc/deployment.adoc
+++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc
@@ -107,7 +107,7 @@ It's easy to then verify the status of the deployed application:
 
 Once Cloud Foundry acknowledges that your application has been deployed, you should be
 able to hit the application at the URI given, in this case
-`http://acloudyspringtime.cfapps.io/`.
+`\http://acloudyspringtime.cfapps.io/`.
 
 
 
diff --git a/spring-boot-docs/src/main/asciidoc/index.adoc b/spring-boot-docs/src/main/asciidoc/index.adoc
index ae64dce715..99e0526a29 100644
--- a/spring-boot-docs/src/main/asciidoc/index.adoc
+++ b/spring-boot-docs/src/main/asciidoc/index.adoc
@@ -13,10 +13,10 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson;
 :spring-boot-docs: http://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/reference
 :spring-boot-docs-current: http://docs.spring.io/spring-boot/docs/current/reference
 :github-repo: spring-projects/spring-boot
-:github-raw: http://raw.github.com/{github-repo}/{github-tag}
-:github-code: http://github.com/{github-repo}/tree/{github-tag}
-:github-wiki: http://github.com/{github-repo}/wiki
-:github-master-code: http://github.com/{github-repo}/tree/master
+:github-raw: https://raw.github.com/{github-repo}/{github-tag}
+:github-code: https://github.com/{github-repo}/tree/{github-tag}
+:github-wiki: https://github.com/{github-repo}/wiki
+:github-master-code: https://github.com/{github-repo}/tree/master
 :sc-ext: java
 :sc-spring-boot: {github-code}/spring-boot/src/main/java/org/springframework/boot
 :sc-spring-boot-autoconfigure: {github-code}/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure
@@ -31,7 +31,7 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson;
 :dc-spring-boot-autoconfigure: {dc-root}/org/springframework/boot/autoconfigure
 :dc-spring-boot-actuator: {dc-root}/org/springframework/boot/actuate
 :dc-spring-boot-test: {dc-root}/spring-boot-test/src/main/java/org/springframework/boot/test
-:dc-spring-boot-test-autoconfigure: {dc-root}/spring-boot-test/src/main/java/org/springframework/boot/test/autoconfigure
+:dc-spring-boot-test-autoconfigure: {dc-root}/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure
 :dependency-management-plugin: https://github.com/spring-gradle-plugins/dependency-management-plugin
 :dependency-management-plugin-documentation: {dependency-management-plugin}/blob/master/README.md
 :spring-boot-maven-plugin-site: http://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/maven-plugin
diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
index 01508c2cbc..51ba151717 100644
--- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
+++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
@@ -650,7 +650,7 @@ If you can't directly import your project into your IDE, you may be able to gene
 metadata using a build plugin. Maven includes plugins for
 http://maven.apache.org/plugins/maven-eclipse-plugin/[Eclipse] and
 http://maven.apache.org/plugins/maven-idea-plugin/[IDEA]; Gradle offers plugins
-for http://www.gradle.org/docs/current/userguide/ide_support.html[various IDEs].
+for https://docs.gradle.org/current/userguide/userguide.html[various IDEs].
 
 TIP: If you accidentally run a web application twice you will see a "`Port already in
 use`" error. STS users can use the `Relaunch` button rather than `Run` to ensure that