Juergen Hoeller de6692e7d8 Merge branch '6.0.x' ... # Conflicts: # spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java		2023-10-10 21:58:31 +02:00
..
jdbc	Merge branch '6.0.x'	2023-09-14 09:30:40 +02:00
orm	Document EntityManager injection via constructors/@Autowired	2023-07-18 22:01:57 +02:00
transaction	Merge branch '6.0.x'	2023-10-10 21:58:31 +02:00
appendix.adoc	Trim IDs with parent	2023-05-04 15:35:05 +01:00
dao.adoc	Discuss JdbcTransactionManager vs DataSourceTransactionManager	2023-07-05 12:51:10 +02:00
jdbc.adoc	Split files	2023-05-04 15:35:05 +01:00
orm.adoc	Enable Section Summary TOC for small pages	2023-05-04 15:35:05 +01:00
oxm.adoc	Migrate to Asciidoctor Tabs	2023-05-04 15:35:05 +01:00
r2dbc.adoc	Add examples for new bind/map methods on DatabaseClient	2023-08-16 17:02:41 +02:00
transaction.adoc	Polishing	2023-08-06 14:59:44 +02:00