only document 'subtree', but also allow 'sub'

diff --git a/doc/man/man5/slapd.access.5 b/doc/man/man5/slapd.access.5
index f124f940d5afc12cf17fcefd0d5b4cf4cf99110a..6ca37a99d6d87c1ca5d1610cd10d748222950cef 100644 (file)
--- a/doc/man/man5/slapd.access.5
+++ b/doc/man/man5/slapd.access.5
@@ -94,8 +94,6 @@ for an exact match of the entry,
 .B one
 to indicate all the entries immediately below the
 .BR pattern ,
-.B sub
-or
 .B subtree
 to indicate all the subentries of an entry including the entry itself,
 .B children
@@ -260,8 +258,6 @@ case apply.
 The
 .BR domain 
 clause also allows the
-.B sub
-or
 .B subtree
 style, which succeeds when a fully qualified name exactly matches the
 .BR domain

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index bcf96a8a273e5e719f641ee08c615e36947b8311..e22f3263ec5a715c7550dc5f20dc42c43942534c 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -1282,7 +1282,7 @@ acl_usage( void )
                        "\t[aci=<attrname>]\n"
 #endif
                        "\t[ssf=<n>] [transport_ssf=<n>] [tls_ssf=<n>] [sasl_ssf=<n>]\n"
-               "<dnstyle> ::= regex | base | exact (alias of base) | one | sub[tree] | children\n"
+               "<dnstyle> ::= regex | base | exact (alias of base) | one | subtree | children\n"
                "<style> ::= regex | base | exact (alias of base)\n"
                "<groupflags> ::= R\n"
                "<access> ::= [self]{<level>|<priv>}\n"