Skip to content

Commit 8845b31

Browse files
committed
Merge branch '3.5.x' into 4.0.x
Closes gh-50619
2 parents 3209464 + 6d44476 commit 8845b31

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

  • build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages
  • documentation/spring-boot-docs/src/docs/antora/modules
    • appendix/pages/deprecated-application-properties
    • tutorial/pages/first-application

build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/getting-started.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ To get started with the plugin it needs to be applied to your project.
66
ifeval::["{build-type}" == "commercial"]
77
The plugin is published to the Spring Commercial repository.
88
You will have to configure your build to access this repository.
9-
This is usual done through a local artifact repository that mirrors the content of the Spring Commercial repository.
9+
This is usually done through a local artifact repository that mirrors the content of the Spring Commercial repository.
1010
Alternatively, while it is not recommended, the Spring Commercial repository can also be accessed directly.
1111
In either case, see https://docs.vmware.com/en/Tanzu-Spring-Runtime/Commercial/Tanzu-Spring-Runtime/spring-enterprise-subscription.html[the Tanzu Spring Runtime documentation] for further details.
1212

documentation/spring-boot-docs/src/docs/antora/modules/appendix/pages/deprecated-application-properties/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
= Deprecated Application Properties
44

55
The following deprecated properties can be specified inside your `application.properties` file, inside your `application.yaml` file, or as command line switches.
6-
Support for these properties will be removed in a future release and should you should migrate away from them.
6+
Support for these properties will be removed in a future release and you should migrate away from them.
77

88
[TIP]
99
====

documentation/spring-boot-docs/src/docs/antora/modules/tutorial/pages/first-application/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ endif::[]
132132

133133
ifeval::["{build-type}" == "commercial"]
134134
You will also have to configure your build to access the Spring Commercial repository.
135-
This is usual done through a local artifact repository that mirrors the content of the Spring Commercial repository.
135+
This is usually done through a local artifact repository that mirrors the content of the Spring Commercial repository.
136136
Alternatively, while it is not recommended, the Spring Commercial repository can also be accessed directly.
137137
In either case, see https://docs.vmware.com/en/Tanzu-Spring-Runtime/Commercial/Tanzu-Spring-Runtime/spring-enterprise-subscription.html[the Tanzu Spring Runtime documentation] for further details.
138138

0 commit comments

Comments
 (0)