Fix cross references

Author: rwinch

framework-docs/modules/ROOT/pages/appendix.adoc

@@ -30,7 +30,7 @@ for details.
 
 | `spring.expression.compiler.mode`
 | The mode to use when compiling expressions for the
-<<core.adoc#expressions-compiler-configuration, Spring Expression Language>>.
+xref:core/expressions/evaluation.adoc#expressions-compiler-configuration[Spring Expression Language].
 
 | `spring.getenv.ignore`
 | Instructs Spring to ignore operating system environment variables if a Spring
@@ -41,12 +41,12 @@ for details.
 
 | `spring.index.ignore`
 | Instructs Spring to ignore the components index located in
-`META-INF/spring.components`. See <<core.adoc#beans-scanning-index, Generating an Index
-of Candidate Components>>.
+`META-INF/spring.components`. See xref:core/beans/classpath-scanning.adoc#beans-scanning-index[Generating an Index of Candidate Components]
+.
 
 | `spring.jdbc.getParameterType.ignore`
 | Instructs Spring to ignore `java.sql.ParameterMetaData.getParameterType` completely.
-See the note in <<data-access.adoc#jdbc-batch-list, Batch Operations with a List of Objects>>.
+See the note in xref:data-access/jdbc/advanced.adoc#jdbc-batch-list[Batch Operations with a List of Objects].
 
 | `spring.jndi.ignore`
 | Instructs Spring to ignore a default JNDI environment, as an optimization for scenarios
@@ -62,17 +62,17 @@ for details.
 
 | `spring.test.constructor.autowire.mode`
 | The default _test constructor autowire mode_ to use if `@TestConstructor` is not present
-on a test class. See <<testing.adoc#integration-testing-annotations-testconstructor,
-Changing the default test constructor autowire mode>>.
+on a test class. See xref:testing/annotations/integration-junit-jupiter.adoc#integration-testing-annotations-testconstructor[Changing the default test constructor autowire mode]
+.
 
 | `spring.test.context.cache.maxSize`
 | The maximum size of the context cache in the _Spring TestContext Framework_. See
-<<testing.adoc#testcontext-ctx-management-caching, Context Caching>>.
+xref:testing/testcontext-framework/ctx-management/caching.adoc[Context Caching].
 
 | `spring.test.enclosing.configuration`
 | The default _enclosing configuration inheritance mode_ to use if
 `@NestedTestConfiguration` is not present on a test class. See
-<<testing.adoc#integration-testing-annotations-nestedtestconfiguration, Changing the
-default enclosing configuration inheritance mode>>.
+xref:testing/annotations/integration-junit-jupiter.adoc#integration-testing-annotations-nestedtestconfiguration[Changing the default enclosing configuration inheritance mode]
+.
 
 |===

framework-docs/modules/ROOT/pages/core/aop-api/concise-proxy.adoc

@@ -58,7 +58,7 @@ we override the transaction propagation settings:
 
 Note that in the parent bean example, we explicitly marked the parent bean definition as
 being abstract by setting the `abstract` attribute to `true`, as described
-<<beans-child-bean-definitions, previously>>, so that it may not actually ever be
+xref:core/beans/child-bean-definitions.adoc[previously], so that it may not actually ever be
 instantiated. Application contexts (but not simple bean factories), by default,
 pre-instantiate all singletons. Therefore, it is important (at least for singleton beans)
 that, if you have a (parent) bean definition that you intend to use only as a template,

framework-docs/modules/ROOT/pages/core/aop-api/pfb.adoc

@@ -40,15 +40,15 @@ In common with most `FactoryBean` implementations provided with Spring, the
 `ProxyFactoryBean` class is itself a JavaBean. Its properties are used to:
 
 * Specify the target you want to proxy.
-* Specify whether to use CGLIB (described later and see also <<aop-pfb-proxy-types>>).
+* Specify whether to use CGLIB (described later and see also xref:core/aop-api/pfb.adoc#aop-pfb-proxy-types[JDK- and CGLIB-based proxies]).
 
 Some key properties are inherited from `org.springframework.aop.framework.ProxyConfig`
 (the superclass for all AOP proxy factories in Spring). These key properties include
 the following:
 
 * `proxyTargetClass`: `true` if the target class is to be proxied, rather than the
   target class's interfaces. If this property value is set to `true`, then CGLIB proxies
-  are created (but see also <<aop-pfb-proxy-types>>).
+  are created (but see also xref:core/aop-api/pfb.adoc#aop-pfb-proxy-types[JDK- and CGLIB-based proxies]).
 * `optimize`: Controls whether or not aggressive optimizations are applied to proxies
   created through CGLIB. You should not blithely use this setting unless you fully
   understand how the relevant AOP proxy handles optimization. This is currently used
@@ -66,7 +66,7 @@ the following:
 Other properties specific to `ProxyFactoryBean` include the following:
 
 * `proxyInterfaces`: An array of `String` interface names. If this is not supplied, a CGLIB
-  proxy for the target class is used (but see also <<aop-pfb-proxy-types>>).
+  proxy for the target class is used (but see also xref:core/aop-api/pfb.adoc#aop-pfb-proxy-types[JDK- and CGLIB-based proxies]).
 * `interceptorNames`: A `String` array of `Advisor`, interceptor, or other advice names to
   apply. Ordering is significant, on a first come-first served basis. That is to say
   that the first interceptor in the list is the first to be able to intercept the
@@ -78,7 +78,7 @@ factories. You cannot mention bean references here, since doing so results in th
 +
 You can append an interceptor name with an asterisk (`*`). Doing so results in the
 application of all advisor beans with names that start with the part before the asterisk
-to be applied. You can find an example of using this feature in <<aop-global-advisors>>.
+to be applied. You can find an example of using this feature in xref:core/aop-api/pfb.adoc#aop-global-advisors[Using "`Global`" Advisors].
 
 * singleton: Whether or not the factory should return a single object, no matter how
   often the `getObject()` method is called. Several `FactoryBean` implementations offer

framework-docs/modules/ROOT/pages/core/aop-api/pointcuts.adoc

@@ -92,7 +92,7 @@ Since 2.0, the most important type of pointcut used by Spring is
 `org.springframework.aop.aspectj.AspectJExpressionPointcut`. This is a pointcut that
 uses an AspectJ-supplied library to parse an AspectJ pointcut expression string.
 
-See the <<aop, previous chapter>> for a discussion of supported AspectJ pointcut primitives.
+See the xref:core/aop.adoc[previous chapter] for a discussion of supported AspectJ pointcut primitives.
 
 
 

framework-docs/modules/ROOT/pages/core/aop.adoc

@@ -15,18 +15,18 @@ to), AOP complements Spring IoC to provide a very capable middleware solution.
 .Spring AOP with AspectJ pointcuts
 ****
 Spring provides simple and powerful ways of writing custom aspects by using either a
-<<aop-schema, schema-based approach>> or the <<aop-ataspectj, @AspectJ annotation style>>.
+xref:core/aop/schema.adoc[schema-based approach] or the xref:core/aop/ataspectj.adoc[@AspectJ annotation style].
 Both of these styles offer fully typed advice and use of the AspectJ pointcut language
 while still using Spring AOP for weaving.
 
 This chapter discusses the schema- and @AspectJ-based AOP support.
-The lower-level AOP support is discussed in <<aop-api, the following chapter>>.
+The lower-level AOP support is discussed in xref:core/aop-api.adoc[the following chapter].
 ****
 
 AOP is used in the Spring Framework to:
 
 * Provide declarative enterprise services. The most important such service is
-  <<data-access.adoc#transaction-declarative, declarative transaction management>>.
+  xref:data-access/transaction/declarative.adoc[declarative transaction management].
 * Let users implement custom aspects, complementing their use of OOP with AOP.
 
 NOTE: If you are interested only in generic declarative services or other pre-packaged

framework-docs/modules/ROOT/pages/core/aop/aspectj-programmatic.adoc

@@ -4,7 +4,7 @@
 In addition to declaring aspects in your configuration by using either `<aop:config>`
 or `<aop:aspectj-autoproxy>`, it is also possible to programmatically create proxies
 that advise target objects. For the full details of Spring's AOP API, see the
-<<aop-api, next chapter>>. Here, we want to focus on the ability to automatically
+xref:core/aop-api.adoc[next chapter]. Here, we want to focus on the ability to automatically
 create proxies by using @AspectJ aspects.
 
 You can use the `org.springframework.aop.aspectj.annotation.AspectJProxyFactory` class

framework-docs/modules/ROOT/pages/core/aop/ataspectj.adoc

@@ -9,7 +9,7 @@ for pointcut parsing and matching. The AOP runtime is still pure Spring AOP, tho
 there is no dependency on the AspectJ compiler or weaver.
 
 NOTE: Using the AspectJ compiler and weaver enables use of the full AspectJ language and
-is discussed in <<aop-using-aspectj>>.
+is discussed in xref:core/aop/using-aspectj.adoc[Using AspectJ with Spring Applications].
 
 
 

framework-docs/modules/ROOT/pages/core/aop/ataspectj/advice.adoc

@@ -3,7 +3,7 @@
 
 Advice is associated with a pointcut expression and runs before, after, or around method
 executions matched by the pointcut. The pointcut expression may be either an _inline
-pointcut_ or a reference to a <<aop-common-pointcuts,_named pointcut_>>.
+pointcut_ or a reference to a xref:core/aop/ataspectj/pointcuts.adoc#aop-common-pointcuts[_named pointcut_].
 
 
 [[aop-advice-before]]
@@ -44,7 +44,7 @@ The following example uses an inline pointcut expression.
 	}
 ----
 
-If we use a <<aop-common-pointcuts,named pointcut>>, we can rewrite the preceding example
+If we use a xref:core/aop/ataspectj/pointcuts.adoc#aop-common-pointcuts[named pointcut], we can rewrite the preceding example
 as follows:
 
 [source,java,indent=0,subs="verbatim",role="primary"]
@@ -352,7 +352,7 @@ execution-only semantics. You only need to be aware of this difference if you co
 `@AspectJ` aspects written for Spring and use `proceed` with arguments with the AspectJ
 compiler and weaver. There is a way to write such aspects that is 100% compatible across
 both Spring AOP and AspectJ, and this is discussed in the
-<<aop-ataspectj-advice-proceeding-with-the-call, following section on advice parameters>>.
+xref:core/aop/ataspectj/advice.adoc#aop-ataspectj-advice-proceeding-with-the-call[following section on advice parameters].
 ====
 
 The value returned by the around advice is the return value seen by the caller of the
@@ -536,7 +536,7 @@ The following shows the advice that matches the execution of `@Auditable` method
 		// ...
 	}
 ----
-<1> References the `publicMethod` named pointcut defined in <<aop-pointcuts-combining>>.
+<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
 
 [source,kotlin,indent=0,subs="verbatim",role="secondary"]
 .Kotlin
@@ -547,7 +547,7 @@ The following shows the advice that matches the execution of `@Auditable` method
 		// ...
 	}
 ----
-<1> References the `publicMethod` named pointcut defined in <<aop-pointcuts-combining>>.
+<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
 
 [[aop-ataspectj-advice-params-generics]]
 === Advice Parameters and Generics
@@ -633,7 +633,7 @@ of determining parameter names, an exception will be thrown.
 
 `AspectJAnnotationParameterNameDiscoverer` :: Uses parameter names that have been explicitly
   specified by the user via the `argNames` attribute in the corresponding advice or
-  pointcut annotation. See <<aop-ataspectj-advice-params-names-explicit>> for details.
+  pointcut annotation. See xref:core/aop/ataspectj/advice.adoc#aop-ataspectj-advice-params-names-explicit[Explicit Argument Names] for details.
 `KotlinReflectionParameterNameDiscoverer` :: Uses Kotlin reflection APIs to determine
   parameter names. This discoverer is only used if such APIs are present on the classpath.
 `StandardReflectionParameterNameDiscoverer` :: Uses the standard `java.lang.reflect.Parameter`
@@ -679,7 +679,7 @@ The following example shows how to use the `argNames` attribute:
 		// ... use code and bean
 	}
 ----
-<1> References the `publicMethod` named pointcut defined in <<aop-pointcuts-combining>>.
+<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
 <2> Declares `bean` and `auditable` as the argument names.
 
 [source,kotlin,indent=0,subs="verbatim",role="secondary"]
@@ -693,7 +693,7 @@ The following example shows how to use the `argNames` attribute:
 		// ... use code and bean
 	}
 ----
-<1> References the `publicMethod` named pointcut defined in <<aop-pointcuts-combining>>.
+<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
 <2> Declares `bean` and `auditable` as the argument names.
 
 If the first parameter is of type `JoinPoint`, `ProceedingJoinPoint`, or
@@ -712,7 +712,7 @@ point object, the `argNames` attribute does not need to include it:
 		// ... use code, bean, and jp
 	}
 ----
-<1> References the `publicMethod` named pointcut defined in <<aop-pointcuts-combining>>.
+<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
 <2> Declares `bean` and `auditable` as the argument names.
 
 [source,kotlin,indent=0,subs="verbatim",role="secondary"]
@@ -726,7 +726,7 @@ point object, the `argNames` attribute does not need to include it:
 		// ... use code, bean, and jp
 	}
 ----
-<1> References the `publicMethod` named pointcut defined in <<aop-pointcuts-combining>>.
+<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
 <2> Declares `bean` and `auditable` as the argument names.
 
 The special treatment given to the first parameter of type `JoinPoint`,
@@ -743,7 +743,7 @@ the `argNames` attribute:
 		// ... use jp
 	}
 ----
-<1> References the `publicMethod` named pointcut defined in <<aop-pointcuts-combining>>.
+<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
 
 [source,kotlin,indent=0,subs="verbatim",role="secondary"]
 .Kotlin
@@ -753,7 +753,7 @@ the `argNames` attribute:
 		// ... use jp
 	}
 ----
-<1> References the `publicMethod` named pointcut defined in <<aop-pointcuts-combining>>.
+<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
 
 
 [[aop-ataspectj-advice-proceeding-with-the-call]]
@@ -776,7 +776,7 @@ The following example shows how to do so:
 		return pjp.proceed(new Object[] {newPattern});
 	}
 ----
-<1> References the `inDataAccessLayer` named pointcut defined in <<aop-common-pointcuts>>.
+<1> References the `inDataAccessLayer` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-common-pointcuts[Sharing Named Pointcut Definitions].
 
 [source,kotlin,indent=0,subs="verbatim",role="secondary"]
 .Kotlin
@@ -790,7 +790,7 @@ The following example shows how to do so:
 		return pjp.proceed(arrayOf<Any>(newPattern))
 	}
 ----
-<1> References the `inDataAccessLayer` named pointcut defined in <<aop-common-pointcuts>>.
+<1> References the `inDataAccessLayer` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-common-pointcuts[Sharing Named Pointcut Definitions].
 
 In many cases, you do this binding anyway (as in the preceding example).
 

framework-docs/modules/ROOT/pages/core/aop/ataspectj/aspectj-support.adoc

@@ -47,8 +47,8 @@ element, as the following example shows:
 ----
 
 This assumes that you use schema support as described in
-<<core.adoc#core.appendix.xsd-schemas, XML Schema-based configuration>>.
-See <<core.adoc#core.appendix.xsd-schemas-aop, the AOP schema>> for how to
+xref:core/appendix/xsd-schemas.adoc[XML Schema-based configuration].
+See xref:core/appendix/xsd-schemas.adoc#core.appendix.xsd-schemas-aop[the AOP schema] for how to
 import the tags in the `aop` namespace.
 
 

framework-docs/modules/ROOT/pages/core/aop/ataspectj/example.adoc

@@ -56,7 +56,7 @@ call `proceed` multiple times. The following listing shows the basic aspect impl
 		}
 	}
 ----
-<1> References the `businessService` named pointcut defined in <<aop-common-pointcuts>>.
+<1> References the `businessService` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-common-pointcuts[Sharing Named Pointcut Definitions].
 
 [source,kotlin,indent=0,subs="verbatim",role="secondary"]
 .Kotlin
@@ -97,7 +97,7 @@ call `proceed` multiple times. The following listing shows the basic aspect impl
 		}
 	}
 ----
-<1> References the `businessService` named pointcut defined in <<aop-common-pointcuts>>.
+<1> References the `businessService` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-common-pointcuts[Sharing Named Pointcut Definitions].
 
 Note that the aspect implements the `Ordered` interface so that we can set the precedence of
 the aspect higher than the transaction advice (we want a fresh transaction each time we