From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 18 Jun 2000 19:41:49 +0000 (+0000)
Subject: Incomplete update of LDIF, refer to RFC
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2587
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=55d180f3abebdb351be01cbde87b0ab83b0b73dd;p=openldap

Incomplete update of LDIF, refer to RFC
---

diff --git a/doc/man/man5/ldif.5 b/doc/man/man5/ldif.5
index 1cb621a5dc..9ab351768e 100644
--- a/doc/man/man5/ldif.5
+++ b/doc/man/man5/ldif.5
@@ -17,16 +17,16 @@ The basic form of an LDIF entry is:
 .nf
 .ft tt
 	dn: <distinguished name>
-	<attrtype>: <attrvalue>
-	<attrtype>: <attrvalue>
-	<attrtype>:: <base64-encoded-value>
-	<attrtype>:< <URL>
+	<attrdesc>: <attrvalue>
+	<attrdesc>: <attrvalue>
+	<attrdesc>:: <base64-encoded-value>
+	<attrdesc>:< <URL>
 	...
 .ft
 .fi
 .LP
-The value may be specified as ASCII text or as base64 encoded data,
-or a URL may be provided to the location of the attribute value.
+The value may be specified as UTF-8 text or as base64 encoded data,
+or a URI may be provided to the location of the attribute value.
 .LP
 A line may be continued by starting the next line with a single space
 or tab, e.g.,
@@ -38,6 +38,8 @@ or tab, e.g.,
 .ft
 .fi
 .LP
+Lines beginning with a sharpe sign ('#') are ignored.
+.LP
 Multiple attribute values are specified on separate lines, e.g.,
 .LP
 .nf
@@ -59,7 +61,7 @@ the value " begins with a space" would be encoded like this:
 .fi
 .LP
 If the attribute value is located in a file, the <attrtype> is
-followed by a ':<' and a file:// URL.  e.g., the value contained
+followed by a ':<' and a file:// URI.  e.g., the value contained
 in the file /tmp/value would be listed like this:
 .LP
 .nf
@@ -67,6 +69,7 @@ in the file /tmp/value would be listed like this:
 	cn:< file://tmp/value
 .ft
 .fi
+Other URI schemes (ftp,http) may be supported as well.
 .LP
 Multiple entries within the same LDIF file are separated by blank
 lines.
@@ -79,7 +82,7 @@ Here is an example of an LDIF file containing three entries.
 	cn: Barbara J Jensen
 	cn: Babs Jensen
 	objectclass: person
-	description:< file://tmp/barbara
+	description:< file://tmp/babs
 	sn: Jensen
 
 	dn: cn=Bjorn J Jensen, dc=OpenLDAP, dc=Org
@@ -100,14 +103,14 @@ Here is an example of an LDIF file containing three entries.
 .ft
 .fi
 .LP
-Notice that the jpegPhoto in Jennifer Jensen's entry is encoded using
-base 64.
+Notice that the description in Barbara Jensen's entry is
+read from file://tmp/babs and the jpegPhoto in Jennifer
+Jensen's entry is encoded using base 64.
 .SH SEE ALSO
 .BR ldap (3),
 .BR ldapsearch (1),
 .BR ldapadd (1)
-.LP
-"The SLAPD and SLURPD Administrator's Guide"
+.BR "LDAP Data Interchange Format," Good, G., RFC 2849.
 .SH ACKNOWLEDGEMENTS
 .B	OpenLDAP
 is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).