diff --git a/framework-docs/src/docs/asciidoc/web/webflux.adoc b/framework-docs/src/docs/asciidoc/web/webflux.adoc index c60c9d9c80..da62ad14a7 100644 --- a/framework-docs/src/docs/asciidoc/web/webflux.adoc +++ b/framework-docs/src/docs/asciidoc/web/webflux.adoc @@ -4409,7 +4409,7 @@ In the next example, given a request that starts with `/resources`, the relative used to find and serve static resources relative to `/static` on the classpath. Resources are served with a one-year future expiration to ensure maximum use of the browser cache and a reduction in HTTP requests made by the browser. The `Last-Modified` header is also -evaluated and, if present, a `304` status code is returned. The following list shows +evaluated and, if present, a `304` status code is returned. The following listing shows the example: [source,java,indent=0,subs="verbatim,quotes",role="primary"] diff --git a/framework-docs/src/docs/asciidoc/web/webmvc.adoc b/framework-docs/src/docs/asciidoc/web/webmvc.adoc index 76f8dedb4f..d6fd121f05 100644 --- a/framework-docs/src/docs/asciidoc/web/webmvc.adoc +++ b/framework-docs/src/docs/asciidoc/web/webmvc.adoc @@ -3,15 +3,15 @@ :doc-spring-security: {docs-site}/spring-security/reference Spring Web MVC is the original web framework built on the Servlet API and has been included -in the Spring Framework from the very beginning. The formal name, "`Spring Web MVC,`" +in the Spring Framework from the very beginning. The formal name, "Spring Web MVC," comes from the name of its source module ({spring-framework-main-code}/spring-webmvc[`spring-webmvc`]), -but it is more commonly known as "`Spring MVC`". +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 +whose name, "Spring WebFlux," is also based on its source module ({spring-framework-main-code}/spring-webflux[`spring-webflux`]). -This section covers Spring Web MVC. The <> +This chapter covers Spring Web MVC. The <> covers Spring WebFlux. For baseline information and compatibility with Servlet container and Jakarta EE version