Sam Brannen 0bf85af8e9 Merge branch '6.0.x' ...

# Conflicts:
#	framework-docs/modules/ROOT/pages/integration/observability.adoc
#	spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java

2023-07-06 14:11:24 +02:00

..

cache

Enable Section Summary TOC for small pages

2023-05-04 15:35:05 +01:00

jms

Fix cross references

2023-05-04 15:35:05 +01:00

jmx

Enable Section Summary TOC for small pages

2023-05-04 15:35:05 +01:00

appendix.adoc

Trim IDs with parent

2023-05-04 15:35:05 +01:00

cache.adoc

Enable Section Summary TOC for small pages

2023-05-04 15:35:05 +01:00

checkpoint-restore.adoc

Rename checkpoint property to "spring.context.checkpoint"

2023-06-13 19:06:46 +02:00

email.adoc

Fix cross references

2023-05-04 15:35:05 +01:00

jms.adoc

Split files

2023-05-04 15:35:05 +01:00

jmx.adoc

Fix cross references

2023-05-04 15:35:05 +01:00

observability.adoc

Merge branch '6.0.x'

2023-07-06 14:11:24 +02:00

rest-clients.adoc

Polishing in MultipartFileArgumentResolver

2023-06-27 10:51:42 +01:00

scheduling.adoc

Polishing

2023-06-06 11:29:25 +02:00