Merge branch 'wip/6.0_merge_main' into wip/6.0

hibernate · Nov 16, 2021 · 2e74d02 · 2e74d02
2 parents 37703e2 + 0c0fab9
commit 2e74d02
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc b/documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc
@@ -315,7 +315,7 @@ In the `persistence.xml` configuration file above, the `orm.xml` XML file contai
 
 As previously seen, the Hibernate native bootstrap mechanism allows you to customize a great variety of configurations which are passed via the `Metadata` object.
 
-When using Hibernate as a Jakarta Persistence provider, the `EntityManagerFactory` is backed by a `SessionFactory`. For this reason, you might still want to use the `Metadata` object to pass various settings which cannot be supplied via the standard Hibernate <<appendices/Configurations.adoc, configuration settings>>.
+When using Hibernate as a Jakarta Persistence provider, the `EntityManagerFactory` is backed by a `SessionFactory`. For this reason, you might still want to use the `Metadata` object to pass various settings which cannot be supplied via the standard Hibernate <<appendices/Configurations.adoc#configurations, configuration settings>>.
 
 For this reason, you can use the
 https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/boot/spi/MetadataBuilderContributor.html[`MetadataBuilderContributor`] class as you can see in the following examples.

diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/identifiers.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/identifiers.adoc
@@ -186,7 +186,7 @@ Use of this feature may or may not be portable from a Jakarta Persistence perspe
 ==== Composite identifiers with associations
 
 Hibernate allows defining a composite identifier out of entity associations.
-In the following example, the `PersonAddress` entity identifier is formed of two `@ManyToOne` associations.
+In the following example, the `Book` entity identifier is formed of two `@ManyToOne` associations.
 
 [[identifiers-composite-id-mapping-example]]
 .Composite identifiers with associations