From 5b3e53835e67834221cf1fa45c63d4d2ffea956d Mon Sep 17 00:00:00 2001 From: Tetsuya Hasegawa Date: Fri, 26 Apr 2019 17:27:58 +0900 Subject: [PATCH 1/2] Fix broken link Closes gh-16666 --- spring-boot-docs/src/main/asciidoc/index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-docs/src/main/asciidoc/index.adoc b/spring-boot-docs/src/main/asciidoc/index.adoc index 2c157e1c01..1b41104b0f 100644 --- a/spring-boot-docs/src/main/asciidoc/index.adoc +++ b/spring-boot-docs/src/main/asciidoc/index.adoc @@ -35,7 +35,7 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson; :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: https://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/maven-plugin -:spring-initializr-reference: https://docs.spring.io/initializr/docs/current/reference/htmlsingle +:spring-initializr-reference: https://docs.spring.io/initializr/docs/current/reference/html :spring-reference: https://docs.spring.io/spring/docs/{spring-docs-version}/spring-framework-reference/htmlsingle :spring-security-reference: https://docs.spring.io/spring-security/site/docs/{spring-security-docs-version}/reference/htmlsingle :spring-security-oauth2-reference: https://projects.spring.io/spring-security-oauth/docs/oauth2.html From ac9ee952c783ddbd8437f956da1c9f0fef195c15 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 26 Apr 2019 11:52:25 +0300 Subject: [PATCH 2/2] Properly merge fix See gh-16666 --- .../spring-boot-docs/src/main/asciidoc/index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc index 5c3db85e90..f31b80eb56 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc @@ -42,7 +42,7 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson; :spring-boot-gradle-plugin: https://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/gradle-plugin :spring-boot-gradle-plugin-reference: https://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/gradle-plugin/reference/html :spring-reference: https://docs.spring.io/spring/docs/{spring-docs-version}/spring-framework-reference/ -:spring-initializr-reference: https://docs.spring.io/initializr/docs/current/reference/htmlsingle +:spring-initializr-reference: https://docs.spring.io/initializr/docs/current/reference/html :spring-rest-docs: https://projects.spring.io/spring-restdocs/ :spring-integration: https://projects.spring.io/spring-integration/ :spring-session: https://projects.spring.io/spring-session/