Misc updates

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index 1c47cd6ad6971f2c0cf4e2087331d62c0542276e..a62e91af1d8fa25b4e2182f69256ef3f9d130ed2 100644 (file)
--- 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 76a6b73d8b2337c9deda3c1529c7f616b3110220..1a6a81767c058f4ec03217cafc5f600b5bb40c34 100644 (file)
--- 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.