From: Gavin Henry <ghenry@openldap.org>
Date: Sat, 7 Jul 2007 22:47:18 +0000 (+0000)
Subject: OID now called PEN and url changed to: http://pen.iana.org/pen/PenApplication.page
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~344
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f04bed4d512f2cbf6f4b28629003eab5e8f67716;p=openldap

OID now called PEN and url changed to: http://pen.iana.org/pen/PenApplication.page
---

diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index d27f6a50b2..86862d768d 100644
--- 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
+^	obtain Object Identifer ({{TERM[expand]PEN}})
 +	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
+1.1		Organization's OID ({{TERM[expand]PEN}} - PEN)
 1.1.1		SNMP Elements
 1.1.2		LDAP Elements
 1.1.2.1		AttributeTypes
@@ -102,10 +102,10 @@ 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}}
+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)
@@ -113,14 +113,12 @@ see {{URL:http://www.alvestrand.no/harald/objectid/}}.
 
 .{{Under no circumstances should you hijack OID namespace!}}
 
-To obtain a registered OID at {{no cost}}, apply for an OID under
-the {{ORG[expand]IANA}} (ORG:IANA) maintained {{Private Enterprise}}
-arc.  Any private enterprise (organization) may request an OID to
-be assigned under this arc.  Just fill out the 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}} where {{EX:X}}
-is an integer.
+To obtain a registered {{TERM[expand]PEN}}at {{no cost}}, apply for a PEN
+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.
 
 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
diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index 4bdff5c537..5bc9c03cab 100644
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -232,6 +232,7 @@ OSI|Open Systems Interconnect
 OTP|One Time Password
 PDU|Protocol Data Unit
 PEM|Privacy Enhanced eMail
+PEN|Private Enterprise Number
 PKCS|Public Key Cryptosystem
 PKI|Public Key Infrastructure
 PKIX|Public Key Infrastructure (X.509)