Skip to content

Commit fec0bfe

Browse files
committed
Merge branch '6.2.x'
2 parents 03cce13 + 34315fc commit fec0bfe

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

Diff for: framework-docs/modules/ROOT/pages/web/webflux-view.adoc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[[webflux-view]]
22
= View Technologies
3+
34
[.small]#xref:web/webmvc-view.adoc[See equivalent in the Servlet stack]#
45

56
The rendering of views in Spring WebFlux is pluggable. Whether you decide to

Diff for: framework-docs/modules/ROOT/pages/web/webmvc-view.adoc

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[[mvc-view]]
22
= View Technologies
33
:page-section-summary-toc: 1
4+
45
[.small]#xref:web/webflux-view.adoc[See equivalent in the Reactive stack]#
56

67
The rendering of views in Spring MVC is pluggable. Whether you decide to use

Diff for: framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-freemarker.adoc

+1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ the `Configuration` object.
130130

131131
[[mvc-view-freemarker-forms]]
132132
== Form Handling
133+
[.small]#xref:web/webflux-view.adoc#webflux-view-freemarker-forms[See equivalent in the Reactive stack]#
133134

134135
Spring provides a tag library for use in JSPs that contains, among others, a
135136
`<spring:bind/>` element. This element primarily lets forms display values from

Diff for: framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-script.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ through https://www.webjars.org/[WebJars].
4747

4848
[[mvc-view-script-integrate]]
4949
== Script Templates
50-
[.small]#xref:web/webflux-view.adoc#webflux-view-script[See equivalent in the Reactive stack]#
50+
[.small]#xref:web/webflux-view.adoc#webflux-view-script-integrate[See equivalent in the Reactive stack]#
5151

5252
You can declare a `ScriptTemplateConfigurer` bean to specify the script engine to use,
5353
the script files to load, what function to call to render templates, and so on.

0 commit comments

Comments
 (0)