Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / doc / man / man5 / ldif.5

diff --git a/doc/man/man5/ldif.5 b/doc/man/man5/ldif.5
index 0a892983c36a3ac3c5272d6dc8ad4530f9047b5a..7e5077aa99fc6b3b8c66524d6f49e72745f85a5b 100644 (file)
--- a/doc/man/man5/ldif.5
+++ b/doc/man/man5/ldif.5
@@ -1,6 +1,6 @@
 .TH LDIF 5 "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
-.\" Copyright 1998-2007 The OpenLDAP Foundation All Rights Reserved.
+.\" Copyright 1998-2012 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .SH NAME
 ldif \- LDAP Data Interchange Format
@@ -136,7 +136,7 @@ of \fImodify\fP, the format is one or more of the following:
        <attrdesc>: <value1>
        <attrdesc>: <value2>
        ...
-       -
+       \-
 .fi
 .LP
 Or, for a replace modification:
@@ -146,7 +146,7 @@ Or, for a replace modification:
        <attrdesc>: <value1>
        <attrdesc>: <value2>
        ...
-       -
+       \-
 .fi
 .LP
 If no \fIattributetype\fP lines are given to replace,
@@ -159,7 +159,7 @@ Or, for a delete modification:
        <attrdesc>: <value1>
        <attrdesc>: <value2>
        ...
-       -
+       \-
 .fi
 .LP
 If no \fIattributetype\fP lines are given to delete,
@@ -215,13 +215,13 @@ of each type of change.
        add: givenName
        givenName: Barbara
        givenName: babs
-       -
+       \-
        replace: description
        description: the fabulous babs
-       -
+       \-
        delete: sn
        sn: jensen
-       -
+       \-
 
        dn: cn=Babs Jensen,dc=example,dc=com
        changetype: modrdn
@@ -269,6 +269,8 @@ commands.
 .BR ldapadd (1),
 .BR ldapmodify (1),
 .BR slapadd (8),
+.BR slapcat (8),
+.BR slapd\-ldif (5),
 .BR slapd.replog (5).
 .LP
 "LDAP Data Interchange Format," Good, G., RFC 2849.