Skip to content

Commit fb9d779

Browse files
committed
Merge pull request #41162 from mateusscheper
* pr/41162: Polish 'Improve readability of documentation' Improve readability of documentation Improving readability Closes gh-41162
2 parents dfa7359 + 955fe18 commit fb9d779

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/properties-and-configuration.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ See "`xref:reference:features/profiles.adoc[Profiles]`" in the "`Spring Boot fea
265265
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.
266266

267267
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.
268-
If the profile expression matches then that document is included in the final merge (otherwise, it is not), as shown in the following example:
268+
If the profile expression matches, then that document is included in the final merge (otherwise, it is not), as shown in the following example:
269269

270270
[configprops,yaml]
271271
----

spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/webserver.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,7 @@ Undertow supports `h2c` and `h2` out of the box.
294294
[[howto.webserver.configure]]
295295
== Configure the Web Server
296296

297-
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.
298-
See "`xref:properties-and-configuration.adoc#howto.properties-and-configuration.discover-build-in-options-for-external-properties[Discover Built-in Options for External Properties]`").
297+
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]`").
299298
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.
300299
See the list of xref:appendix:application-properties/index.adoc[Common Application Properties].
301300

0 commit comments

Comments
 (0)