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

[openldap] / doc / guide / admin / schema.sdf

diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index e638a532de00d9399c2099e36047962b2dfaa02f..7300b7e3471a093d4466927b9f58020f0ac2ab8a 100644 (file)
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2008 The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2013 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Schema Specification
@@ -105,7 +105,7 @@ 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}}).
 
 For more information about Object Identifiers (and a listing service)
-see {{URL:http://www.alvestrand.no/harald/objectid/}}.
+see {{URL:http://www.alvestrand.no/objectid/}}.
 
 .{{Under no circumstances should you hijack OID namespace!}}
 
@@ -123,7 +123,7 @@ authority (e.g., {{ORG:ANSI}}, {{ORG:BSI}}).
 H3: Naming Elements
 
 In addition to assigning a unique object identifier to each schema
-element, you should provide a least one textual name for each
+element, you should provide at least one textual name for each
 element.  Names should be registered with the {{ORG:IANA}} or
 prefixed with "x-" to place in the "private use" name space.
 
@@ -223,7 +223,7 @@ The first attribute, {{EX:name}}, holds values of {{EX:directoryString}}
 specified by OID (1.3.6.1.4.1.1466.115.121.1.15 identifies the
 directoryString syntax).  A length recommendation of 32768 is
 specified.  Servers should support values of this length, but may
-support longer values The field does NOT specify a size constraint,
+support longer values. The field does NOT specify a size constraint,
 so is ignored on servers (such as slapd) which don't impose such
 size limits.  In addition, the equality and substring matching uses
 case ignore rules.  Below are tables listing commonly used syntax
@@ -260,8 +260,8 @@ numericStringMatch                  equality        numerical
 numericStringOrderingMatch             ordering        numerical
 numericStringSubstringsMatch           substrings      numerical
 octetStringMatch                       equality        octet string
-octetStringOrderingStringMatch         ordering        octet string
-octetStringSubstringsStringMatch       ordering        octet string
+octetStringOrderingMatch               ordering        octet string
+octetStringSubstringsMatch     ordering        octet string
 objectIdentiferMatch                   equality        object identifier
 !endblock