From a470c1af3ad10aa209bd54084e8fb5b5dca7f944 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 27 Apr 2021 15:10:39 +0100 Subject: [PATCH] Align documentation with main default branch name Closes gh-26255 --- .../spring-boot-docs/src/docs/asciidoc/attributes.adoc | 2 +- .../spring-boot-docs/src/docs/asciidoc/deployment.adoc | 4 ++-- .../spring-boot-docs/src/docs/asciidoc/howto.adoc | 2 +- .../spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc | 2 +- .../spring-boot-gradle-plugin/src/docs/asciidoc/index.adoc | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc index ce8230010f..00b4f54355 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc @@ -26,7 +26,7 @@ :spring-boot-code: https://github.com/{github-repo}/tree/{github-tag} :spring-boot-api: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/api :spring-boot-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference -:spring-boot-master-code: https://github.com/{github-repo}/tree/master +:spring-boot-latest-code: https://github.com/{github-repo}/tree/main :spring-boot-current-docs: https://docs.spring.io/spring-boot/docs/current/reference/ :spring-boot-actuator-restapi: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/actuator-api :spring-boot-maven-plugin-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/maven-plugin/reference/html/ diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment.adoc index 1905d8c8e8..347da4caa3 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment.adoc @@ -217,7 +217,7 @@ The most common deployment workflow for Heroku deployments is to `git push` the [indent=0,subs="verbatim,quotes,attributes"] ---- - $ git push heroku master + $ git push heroku main Initializing repository, *done*. Counting objects: 95, *done*. @@ -255,7 +255,7 @@ The most common deployment workflow for Heroku deployments is to `git push` the https://agile-sierra-1405.herokuapp.com/ *deployed to Heroku* To git@heroku.com:agile-sierra-1405.git - * [new branch] master -> master + * [new branch] main -> main ---- Your application should now be up and running on Heroku. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc index 7ab4bd1f83..ea122ad16e 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc @@ -1183,7 +1183,7 @@ If you add your own, you have to be aware of the order and in which position you This is a useful member of the view resolver chain and picks up any beans with the same name as the `View` being resolved. It should not be necessary to override or replace it. * A `ContentNegotiatingViewResolver` named '`viewResolver`' is added only if there *are* actually beans of type `View` present. - This is a '`master`' resolver, delegating to all the others and attempting to find a match to the '`Accept`' HTTP header sent by the client. + This is a composite resolver, delegating to all the others and attempting to find a match to the '`Accept`' HTTP header sent by the client. There is a useful https://spring.io/blog/2013/06/03/content-negotiation-using-views[blog about `ContentNegotiatingViewResolver`] that you might like to study to learn more, and you might also look at the source code for detail. You can switch off the auto-configured `ContentNegotiatingViewResolver` by defining a bean named '`viewResolver`'. * If you use Thymeleaf, you also have a `ThymeleafViewResolver` named '`thymeleafViewResolver`'. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc index 7c02f2f220..428524a969 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc @@ -155,7 +155,7 @@ include::starters/technical-starters.adoc[] To learn how to swap technical facets, please see the how-to documentation for <> and <>. -TIP: For a list of additional community contributed starters, see the {spring-boot-master-code}/spring-boot-project/spring-boot-starters/README.adoc[README file] in the `spring-boot-starters` module on GitHub. +TIP: For a list of additional community contributed starters, see the {spring-boot-latest-code}/spring-boot-project/spring-boot-starters/README.adoc[README file] in the `spring-boot-starters` module on GitHub. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/index.adoc b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/index.adoc index 065ccb029c..8ee4566ae4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/index.adoc +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/index.adoc @@ -10,7 +10,7 @@ Andy Wilkinson, Scott Frederick :docinfo: shared,private :dependency-management-plugin: https://github.com/spring-gradle-plugins/dependency-management-plugin -:dependency-management-plugin-documentation: {dependency-management-plugin}/blob/master/README.md +:dependency-management-plugin-documentation: https://docs.spring.io/dependency-management-plugin/docs/current/reference/html/ :gradle-userguide: https://docs.gradle.org/current/userguide :gradle-dsl: https://docs.gradle.org/current/dsl :gradle-api: https://docs.gradle.org/current/javadoc