Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

Browse Source 
Closes gh-26257
This commit is contained in:
Andy Wilkinson
2021-04-27 15:19:04 +01:00
parent c191009183 a1138efc5f
commit 6953da2013
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment.adoc
View File

@@ -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.

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc
View File

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