From 0f54585f05734a21324600b0cd1ea07826acb66f Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 9 Apr 2021 16:54:32 +0200 Subject: [PATCH] Polish contribution See gh-26782 --- src/docs/asciidoc/core/core-appendix.adoc | 6 +++--- src/docs/asciidoc/core/core-beans.adoc | 17 +++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/docs/asciidoc/core/core-appendix.adoc b/src/docs/asciidoc/core/core-appendix.adoc index 6f51617537..cc5fd0b3d8 100644 --- a/src/docs/asciidoc/core/core-appendix.adoc +++ b/src/docs/asciidoc/core/core-appendix.adoc @@ -568,9 +568,9 @@ is a convenience mechanism that sets up a <> model -* <>, `@Value` and `@Lookup` -* JSR-250's `@Resource`, `@PostConstruct` and `@PreDestroy` (if available) -* JAX-WS `@WebServiceRef` and EJB3 `@EJB` (if available) +* <>, `@Value`, and `@Lookup` +* JSR-250's `@Resource`, `@PostConstruct`, and `@PreDestroy` (if available) +* JAX-WS's `@WebServiceRef` and EJB 3's `@EJB` (if available) * JPA's `@PersistenceContext` and `@PersistenceUnit` (if available) * Spring's <> diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc index 848170be70..9d6f5d9731 100644 --- a/src/docs/asciidoc/core/core-beans.adoc +++ b/src/docs/asciidoc/core/core-beans.adoc @@ -4607,8 +4607,8 @@ Annotation injection is performed before XML injection. Thus, the XML configurat overrides the annotations for properties wired through both approaches. ==== -As always, you can register them as individual bean definitions, but they can also be -implicitly registered by including the following tag in an XML-based Spring +As always, you can register the post-processors as individual bean definitions, but they +can also be implicitly registered by including the following tag in an XML-based Spring configuration (notice the inclusion of the `context` namespace): [source,xml,indent=0,subs="verbatim,quotes"] @@ -4627,12 +4627,13 @@ configuration (notice the inclusion of the `context` namespace): ---- -(The implicitly registered post-processors include -{api-spring-framework}/context/annotation/ConfigurationClassPostProcessor.html[`ConfigurationClassPostProcessor`] -{api-spring-framework}/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.html[`AutowiredAnnotationBeanPostProcessor`], -{api-spring-framework}/context/annotation/CommonAnnotationBeanPostProcessor.html[`CommonAnnotationBeanPostProcessor`], -{api-spring-framework}/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.html[`PersistenceAnnotationBeanPostProcessor`], and -{api-spring-framework}/context/event/EventListenerMethodProcessor.html[`EventListenerMethodProcessor.html`].) +The `` element implicitly registers the following post-processors: + +* {api-spring-framework}/context/annotation/ConfigurationClassPostProcessor.html[`ConfigurationClassPostProcessor`] +* {api-spring-framework}/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.html[`AutowiredAnnotationBeanPostProcessor`] +* {api-spring-framework}/context/annotation/CommonAnnotationBeanPostProcessor.html[`CommonAnnotationBeanPostProcessor`] +* {api-spring-framework}/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.html[`PersistenceAnnotationBeanPostProcessor`] +* {api-spring-framework}/context/event/EventListenerMethodProcessor.html[`EventListenerMethodProcessor`] [NOTE] ====