Browse Source

Merge branch '5.1.x'

pull/22291/head
Sebastien Deleuze 7 years ago
parent
commit
81ec1d8284
  1. 2
      src/docs/asciidoc/web/webflux.adoc
  2. 2
      src/docs/asciidoc/web/webmvc-view.adoc
  3. 2
      src/docs/asciidoc/web/webmvc.adoc

2
src/docs/asciidoc/web/webflux.adoc

@ -2382,7 +2382,7 @@ for the body. @@ -2382,7 +2382,7 @@ for the body.
Spring offers support for the Jackson JSON library.
[[webflux-ann-jsonview]]
===== Jackson Serialization Views
===== JSON Views
[.small]#<<web.adoc#mvc-ann-jackson,Same as in Spring MVC>>#
Spring WebFlux provides built-in support for

2
src/docs/asciidoc/web/webmvc-view.adoc

@ -1899,7 +1899,7 @@ Spring offers support for the Jackson JSON library. @@ -1899,7 +1899,7 @@ Spring offers support for the Jackson JSON library.
[[mvc-view-json-mapping]]
=== Jackson-based JSON Views
=== Jackson-based JSON MVC Views
[.small]#<<web-reactive.adoc#webflux-view-httpmessagewriter,Same as in Spring WebFlux>>#
The `MappingJackson2JsonView` uses the Jackson library's `ObjectMapper` to render the response

2
src/docs/asciidoc/web/webmvc.adoc

@ -2688,7 +2688,7 @@ types for the body. @@ -2688,7 +2688,7 @@ types for the body.
Spring offers support for the Jackson JSON library.
[[mvc-ann-jsonview]]
===== Jackson Serialization Views
===== JSON Views
[.small]#<<web-reactive.adoc#webflux-ann-jsonview,Same as in Spring WebFlux>>#
Spring MVC provides built-in support for

Loading…
Cancel
Save