Merge branch '2.4.x'

Closes gh-26257

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.

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

@@ -1157,7 +1157,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`'.

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