From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 9 Jun 2002 18:57:35 +0000 (+0000)
Subject: Misc updates
X-Git-Tag: NO_SLAP_OP_BLOCKS~1488
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4df6501bc76fe40f52a8d7d7ec9edc2631a1a336;p=openldap

Misc updates
---

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index 1c47cd6ad6..a62e91af1d 100644
--- a/doc/guide/admin/intro.sdf
+++ b/doc/guide/admin/intro.sdf
@@ -201,7 +201,7 @@ LDAPv3 adds the following features to LDAP:
  - Schema Discovery
 
 LDAPv2 is considered historical.  As deploying both LDAPv2 and
-LDAPv3 simultaneously can be quite problematic, LDAPv2 should should
+LDAPv3 simultaneously can be quite problematic, LDAPv2 should
 be avoided.
 
 
diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index 76a6b73d8b..1a6a81767c 100644
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -390,8 +390,8 @@ you desire.
 >	objectclass ( 1.1.2.2.2 NAME 'myPerson'
 >		DESC 'my person'
 >		SUP inetOrgPerson
->		MUST ( 'myUniqueName' $ 'givenName' )
->		MAY 'myPhoto' )
+>		MUST ( myUniqueName $ givenName )
+>		MAY myPhoto )
 
 The object class inherits the required/allowed attribute
 types of {{EX:inetOrgPerson}} but requires {{EX:myUniqueName}}
@@ -430,7 +430,7 @@ pairs.  The following is an abbreviated example:
 >	attributeTypes: ( 1.1.2.1.2 NAME 'myPhoto' DESC 'a photo (applicatio
 >	 n defined format)' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
 >	objectClasses: ( 1.1.2.2.2 NAME 'myPerson' DESC 'my person' SUP inet
->	 OrgPerson MUST ( 'myUniqueName' $ 'givenName' ) MAY 'myPhoto' )
+>	 OrgPerson MUST ( myUniqueName $ givenName ) MAY myPhoto )
 
 Capture the output of the search in a file and then edit the file:
 
@@ -456,8 +456,8 @@ result in a file with contains of:
 >	objectClass ( 1.1.2.2.2 NAME 'myPerson'
 >		DESC 'my person'
 >		SUP inetOrgPerson
->		MUST ( 'myUniqueName' $ 'givenName' )
->		MAY 'myPhoto' )
+>		MUST ( myUniqueName $ givenName )
+>		MAY myPhoto )
 
 Save in an appropriately named file (e.g. {{F:my.schema}}).
 You may now include this file in your {{slapd.conf}}(5) file.