Align with slapd.access(5) man page (ITS#4522)

diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index 8ee5dc09571073c95f5c48a40db09774148eef37..b67916bac610f75fbc4057f721d862c817ea6339 100644 (file)
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -433,7 +433,7 @@ databases.
 This marks the beginning of a new {{TERM:BDB}} database instance.
 
 
-H4: olcAccess: to <what> [ by <who> <accesslevel> <control> ]+
+H4: olcAccess: to <what> [ by <who> [<accesslevel>] [<control>] ]+
 
 This directive grants access (specified by <accesslevel>) to a
 set of entries and/or attributes (specified by <what>) by one or
@@ -1013,7 +1013,7 @@ The general form of the olcAccess configuration is:
 
 >      olcAccess: <access directive>
 >      <access directive> ::= to <what>
->              [by <who> <access> <control>]+
+>              [by <who> [<access>] [<control>] ]+
 >      <what> ::= * |
 >              [dn[.<basic-style>]=<regex> | dn.<scope-style>=<DN>]
 >              [filter=<ldapfilter>] [attrs=<attrlist>]

diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index 08fc9a58d126e50f650830a9e0cdd426f490babb..091473e4649c2959fb1262cabb92c8b21be11ff3 100644 (file)
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -87,7 +87,7 @@ database definition.  Arguments that should be replaced
 by actual text are shown in brackets {{EX:<>}}.
 
 
-H4: access to <what> [ by <who> <accesslevel> <control> ]+
+H4: access to <what> [ by <who> [<accesslevel>] [<control>] ]+
 
 This directive grants access (specified by <accesslevel>) to a
 set of entries and/or attributes (specified by <what>) by one or
@@ -593,7 +593,7 @@ access configuration file directive. The general form of an
 access line is:
 
 >      <access directive> ::= access to <what>
->              [by <who> <access> <control>]+
+>              [by <who> [<access>] [<control>] ]+
 >      <what> ::= * |
 >              [dn[.<basic-style>]=<regex> | dn.<scope-style>=<DN>]
 >              [filter=<ldapfilter>] [attrs=<attrlist>]