ITS#5559

diff --git a/CHANGES b/CHANGES
index 6346100ef41b56aa569fd48b9ec0dcfb6c9f3c47..f947e62af8cfdb848f8eb2983183e3dfc1650cb5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,8 @@ OpenLDAP 2.4.11 Engineering
        Fixed slapo-syncprov ACL evaluation (ITS#5548)
        Build Environment
                Fixed test048 to skip if threads is not available (ITS#5529)
+       Documentation
+               Added slapo-pcache(5) sizelimit caching (ITS#5559)
 
 OpenLDAP 2.4.10 Release (2008/06/08)
        Fixed libldap file descriptor leak with SELinux (ITS#5507)

diff --git a/doc/man/man5/slapo-pcache.5 b/doc/man/man5/slapo-pcache.5
index 2ca539a2010ace35a352688964ce5266634580f8..84e55d2acc6dc12e9e0268d7f42da36c70e4a602 100644 (file)
--- a/doc/man/man5/slapo-pcache.5
+++ b/doc/man/man5/slapo-pcache.5
@@ -102,12 +102,15 @@ be avoided for clarity.  A set of attributes can contain "1.1" as the only
 attribute; in this case, only the presence of the entries is cached.
 
 .TP
-.B proxytemplate <template_string> <attrset_index> <ttl> [<negttl>]
-Specifies a cacheable template and "time to live" (in sec) <ttl> of queries 
+.B proxytemplate <template_string> <attrset_index> <ttl> [<negttl> [<limitttl>]]
+Specifies a cacheable template and "time to live" <ttl> of queries 
 belonging to the template. An optional <negttl> can be used to specify
 that negative results (i.e., queries that returned zero entries)
-should also be cached for the specified number of seconds. Negative
-results are not cached by default.
+should also be cached for the specified amount of time. Negative
+results are not cached by default (<negttl> set to 0).
+An optional <limitttl> can be used to specify that results
+hitting a sizelimit should also be cached for the specified amount of time.
+Results hitting a sizelimit are not cached by default (<limitttl> set to 0).
 
 .TP
 .B response-callback { head | tail }