Note that schema submissions should come with a reference

to a stable specification.

diff --git a/servers/slapd/schema/README b/servers/slapd/schema/README
index 4c759c94b1c0ec5ffbde8aac94e50fde4f7117f7..8b710e11116d8477bebbb90df93aa72d83d10056 100644 (file)
--- a/servers/slapd/schema/README
+++ b/servers/slapd/schema/README
@@ -17,7 +17,9 @@ nis.schema              Network Information Service schema
 openldap.schema         OpenLDAP Project schema
 
 Additional schema definitions can be submitted using the OpenLDAP
-Issue Tracking System <http://www.openldap.org/its/>.
+Issue Tracking System <http://www.openldap.org/its/>.  Such
+submissions should include a reference (e.g. a URL) to a stable,
+mature specification (e.g., an RFC) of the schema.
 
 ---
 $OpenLDAP$

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 4248fb4df97dd8ae4a280469fe29ecd22892c1bd..5b9a4a020f805a2bcc7c0c0f73459f1b0c2e134a 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -24,12 +24,14 @@
 # Standard X.501(93) Operational Attribute Types from RFC2252
 
 attributetype ( 2.5.18.1 NAME 'createTimestamp'
+       DESC 'time which object was created'
        EQUALITY generalizedTimeMatch
        ORDERING generalizedTimeOrderingMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
        SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
 
 attributetype ( 2.5.18.2 NAME 'modifyTimestamp'
+       DESC 'time which object was last modified'
        EQUALITY generalizedTimeMatch
        ORDERING generalizedTimeOrderingMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
@@ -135,13 +137,13 @@ objectclass ( 2.5.20.1 NAME 'subschema' AUXILIARY
 # Standard attribute types used for subtyping from RFC2256
 
 attributetype ( 2.5.4.41 NAME 'name'
-       DESC 'name supertype' 
+       DESC 'common supertype of name attributes' 
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
 
 attributetype ( 2.5.4.49 NAME 'distinguishedName'
-       DESC 'distingushed name supertype' 
+       DESC 'common supertype of distingushed name attributes' 
        EQUALITY distinguishedNameMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
@@ -180,18 +182,27 @@ attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' )
        DESC 'ISO-3166 country 2-letter code'
        SUP name SINGLE-VALUE )
 
-attributetype ( 2.5.4.7 NAME ( 'l' 'localityName' ) SUP name )
+attributetype ( 2.5.4.7 NAME ( 'l' 'localityName' )
+       DESC 'name of the locality which this object resides in'
+       SUP name )
 
-attributetype ( 2.5.4.8 NAME ( 'st' 'stateOrProvinceName' ) SUP name )
+attributetype ( 2.5.4.8 NAME ( 'st' 'stateOrProvinceName' )
+       DESC 'name of the state or province which this object resides in'
+       SUP name )
 
 attributetype ( 2.5.4.9 NAME ( 'street' 'streetAddress' )
+       DESC 'street address of this object'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
 
-attributetype ( 2.5.4.10 NAME ( 'o' 'organizationName' ) SUP name )
+attributetype ( 2.5.4.10 NAME ( 'o' 'organizationName' )
+       DESC 'name of the organization this object belongs to'
+       SUP name )
 
-attributetype ( 2.5.4.11 NAME ( 'ou' 'organizationalUnitName' ) SUP name )
+attributetype ( 2.5.4.11 NAME ( 'ou' 'organizationalUnitName' )
+       DESC 'name of the organizational unit this object belongs to'
+       SUP name )
 
 attributetype ( 2.5.4.12 NAME 'title'
        DESC 'title associated with the entity'
@@ -205,6 +216,7 @@ attributetype ( 2.5.4.13 NAME 'description'
 
 # Obsoleted by enhancedSearchGuide
 attributetype ( 2.5.4.14 NAME 'searchGuide'
+       DESC 'search guide - obsoleted by enhancedSearchGuide'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.25 )
 
 attributetype ( 2.5.4.15 NAME 'businessCategory'
@@ -286,6 +298,7 @@ attributetype ( 2.5.4.33 NAME 'roleOccupant' SUP distinguishedName )
 attributetype ( 2.5.4.34 NAME 'seeAlso' SUP distinguishedName )
 
 attributetype ( 2.5.4.35 NAME 'userPassword'
+       DESC 'password of user -- cleartext or RFC 2307 format'
        EQUALITY octetStringMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{128} )
 
@@ -330,7 +343,7 @@ attributetype ( 2.5.4.43 NAME 'initials'
        SUP name )
 
 attributetype ( 2.5.4.44 NAME 'generationQualifier' 
-       DESC 'e.g. Jr or II.'
+       DESC 'name qualifier indicating a generation, e.g. Jr or II.'
        SUP name )
 
 attributetype ( 2.5.4.45 NAME 'x500UniqueIdentifier'
@@ -578,17 +591,17 @@ objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
        SUP top AUXILIARY MUST uid )
 
 #
-# From draft-zeilenga-ldap-nameref-00.txt
+# From draft-zeilenga-ldap-namedref-00.txt
 #      used to represent referrals in the directory
 #
 attributetype ( 2.16.840.1.113730.3.1.34 NAME 'ref'
-       DESC 'Named referral'
+       DESC 'namedref: subordinate referral URL'
        EQUALITY caseExactMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
        USAGE distributedOperation )
 
 objectclass ( 2.16.840.1.113730.3.2.6 NAME 'referral'
-       DESC 'Named referral object'
+       DESC 'namedref: named subordinate referral'
        SUP top STRUCTURAL MUST ref )
 
 #