Skip to content

Commit

Permalink
Fix additional WebFlux-related links
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrannen committed Nov 20, 2023
1 parent f02e231 commit 4b5cb5f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
7 changes: 4 additions & 3 deletions framework-docs/modules/ROOT/pages/web-reactive.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ This part of the documentation covers support for reactive-stack web application
on a https://www.reactive-streams.org/[Reactive Streams] API to run on non-blocking
servers, such as Netty, Undertow, and Servlet containers. Individual chapters cover
the xref:web/webflux.adoc#webflux[Spring WebFlux] framework,
the reactive xref:web/webflux-webclient.adoc[`WebClient`], support for xref:web-reactive.adoc#webflux-test[testing],
and xref:web-reactive.adoc#webflux-reactive-libraries[reactive libraries]. For Servlet-stack web applications,
see xref:web.adoc[Web on Servlet Stack].
the reactive xref:web/webflux-webclient.adoc[`WebClient`],
support for xref:web/webflux-test.adoc[testing],
and xref:web/webflux-reactive-libraries.adoc[reactive libraries]. For Servlet-stack web
applications, see xref:web.adoc[Web on Servlet Stack].

6 changes: 1 addition & 5 deletions framework-docs/modules/ROOT/pages/web.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,5 @@
This part of the documentation covers support for Servlet-stack web applications built on the
Servlet API and deployed to Servlet containers. Individual chapters include xref:web/webmvc.adoc#mvc[Spring MVC],
xref:web/webmvc-view.adoc[View Technologies], xref:web/webmvc-cors.adoc[CORS Support], and xref:web/websocket.adoc[WebSocket Support].
For reactive-stack web applications, see xref:testing/unit.adoc#mock-objects-web-reactive[Web on Reactive Stack].




For reactive-stack web applications, see xref:web-reactive.adoc[Web on Reactive Stack].

7 changes: 2 additions & 5 deletions framework-docs/modules/ROOT/pages/web/webmvc.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@ but it is more commonly known as "Spring MVC".
Parallel to Spring Web MVC, Spring Framework 5.0 introduced a reactive-stack web framework
whose name, "Spring WebFlux," is also based on its source module
({spring-framework-main-code}/spring-webflux[`spring-webflux`]).
This chapter covers Spring Web MVC. The xref:web/webflux.adoc[next chapter]
covers Spring WebFlux.
This chapter covers Spring Web MVC. For reactive-stack web applications, see
xref:web-reactive.adoc[Web on Reactive Stack].

For baseline information and compatibility with Servlet container and Jakarta EE version
ranges, see the Spring Framework
https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Versions[Wiki].




0 comments on commit 4b5cb5f

Please sign in to comment.