ITS#5670

diff --git a/CHANGES b/CHANGES
index 188d8fda1f29055a5b8ad9d1023de90d767a2000..36fff5855b069e56ac5b201535b2975f76969d73 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,7 @@ OpenLDAP 2.4.12 Engineering
        Documentation
                Added slapd-ldap(5), slapd-meta(5) noundeffilter (ITS#5614)
                admin24 guide updates (ITS#5616)
+               admin24 octetString fix (ITS#5670)
 
 OpenLDAP 2.4.11 Release (2008/07/16)
        Fixed liblber ber_get_next length decoding (ITS#5580)

diff --git a/doc/guide/admin/aspell.en.pws b/doc/guide/admin/aspell.en.pws
index 69939d9070be0f19b2b7b9f5feddfe04391dc816..de69b610a9590675ce3c849670bda1a98a08bf3a 100644 (file)
--- a/doc/guide/admin/aspell.en.pws
+++ b/doc/guide/admin/aspell.en.pws
@@ -1383,7 +1383,7 @@ SSHA
 mandir
 RXER
 SSFs
-octetStringOrderingStringMatch
+octetStringOrderingMatch
 auditCompare
 pEntry
 strongAuthNotSupported
@@ -1657,7 +1657,7 @@ BCP
 baz
 params
 generalizedTimeOrderingMatch
-octetStringSubstringsStringMatch
+octetStringSubstringsMatch
 ber
 slimit
 ali

diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index e1d45b36bc16280446ae4f792305fda0416ffdcd..c5a0140c7d8b3206b747f8303cb83edf2b357469 100644 (file)
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -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