Add link to SDF tools at CPAN.

[openldap] / doc / guide / admin / schema.sdf

diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index 70cccea58799e3071a34585a30e7ea66252e19ea..f0e1dd3bd200c923dbca0684cae6f040b68cdbdb 100644 (file)
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -96,22 +96,22 @@ OID         Assignment
 You are, of course, free to design a hierarchy suitable to your
 organizational needs under your organization's OID.  No matter
 what hierarchy you choose, you should maintain a registry of
-assignments you make.  This can be a simple flat file or a
+assignments you make.  This can be a simple flat file or
 something more sophisticated such as the {{OpenLDAP OID Registry}}
 ({{URL:http://www.openldap.org/faq/index.cgi?file=197}}).
 
 For more information about Object Identifers (and a listing
 service) see {{URL:http://www.alvestrand.no/harald/objectid/}}.
 
-.{{Under no circumstances should you use a fictious OID!}} 
+.{{Under no circumstances should you use a fictitious OID!}} 
 
 To obtain a fully registered OID at {{no cost}}, apply for
-an OID under {{ORG[expand]IANA}} (IANA) maintained
+an OID under the {{ORG[expand]IANA}} (IANA) maintained
 {{Private Enterprise}} arch.  Any private enterprise (organization)
 may request an OID to be assigned under this arch.  Just fill
 out the {{ORG:IANA}} form at {{URL: http://www.iana.org/cgi-bin/enterprise.pl}}
 and your official OID will be sent to you usually within a few days.
-Your base OID will be something like {{EX:1.3.6.1.4.1.X}} were {{EX:X}}
+Your base OID will be something like {{EX:1.3.6.1.4.1.X}} where {{EX:X}}
 is an integer.
 
 Note: Don't let the "MIB/SNMP" statement on the IANA page confuse you.
@@ -134,7 +134,7 @@ a few letters to localize the changes to your organization.
 The smaller the organization, the longer your prefix should
 be.
 
-In the examples below, we have choosen a short prefix '{{EX:my}}'
+In the examples below, we have chosen a short prefix '{{EX:my}}'
 (to save space).  Such a short prefix would only be suitable for
 a very large, global organization.  For a small, local organization,
 we recommend something like '{{EX:deFirm}}' (German company) or
@@ -199,7 +199,7 @@ where Attribute Type Description is defined by the following
 where whsp is a space ('{{EX: }}'), numericoid is a globally unique
 OID in dotted-decimal form (e.g. {{EX:1.1.0}}), qdescrs is one or
 more names, woid is either the name or OID optionally followed
-length specifier (e.g {{EX:{10}}}).
+by a length specifier (e.g {{EX:{10}}}).
 
 For example, the attribute types {{EX:name}} and {{EX:cn}} are defined
 in {{F:core.schema}} as:
@@ -218,7 +218,7 @@ and a brief description.  Each name is an alias for the OID.
 {{slapd}}(8) returns the first listed name when returning results.
 
 The first attribute, {{EX:name}}, holds values of {{EX:directoryString}}
-(UTF-8 encoded Unicode) syntax.  The syntax are specified by OID
+(UTF-8 encoded Unicode) syntax.  The syntax is specified by OID
 (1.3.6.1.4.1.1466.115.121.1.15 identifies the directoryString
 syntax).  A length recommendation of 32768 is specified.  Servers
 should support values of this length, but may support longer values
@@ -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.
@@ -469,7 +469,7 @@ H3: OID Macros
 To ease the management and use of OIDs, {{slapd}}(8) supports
 {{Object Identifier}} macros.  The {{EX:objectIdentifier}} is used
 to equate a macro (name) with a OID.  The OID may possibly be derived
-from a previously defined OID macro.   The {{slapd.conf(5)}} syntax
+from a previously defined OID macro.   The {{slapd.conf}}(5) syntax
 is:
 
 E:     objectIdentifier <name> { <oid> | <name>[:<suffix>] }
@@ -478,10 +478,10 @@ The following demonstrates definition of a set of OID macros
 and their use in defining schema elements:
 
 >      objectIdentifier myOID  1.1
->      objectIdentifier mySNMP myOrgOID:1
->      objectIdentifier myLDAP myOrgOID:2
->      objectIdentifier myAttributeType        myOrgLDAP:1
->      objectIdentifier myObjectClass  myOrgLDAP:2
+>      objectIdentifier mySNMP myOID:1
+>      objectIdentifier myLDAP myOID:2
+>      objectIdentifier myAttributeType        myLDAP:1
+>      objectIdentifier myObjectClass  myLDAP:2
 >      attributetype ( myAttributeType:3 NAME 'myPhotoURI'
 >              DESC 'URI and optional label referring to a photo' 
 >              SUP labeledURI )