diff --git a/doc/man/man5/ldaptemplates.conf.5 b/doc/man/man5/ldaptemplates.conf.5 index e587b7c95d83b844970a0b4db6d5dffc40784697..c42c5710ec4b31f1e0e8782170d403336dd740e8 100644 --- a/doc/man/man5/ldaptemplates.conf.5 +++ b/doc/man/man5/ldaptemplates.conf.5 @@ -114,7 +114,7 @@ The next line is the default location under which new entries are created. It should be a string-represented Distringuished Name. E.g., .nf .ft B - "dc=OpenLDAP, dc=org" + "dc=example, dc=com" .ft .fi .LP @@ -246,7 +246,7 @@ for display of people entries and one for display of contries. # # default location when adding new entries (DN; "" means no default) - "dc=OpenLDAP, dc=Org" + "dc=example, dc=com" # # rules used to define default values for new entries diff --git a/doc/man/man5/ldif.5 b/doc/man/man5/ldif.5 index a96b888ce47e2ce1493737c973c6d143b57b1b19..c53df77cb6daf5bd689e5fae09126bead48f6c60 100644 --- a/doc/man/man5/ldif.5 +++ b/doc/man/man5/ldif.5 @@ -33,8 +33,8 @@ or tab, e.g., .LP .nf .ft tt - dn: cn=Barbara J Jensen, dc=Open - LDAP, dc=org + dn: cn=Barbara J Jensen, dc=exam + ple, dc=com .ft .fi .LP @@ -78,20 +78,20 @@ Here is an example of an LDIF file containing three entries. .LP .nf .ft tt - dn: cn=Barbara J Jensen, dc=OpenLDAP, dc=Org + dn: cn=Barbara J Jensen, dc=example, dc=com cn: Barbara J Jensen cn: Babs Jensen objectclass: person description:< file://tmp/babs sn: Jensen - dn: cn=Bjorn J Jensen, dc=OpenLDAP, dc=Org + dn: cn=Bjorn J Jensen, dc=example, dc=com cn: Bjorn J Jensen cn: Bjorn Jensen objectclass: person sn: Jensen - dn: cn=Jennifer J Jensen, dc=OpenLDAP, dc=Org + dn: cn=Jennifer J Jensen, dc=example, dc=com cn: Jennifer J Jensen cn: Jennifer Jensen objectclass: person diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index d07ac8ecca84d63717f3251c160b8af96b892079..4627d5e52c95920bc19854a7ffba453aa08749e9 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -242,6 +242,12 @@ Turn schema checking on or off. The default is on. Specify the maximum number of entries to return from a search operation. The default size limit is 500. .TP +.B sasl-realm <realm> +Specify SASL realm. Default is empty. +.TP +.B sasl-secprops <props> +Cyrus SASL security properties. Default is "noanonymous,noplain". +.TP .B srvtab <filename> Specify the srvtab file in which the kerberos keys necessary for authenticating clients using kerberos can be found. This option is only