Skip to content

Commit 2953e98

Browse files
committed
Merge branch '3.3.x'
2 parents 8b465e1 + b8655a8 commit 2953e98

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ See {code-spring-boot-autoconfigure-src}/orm/jpa/JpaBaseConfiguration.java[`JpaB
350350

351351
Spring Data JPA and Spring Data Mongo can both automatically create `Repository` implementations for you.
352352
If they are both present on the classpath, you might have to do some extra configuration to tell Spring Boot which repositories to create.
353-
The most explicit way to do that is to use the standard Spring Data `+@EnableJpaRepositories+` and `+@EnableMongoRepositories+` annotations and provide the location of your `Repository` interfaces.
353+
The most explicit way to do that is to use the standard Spring Data `@EnableJpaRepositories` and `@EnableMongoRepositories` annotations and provide the location of your `Repository` interfaces.
354354

355355
There are also flags (`+spring.data.*.repositories.enabled+` and `+spring.data.*.repositories.type+`) that you can use to switch the auto-configured repositories on and off in external configuration.
356356
Doing so is useful, for instance, in case you want to switch off the Mongo repositories and still use the auto-configured `MongoTemplate`.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Doing so leaves all MVC configuration in your hands.
196196
== Customize ViewResolvers
197197

198198
A `ViewResolver` is a core component of Spring MVC, translating view names in `@Controller` to actual `View` implementations.
199-
Note that `ViewResolvers` are mainly used in UI applications, rather than REST-style services (a `View` is not used to render a `@ResponseBody`).
199+
Note that view resolvers are mainly used in UI applications, rather than REST-style services (a `View` is not used to render a `@ResponseBody`).
200200
There are many implementations of `ViewResolver` to choose from, and Spring on its own is not opinionated about which ones you should use.
201201
Spring Boot, on the other hand, installs one or two for you, depending on what it finds on the classpath and in the application context.
202202
The `DispatcherServlet` uses all the resolvers it finds in the application context, trying each one in turn until it gets a result.

spring-boot-project/spring-boot-docs/src/docs/antora/modules/specification/pages/configuration-metadata/manual-hints.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ This provider supports the following parameters:
152152
|===
153153

154154

155-
The following metadata snippet corresponds to the standard `server.servlet.jsp.class-name` property that defines the `JspServlet` class name to use:
155+
The following metadata snippet corresponds to the standard `server.servlet.jsp.class-name` property that defines the class name to use must be an `HttpServlet`:
156156

157157
[source,json]
158158
----

0 commit comments

Comments
 (0)