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 7028cafbb2b1254864303c8bc8e69ca8752da36a..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.
@@ -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
@@ -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>] }
@@ -477,16 +477,16 @@ E:        objectIdentifier <name> { <oid> | <name>[:<suffix>] }
 The following demonstrates definition of a set of OID macros
 and their use in defining schema elements:
 
->      objectIdentifier myOrgOID       1.1
->      objectIdentifier myOrgSNMP      myOrgOID:1
->      objectIdentifier myOrgLDAP      myOrgOID:2
->      objectIdentifier myAttributeType        myOrgLDAP:1
->      objectIdentifier myObjectClass  myOrgLDAP:2
+>      objectIdentifier myOID  1.1
+>      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 )
 >      objectclass ( myObjectClass:1 NAME 'myPhotoObject'
 >              DESC 'mixin myPhoto'
 >              AUXILIARY
->              MAY myPhotoURI )
+>              MAY myPhoto )