Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix typos and improve wording in reference documentation #32557

Closed
wants to merge 1 commit into from
Closed

Fix typos and improve wording in reference documentation #32557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework-docs/modules/ROOT/pages/web/webflux/controller/ann-methods/jackson.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Kotlin::
----
======

NOTE: `@JsonView` allows an array of view classes but you can only specify only one per
NOTE: `@JsonView` allows an array of view classes but you can specify only one per
controller method. Use a composite interface if you need to activate multiple views.


Expand Down
2 changes: 1 addition & 1 deletion framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jackson.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ to render the response content as XML. If the model contains multiple entries, y
explicitly set the object to be serialized by using the `modelKey` bean property. If the
model contains a single entry, it is serialized automatically.

You can customized XML mapping as needed by using JAXB or Jackson's provided
You can customize XML mapping as needed by using JAXB or Jackson's provided
annotations. When you need further control, you can inject a custom `XmlMapper`
through the `ObjectMapper` property, for cases where custom XML
you need to provide serializers and deserializers for specific types.
Expand Down
2 changes: 1 addition & 1 deletion framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ the HTML would be as follows:
----

What if we want to display the entire list of errors for a given page? The next example
shows that the `errors` tag also supports some basic wildcarding functionality.
shows that the `errors` tag also supports some basic wildcard functionality.

* `path="{asterisk}"`: Displays all errors.
* `path="lastName"`: Displays all errors associated with the `lastName` field.
Expand Down
4 changes: 2 additions & 2 deletions framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-async.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,8 +507,8 @@ The MVC configuration exposes the following options for asynchronous request pro

You can configure the following:

* Default timeout value for async requests, which if not set, depends
on the underlying Servlet container.
* The default timeout value for async requests depends
on the underlying Servlet container, unless it is set explicitly.
* `AsyncTaskExecutor` to use for blocking writes when streaming with
xref:web/webmvc/mvc-ann-async.adoc#mvc-ann-async-reactive-types[Reactive Types] and for
executing `Callable` instances returned from controller methods.
Expand Down
2 changes: 1 addition & 1 deletion framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-rest-exceptions.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Message codes and arguments for each error are also resolved via `MessageSource`
| `MethodArgumentNotValidException`
| (default)
| `+{0}+` the list of global errors, `+{1}+` the list of field errors.
Message codes and arguments for each error are also resolvedvia `MessageSource`.
Message codes and arguments for each error are also resolved via `MessageSource`.

| `MissingRequestHeaderException`
| (default)
Expand Down
2 changes: 1 addition & 1 deletion framework-docs/modules/ROOT/pages/web/webmvc/mvc-config/enable.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ You can use the `@EnableWebMvc` annotation to enable MVC configuration with prog

include-code::./WebConfiguration[tag=snippet,indent=0]

NOTE: When using Spring Boot, you may want to use `@Configuration` class of type `WebMvcConfigurer` but without `@EnableWebMvc` to keep Spring Boot MVC customizations. See more details in the xref:web/webmvc/mvc-config/customize.adoc[the MVC Config API section] and in {spring-boot-docs}/web.html#web.servlet.spring-mvc.auto-configuration[the dedicated Spring Boot documentation].
NOTE: When using Spring Boot, you may want to use `@Configuration` class of type `WebMvcConfigurer` but without `@EnableWebMvc` to keep Spring Boot MVC customizations. See more details in xref:web/webmvc/mvc-config/customize.adoc[the MVC Config API section] and in {spring-boot-docs}/web.html#web.servlet.spring-mvc.auto-configuration[the dedicated Spring Boot documentation].

The preceding example registers a number of Spring MVC
xref:web/webmvc/mvc-servlet/special-bean-types.adoc[infrastructure beans] and adapts to dependencies
Expand Down
2 changes: 1 addition & 1 deletion ...ork-docs/modules/ROOT/pages/web/websocket/stomp/application-context-events.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ received by implementing Spring's `ApplicationListener` interface:
While the "`simple`" broker becomes available immediately on startup and remains so while
the application is running, the STOMP "`broker relay`" can lose its connection
to the full featured broker (for example, if the broker is restarted). The broker relay
has reconnect logic and re-establishes the "`system`" connection to the broker
has reconnected logic and re-establishes the "`system`" connection to the broker
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"reconnect" was actually correct: it has logic that knows how to reconnect.

I suppose you could call it "reconnect-logic" (hyphenated) or leave out the part about "reconnect logic" since the next part discusses re-establishing the connection anyway.

when it comes back. As a result, this event is published whenever the state changes from connected
to disconnected and vice-versa. Components that use the `SimpMessagingTemplate` should
subscribe to this event and avoid sending messages at times when the broker is not
Expand Down