Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / schema / cosine.schema

diff --git a/servers/slapd/schema/cosine.schema b/servers/slapd/schema/cosine.schema
index 783948c9482b355dc557e3510c9564fa5d318616..9b16419f9c12c579fbf68cc40381ae7a240359f1 100644 (file)
--- a/servers/slapd/schema/cosine.schema
+++ b/servers/slapd/schema/cosine.schema
@@ -1,4 +1,17 @@
+# RFC1274: Cosine and Internet X.500 schema
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2013 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 #
 # RFC1274: Cosine and Internet X.500 schema
 #
@@ -229,7 +242,7 @@ attributetype ( 0.9.2342.19200300.100.1.7 NAME 'photo'
 #    ::= {pilotAttributeType 8}
 #
 attributetype ( 0.9.2342.19200300.100.1.8 NAME 'userClass'
-       DESC 'RFC1274: categorory of user'
+       DESC 'RFC1274: category of user'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
@@ -360,8 +373,8 @@ attributetype ( 0.9.2342.19200300.100.1.15 NAME 'documentLocation'
 #    ::= {pilotAttributeType 20}
 #
 attributetype ( 0.9.2342.19200300.100.1.20
-       DESC 'RFC1274: home telephone number'
        NAME ( 'homePhone' 'homeTelephoneNumber' )
+       DESC 'RFC1274: home telephone number'
        EQUALITY telephoneNumberMatch
        SUBSTR telephoneNumberSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
@@ -408,7 +421,7 @@ attributetype ( 0.9.2342.19200300.100.1.22 NAME 'otherMailbox'
 #            uTCTimeSyntax
 #    ::= {pilotAttributeType 23}
 #
-## OBSOLETE
+## Deprecated in favor of modifyTimeStamp
 #attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime'
 #      DESC 'RFC1274: time of last modify, replaced by modifyTimestamp'
 #      OBSOLETE
@@ -426,8 +439,7 @@ attributetype ( 0.9.2342.19200300.100.1.22 NAME 'otherMailbox'
 #            distinguishedNameSyntax
 #    ::= {pilotAttributeType 24}
 #
-
-## OBSOLETE
+## Deprecated in favor of modifiersName
 #attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
 #      DESC 'RFC1274: last modifier, replaced by modifiersName'
 #      OBSOLETE
@@ -1257,7 +1269,7 @@ objectclass ( 0.9.2342.19200300.100.4.14 NAME 'RFC822localPart'
 #    ::= {pilotObjectClass 15}
 #
 objectclass ( 0.9.2342.19200300.100.4.15 NAME 'dNSDomain'
-       SUP 'domain' STRUCTURAL
+       SUP domain STRUCTURAL
        MAY ( ARecord $ MDRecord $ MXRecord $ NSRecord $
                SOARecord $ CNAMERecord )
        )