From d9e71f7a670d9e79f05dd0adbeb32c49c1975ebc Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Fri, 27 Oct 2023 17:50:24 +0100
Subject: [PATCH] Add documentation section on AOP

Closes gh-32642
---
 .../spring-boot-docs/src/docs/asciidoc/features.adoc     | 2 ++
 .../spring-boot-docs/src/docs/asciidoc/features/aop.adoc | 9 +++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/aop.adoc

diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features.adoc
index d42c2951d2e..ee282edfc1a 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features.adoc
@@ -20,6 +20,8 @@ include::features/logging.adoc[]
 
 include::features/internationalization.adoc[]
 
+include::features/aop.adoc[]
+
 include::features/json.adoc[]
 
 include::features/task-execution-and-scheduling.adoc[]
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/aop.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/aop.adoc
new file mode 100644
index 00000000000..01dea512bdf
--- /dev/null
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/aop.adoc
@@ -0,0 +1,9 @@
+[[features.aop]]
+== Aspect-Oriented Programming
+Spring Boot provides auto-configuration for aspect-oriented programming (AOP).
+You can learn more about AOP with Spring in the {spring-framework-docs}/core.html#aop[Spring Framework reference documentation].
+
+By default, Spring Boot's auto-configuration configures Spring AOP to use CGLib proxies.
+To use JDK proxies instead, set `configprop:spring.aop.proxy-target-class` to `false`.
+
+If AspectJ is on the classpath, Spring Boot's auto-configuration will automatically enable AspectJ auto proxy such that `@EnableAspectJAutoProxy` is not required.