Merge branch '3.4.x' into 3.5.x

Closes gh-48227

Author: wilkinsona

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/MyAutoConfiguration.kt

@@ -16,11 +16,11 @@
 
 package org.springframework.boot.docs.features.developingautoconfiguration.conditionannotations.beanconditions
 
+import org.springframework.boot.autoconfigure.AutoConfiguration
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 class MyAutoConfiguration {
 
 	@Bean

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/MyAutoConfiguration.kt

@@ -16,12 +16,13 @@
 
 package org.springframework.boot.docs.features.developingautoconfiguration.conditionannotations.classconditions
 
+import org.springframework.boot.autoconfigure.AutoConfiguration
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 // Some conditions ...
 class MyAutoConfiguration {