diff --git a/doc/guide/admin/limits.sdf b/doc/guide/admin/limits.sdf
index c9bc933267..aab18fbf30 100644
--- a/doc/guide/admin/limits.sdf
+++ b/doc/guide/admin/limits.sdf
@@ -253,6 +253,12 @@ E:   limits group/groupOfNames/member="cn=dirsync,dc=example,dc=org" size.prtota
 E:   limits users size.soft=5 size.hard=100 size.prtotal=disabled
 E:   limits anonymous size.soft=2 size.hard=5 size.prtotal=disabled
 
+H2: Glued/Subordinate database configurations
+When using subordinate databases, it is necessary for any limits that
+are to be applied across the parent and its subordinates to be defined in both
+the parent and its subordinates. Otherwise the settings on the subordinate databases
+are not honored.
+
 H2: Further Information
 
 For further information please see {{slapd.conf}}(5), {{ldapsearch}}(1) and {{slapd.access}}(5)
diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
index f2c98115cd..00b2260d07 100644
--- a/doc/man/man5/slapd-config.5
+++ b/doc/man/man5/slapd-config.5
@@ -1637,6 +1637,17 @@ is requested cannot exceed the
 size limit of regular searches unless extended by the
 .B prtotal
 switch.
+
+The \fBolcLimits\fP statement is typically used to let an unlimited
+number of entries be returned by searches performed
+with the identity used by the consumer for synchronization purposes
+by means of the RFC 4533 LDAP Content Synchronization protocol
+(see \fBolcSyncrepl\fP for details).
+
+When using subordinate databases, it is necessary for any limits that
+are to be applied across the parent and its subordinates to be defined in
+both the parent and its subordinates. Otherwise the settings on the
+subordinate databases are not honored.
 .RE
 .TP
 .B olcMaxDerefDepth: <depth>
diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 76b329712f..05d4b7d55d 100644
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -1583,7 +1583,7 @@ the use of the pagedResults control as a means to circumvent size
 limitations on regular searches; the keyword
 .I disabled
 disables the control, i.e. no paged results can be returned.
-Note that the total number of entries returned when the pagedResults control 
+Note that the total number of entries returned when the pagedResults control
 is requested cannot exceed the 
 .B hard 
 size limit of regular searches unless extended by the
@@ -1595,6 +1595,11 @@ number of entries be returned by searches performed
 with the identity used by the consumer for synchronization purposes
 by means of the RFC 4533 LDAP Content Synchronization protocol
 (see \fBsyncrepl\fP for details).
+
+When using subordinate databases, it is necessary for any limits that
+are to be applied across the parent and its subordinates to be defined in
+both the parent and its subordinates. Otherwise the settings on the
+subordinate databases are not honored.
 .RE
 .TP
 .B maxderefdepth <depth>