Merge branch '2.3.x' into 2.4.x

Closes gh-25600
This commit is contained in:
Andy Wilkinson 2021-03-11 09:40:00 +00:00
commit 979890189a

View File

@ -6,7 +6,7 @@ Spring Boot helps you to create Spring-powered, production-grade applications an
It takes an opinionated view of the Spring platform so that new and existing users can quickly get to the bits they need.
You can use Spring Boot to create stand-alone Java applications that can be started using `java -jar` or more traditional WAR deployments.
We also provide a command line tool that runs spring scripts.
We also provide a command line tool that runs Spring scripts.
Our primary goals are:
@ -102,7 +102,7 @@ The main library providing features that support the other parts of Spring Boot,
* The `SpringApplication` class, providing static convenience methods that can be used to write a stand-alone Spring Application.
Its sole job is to create and refresh an appropriate Spring `ApplicationContext`.
* Embedded web applications with a choice of container (Tomcat, Jetty or Undertow).
* First class externalized configuration support,
* First class externalized configuration support.
* Convenience `ApplicationContext` initializers, including support for sensible logging defaults.