From 5733065ba45f4512bb2e569e1c443faad91628b0 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 28 Sep 2017 01:16:51 -0400 Subject: [PATCH] Rename webflux-client.adoc to webflux-webclient.adoc --- src/docs/asciidoc/integration.adoc | 3 ++- .../web/{webflux-client.adoc => webflux-webclient.adoc} | 0 src/docs/asciidoc/web/webflux.adoc | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) rename src/docs/asciidoc/web/{webflux-client.adoc => webflux-webclient.adoc} (100%) diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc index 294af0b4fc..b03430dc7e 100644 --- a/src/docs/asciidoc/integration.adoc +++ b/src/docs/asciidoc/integration.adoc @@ -1347,7 +1347,8 @@ The `AsyncRestTemplate` is deprecated. Please use the <> instead. -include::web/webflux-client.adoc[leveloffset=+3] + +include::web/webflux-webclient.adoc[leveloffset=+3] diff --git a/src/docs/asciidoc/web/webflux-client.adoc b/src/docs/asciidoc/web/webflux-webclient.adoc similarity index 100% rename from src/docs/asciidoc/web/webflux-client.adoc rename to src/docs/asciidoc/web/webflux-webclient.adoc diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc index 3d66e23b30..b615aadadf 100644 --- a/src/docs/asciidoc/web/webflux.adoc +++ b/src/docs/asciidoc/web/webflux.adoc @@ -16,9 +16,9 @@ and co-exist side by side in the Spring Framework. Each module is optional. Applications may use one or the other module, or in some cases both -- e.g. Spring MVC controllers with the reactive `WebClient`. -In addition to the WebFlux web framework, the `spring-webflux` module includes several -other reactive components such as a <> for performing HTTP requests, -a `WebTestClient` for testing web endpoints, and WebSocket support. +In addition to the web framework, Spring WebFlux also provides a <> for +performing HTTP requests, a `WebTestClient` for testing web endpoints, and +also client and server reactive, WebSocket support. [[webflux-new-framework]] @@ -1386,7 +1386,7 @@ from the base class and you can still have any number of other ``WebMvcConfigure the classpath. -include::webflux-client.adoc[leveloffset=+1] +include::webflux-webclient.adoc[leveloffset=+1] [[webflux-reactive-libraries]]