diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java index e3ec37bf0cf..d6b3f8ec10b 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java @@ -120,7 +120,7 @@ import org.springframework.stereotype.Component; * * Externalized values may be looked up by injecting the Spring * {@link org.springframework.core.env.Environment} into a {@code @Configuration} - * class the usual (e.g. using the {@code @Autowired} annotation): + * class as usual (e.g. using the {@code @Autowired} annotation): * *
* @Configuration
@@ -138,8 +138,8 @@ import org.springframework.stereotype.Component;
*
* Properties resolved through the {@code Environment} reside in one or more "property
* source" objects, and {@code @Configuration} classes may contribute property sources to
- * the {@code Environment} object using
- * the {@link org.springframework.core.env.PropertySources @PropertySources} annotation:
+ * the {@code Environment} object using the {@link PropertySource @PropertySource}
+ * annotation:
*
*
* @Configuration
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index 9bd4a325d08..fb9ad9779fb 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -2386,7 +2386,7 @@ configured locally as depicted in the following example.
----
The specified `WorkManager` may also point to an environment-specific thread pool -
-typically through `SimpleTaskWorkManager's` "asyncTaskExecutor" property. Consider
+typically through ``SimpleTaskWorkManager``'s "asyncTaskExecutor" property. Consider
defining a shared thread pool for all your `ResourceAdapter` instances if you happen to
use multiple adapters.
diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc
index adcdb16fb8b..414f575243e 100644
--- a/src/docs/asciidoc/web/webflux.adoc
+++ b/src/docs/asciidoc/web/webflux.adoc
@@ -2598,8 +2598,8 @@ You can use `ResourceUrlProvider` to rewrite URLs and apply the full chain of re
transformers -- e.g. to insert versions. The WebFlux config provides a `ResourceUrlProvider`
so it can be injected into others.
-Unlike Spring MVC at present in WebFlux there is no way to transparely rewrite static
-resource URLs since the are no view technologies that can make use of a non-blocking chain
+Unlike Spring MVC at present in WebFlux there is no way to transparently rewrite static
+resource URLs since there are no view technologies that can make use of a non-blocking chain
of resolvers and transformers (e.g. resources on Amazon S3). When serving only local
resources the workaround is to use `ResourceUrlProvider` directly (e.g. through a custom
tag) and block for 0 seconds.