Merge branch '2.5.x'

Closes gh-28550
spring-projects · Nov 8, 2021 · 98d3e99 · 98d3e99
2 parents c05223d + 91f7ff3
commit 98d3e99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ct/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging.adoc b/...ct/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging.adoc
@@ -353,7 +353,7 @@ These closures are evaluated in the order that they are defined, from top to bot
 Any content not claimed by an earlier `intoLayer` closure remains available for subsequent ones to consider.
 
 The `intoLayer` closure claims content using nested `include` and `exclude` calls.
-The `application` closure uses Ant-style patch matching for include/exclude parameters.
+The `application` closure uses Ant-style path matching for include/exclude parameters.
 The `dependencies` section uses `group:artifact[:version]` patterns.
 It also provides `includeProjectDependencies()` and `excludeProjectDependencies()` methods that can be used to include or exclude project dependencies.
 

diff --git a/...ect/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc b/...ect/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc
@@ -100,7 +100,7 @@ The blocks are evaluated in the order that they are defined, from top to bottom.
 Any content not claimed by an earlier block remains available for subsequent blocks to consider.
 
 The `<into>` block claims content using nested `<include>` and `<exclude>` elements.
-The `<application>` section uses Ant-style patch matching for include/exclude expressions.
+The `<application>` section uses Ant-style path matching for include/exclude expressions.
 The `<dependencies>` section uses `group:artifact[:version]` patterns.
 It also provides `<includeModuleDependencies />` and `<excludeModuleDependencies />` elements that can be used to include or exclude local module dependencies.