OID/PEN confusion

diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index 86862d768d6027193fdf9b427b1726fd914b4724..927e94ef3a68f1fe83f9677482ebffd6f77fc44f 100644 (file)
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -72,7 +72,7 @@ matching rules and system schema, but this requires some programming
 and hence is not discussed here.
 
 There are five steps to defining new schema:
-^      obtain Object Identifer ({{TERM[expand]PEN}})
+^      obtain Object Identifer
 +      choose a name prefix
 +      create local schema file
 +      define custom attribute types (if necessary)
@@ -92,7 +92,7 @@ OID {{EX:1.1}}, you could branch the tree as follows:
 !block table; colaligns="LR"; coltags="EX,N"; align=Center; \
        title="Table 8.2: Example OID hierarchy"
 OID            Assignment
-1.1            Organization's OID ({{TERM[expand]PEN}} - PEN)
+1.1            Organization's OID
 1.1.1          SNMP Elements
 1.1.2          LDAP Elements
 1.1.2.1                AttributeTypes
@@ -102,26 +102,18 @@ OID               Assignment
 !endblock
 
 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 something 
-more sophisticated such as the {{OpenLDAP OID Registry}}
-({{URL:http://www.openldap.org/faq/index.cgi?file=197}}).
+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 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 hijack OID namespace!}}
 
-To obtain a registered {{TERM[expand]PEN}}at {{no cost}}, apply for a PEN
+To obtain a registered OID at {{no cost}}, apply for a OID
 under the {{ORG[expand]IANA}} (ORG:IANA) maintained {{Private Enterprise}} arc.  
-Any private enterprise (organization) may request an PEN to be assigned under 
-this arc. Just fill out the IANA form at {{URL: http://pen.iana.org/pen/PenApplication.page}} 
-and your official PEN 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}} where {{EX:X}} is an integer.
+Any private enterprise (organization) may request a {{TERM[expand]PEN}} (PEN) to be assigned under this arc. Just fill out the IANA form at {{URL: http://pen.iana.org/pen/PenApplication.page}} and your official PEN 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}} where {{EX:X}} is an integer.
 
-Note: Don't let the "MIB/SNMP" statement on the IANA page confuse
-you.  OIDs obtained using this form may be used for any purpose
+Note: PENs obtained using this form may be used for any purpose
 including identifying LDAP schema elements.
 
 Alternatively, OID name space may be available from a national