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

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Sam Brannen
2022-11-11 17:12:28 +01:00
parent e0b405869f 3ff308403a
commit 049eb98e00
6 changed files with 133 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework-docs/src/docs/asciidoc/integration.adoc
View File

@@ -4414,7 +4414,7 @@ asterisk.
* Two numbers separated with a hyphen (`-`) express a range of numbers.
The specified range is inclusive.
* Following a range (or `*`) with `/` specifies the interval of the number's value through the range.
* English names can also be used for the day-of-month and day-of-week fields.
* English names can also be used for the month and day-of-week fields.
Use the first three letters of the particular day or month (case does not matter).
* The day-of-month and day-of-week fields can contain a `L` character, which has a different meaning
** In the day-of-month field, `L` stands for _the last day of the month_.

2
framework-docs/src/docs/asciidoc/web/webflux.adoc
View File

@@ -1563,7 +1563,7 @@ extracts the name, version, and file extension:
URI path patterns can also have embedded `${...}` placeholders that are resolved on startup
through `PropertySourcesPlaceholderConfigurer` against local, system, environment, and
other property sources. You ca use this to, for example, parameterize a base URL based on
other property sources. You can use this to, for example, parameterize a base URL based on
some external configuration.
NOTE: Spring WebFlux uses `PathPattern` and the `PathPatternParser` for URI path matching support.