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 7d1734eca6959e1626c05280a94fe6b9d8b5ebaf..9b16419f9c12c579fbf68cc40381ae7a240359f1 100644 (file)
--- a/servers/slapd/schema/cosine.schema
+++ b/servers/slapd/schema/cosine.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2013 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -373,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 )
@@ -421,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
@@ -439,7 +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