mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge pull request #41162 from mateusscheper
* pr/41162: Polish 'Improve readability of documentation' Improve readability of documentation Improving readability Closes gh-41162
This commit is contained in:
commit
fb9d779aeb
|
@ -265,7 +265,7 @@ See "`xref:reference:features/profiles.adoc[Profiles]`" in the "`Spring Boot fea
|
|||
Spring Boot supports multi-document YAML and Properties files (see xref:reference:features/external-config.adoc#features.external-config.files.multi-document[Working With Multi-Document Files] for details) which can be activated conditionally based on the active profiles.
|
||||
|
||||
If a document contains a `spring.config.activate.on-profile` key, then the profiles value (a comma-separated list of profiles or a profile expression) is fed into the Spring `Environment.acceptsProfiles()` method.
|
||||
If the profile expression matches then that document is included in the final merge (otherwise, it is not), as shown in the following example:
|
||||
If the profile expression matches, then that document is included in the final merge (otherwise, it is not), as shown in the following example:
|
||||
|
||||
[configprops,yaml]
|
||||
----
|
||||
|
|
|
@ -294,8 +294,7 @@ Undertow supports `h2c` and `h2` out of the box.
|
|||
[[howto.webserver.configure]]
|
||||
== Configure the Web Server
|
||||
|
||||
Generally, you should first consider using one of the many available configuration keys and customize your web server by adding new entries in your `application.properties` or `application.yaml` file.
|
||||
See "`xref:properties-and-configuration.adoc#howto.properties-and-configuration.discover-build-in-options-for-external-properties[Discover Built-in Options for External Properties]`").
|
||||
Generally, you should first consider using one of the many available configuration keys and customize your web server by adding new entries in your `application.properties` or `application.yaml` file (see "`xref:properties-and-configuration.adoc#howto.properties-and-configuration.discover-build-in-options-for-external-properties[Discover Built-in Options for External Properties]`").
|
||||
The `server.{asterisk}` namespace is quite useful here, and it includes namespaces like `server.tomcat.{asterisk}`, `server.jetty.{asterisk}` and others, for server-specific features.
|
||||
See the list of xref:appendix:application-properties/index.adoc[Common Application Properties].
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user