Skip to content

Commit a470c1a

Browse files
committed
Align documentation with main default branch name
Closes gh-26255
1 parent 2ab679a commit a470c1a

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
:spring-boot-code: https://github.com/{github-repo}/tree/{github-tag}
2727
:spring-boot-api: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/api
2828
:spring-boot-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference
29-
:spring-boot-master-code: https://github.com/{github-repo}/tree/master
29+
:spring-boot-latest-code: https://github.com/{github-repo}/tree/main
3030
:spring-boot-current-docs: https://docs.spring.io/spring-boot/docs/current/reference/
3131
:spring-boot-actuator-restapi: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/actuator-api
3232
:spring-boot-maven-plugin-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/maven-plugin/reference/html/

spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ The most common deployment workflow for Heroku deployments is to `git push` the
217217

218218
[indent=0,subs="verbatim,quotes,attributes"]
219219
----
220-
$ git push heroku master
220+
$ git push heroku main
221221
222222
Initializing repository, *done*.
223223
Counting objects: 95, *done*.
@@ -255,7 +255,7 @@ The most common deployment workflow for Heroku deployments is to `git push` the
255255
https://agile-sierra-1405.herokuapp.com/ *deployed to Heroku*
256256
257257
To [email protected]:agile-sierra-1405.git
258-
* [new branch] master -> master
258+
* [new branch] main -> main
259259
----
260260

261261
Your application should now be up and running on Heroku.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ If you add your own, you have to be aware of the order and in which position you
11831183
This is a useful member of the view resolver chain and picks up any beans with the same name as the `View` being resolved.
11841184
It should not be necessary to override or replace it.
11851185
* A `ContentNegotiatingViewResolver` named '`viewResolver`' is added only if there *are* actually beans of type `View` present.
1186-
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.
1186+
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.
11871187
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.
11881188
You can switch off the auto-configured `ContentNegotiatingViewResolver` by defining a bean named '`viewResolver`'.
11891189
* If you use Thymeleaf, you also have a `ThymeleafViewResolver` named '`thymeleafViewResolver`'.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ include::starters/technical-starters.adoc[]
155155

156156
To learn how to swap technical facets, please see the how-to documentation for <<howto.adoc#howto-use-another-web-server, swapping web server>> and <<howto.adoc#howto-configure-log4j-for-logging, logging system>>.
157157

158-
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.
158+
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.
159159

160160

161161

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Andy Wilkinson, Scott Frederick
1010
:docinfo: shared,private
1111

1212
:dependency-management-plugin: https://github.com/spring-gradle-plugins/dependency-management-plugin
13-
:dependency-management-plugin-documentation: {dependency-management-plugin}/blob/master/README.md
13+
:dependency-management-plugin-documentation: https://docs.spring.io/dependency-management-plugin/docs/current/reference/html/
1414
:gradle-userguide: https://docs.gradle.org/current/userguide
1515
:gradle-dsl: https://docs.gradle.org/current/dsl
1616
:gradle-api: https://docs.gradle.org/current/javadoc

0 commit comments

Comments
 (0)