diff --git a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc
index b4c26f1706..64a729006d 100644
--- a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc
+++ b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc
@@ -758,5 +758,7 @@ ignoreUnsupported:: Do the population, but ignore any non-JPA features that woul
 
 |`hibernate.collection_join_subquery`| `true` (default value) or `false` | Setting which indicates whether or not the new JOINS over collection tables should be rewritten to subqueries.
 
+|`hibernate.use_entity_where_clause_for_collections`| `true` or `false` (default value) | Setting controls whether an entity's "where" clause, mapped using `@Where(clause="...")` or `<entity ... where="...">`, is taken into account when loading one-to-many or many-to-many collections of that type of entity.
+
 |=====================================================================================================================================================================================================================================================
 
diff --git a/documentation/src/main/docbook/mappingGuide/en-US/Hibernate_Mapping_Guide.xml b/documentation/src/main/docbook/mappingGuide/en-US/Hibernate_Mapping_Guide.xml
index db3e695df3..f0b78cc89c 100644
--- a/documentation/src/main/docbook/mappingGuide/en-US/Hibernate_Mapping_Guide.xml
+++ b/documentation/src/main/docbook/mappingGuide/en-US/Hibernate_Mapping_Guide.xml
@@ -5,7 +5,7 @@
   ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
   ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
   -->
-<!DOCTYPE book SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd" [
+<!DOCTYPE book SYSTEM "https://www.oasis-open.org/docbook/xml/5.0b5/dtd/docbook.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "Hibernate_Mapping_Guide.ent">
 %BOOK_ENTITIES;
 ]>