(ITS#5479) Pasword Policy docs from Symas

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

diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index 927e94ef3a68f1fe83f9677482ebffd6f77fc44f..e638a532de00d9399c2099e36047962b2dfaa02f 100644 (file)
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -1,11 +1,11 @@
 # $OpenLDAP$
-# Copyright 1999-2007 The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2008 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Schema Specification
 
 This chapter describes how to extend the user schema used by
-{{slapd}}(8).  The chapter assumes the reader is familar with the
+{{slapd}}(8).  The chapter assumes the reader is familiar with the
 {{TERM:LDAP}}/{{TERM:X.500}} information model.
 
 The first section, {{SECT:Distributed Schema Files}} details optional
@@ -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 Identifier
 +      choose a name prefix
 +      create local schema file
 +      define custom attribute types (if necessary)
@@ -104,7 +104,7 @@ OID         Assignment
 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 Identifers (and a listing service)
+For more information about Object Identifiers (and a listing service)
 see {{URL:http://www.alvestrand.no/harald/objectid/}}.
 
 .{{Under no circumstances should you hijack OID namespace!}}
@@ -130,7 +130,7 @@ prefixed with "x-" to place in the "private use" name space.
 The name should be both descriptive and not likely to clash with
 names of other schema elements.  In particular, any name you choose
 should not clash with present or future Standard Track names (this
-is assured if you registered names or use names begining with "x-").
+is assured if you registered names or use names beginning with "x-").
 
 It is noted that you can obtain your own registered name
 prefix so as to avoid having to register your names individually.
@@ -238,7 +238,7 @@ distinguishedName   1.3.6.1.4.1.1466.115.121.1.12   LDAP {{TERM:DN}}
 integer                        1.3.6.1.4.1.1466.115.121.1.27   integer
 numericString          1.3.6.1.4.1.1466.115.121.1.36   numeric string
 OID                    1.3.6.1.4.1.1466.115.121.1.38   object identifier
-octetString            1.3.6.1.4.1.1466.115.121.1.40   arbitary octets
+octetString            1.3.6.1.4.1.1466.115.121.1.40   arbitrary octets
 !endblock
 
 >