diff --git a/CHANGES b/CHANGES
index 2000e7fb605c259f5c21f37b58d4aeb3751a336d..188d8fda1f29055a5b8ad9d1023de90d767a2000 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,7 @@ OpenLDAP 2.4.12 Engineering
Fixed ODBC library detection (ITS#5602)
Documentation
Added slapd-ldap(5), slapd-meta(5) noundeffilter (ITS#5614)
+ admin24 guide updates (ITS#5616)
OpenLDAP 2.4.11 Release (2008/07/16)
Fixed liblber ber_get_next length decoding (ITS#5580)
diff --git a/doc/guide/admin/appendix-recommended-versions.sdf b/doc/guide/admin/appendix-recommended-versions.sdf
index c588f53c89711c51e3edd5ea34a6a653c44e0ee6..72d9d2e8d3202a486bb407fd5545b331512efaa6 100644
--- a/doc/guide/admin/appendix-recommended-versions.sdf
+++ b/doc/guide/admin/appendix-recommended-versions.sdf
@@ -26,7 +26,7 @@ Database Software|{{PRD:Berkeley DB}}:|
||4.4
||4.5
||4.6
-||Note: It is highly recommended to apply the patches from for a given release.
+||Note: It is highly recommended to apply the patches from Oracle for a given release.
Threads:
|POSIX {{pthreads}}|Version
|Mach {{CThreads}}|Version
diff --git a/doc/guide/admin/aspell.en.pws b/doc/guide/admin/aspell.en.pws
index 4253d89d3d15e3349ce5574c7d57f95e12c4bb4b..d0c8c74f0515baea6e4859409ab8b9b894ce95f2 100644
--- a/doc/guide/admin/aspell.en.pws
+++ b/doc/guide/admin/aspell.en.pws
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 1644
+personal_ws-1.1 en 1666
commonName
bla
Masarati
@@ -6,8 +6,8 @@ subjectAltName
api
usnCreated
BhY
-olcSyncrepl
olcSyncRepl
+olcSyncrepl
adamsom
adamson
CER
@@ -39,8 +39,8 @@ DIB
dev
reqNewSuperior
librewrite
-memberOf
memberof
+memberOf
BSI
updateref
buf
@@ -89,8 +89,8 @@ dlopen
eng
AttributeValue
attributevalue
-EOF
DUA
+EOF
inputfile
DSP
refreshDone
@@ -105,6 +105,7 @@ monitorTimestamp
subschemaSubentry
interoperate
gid
+testdb
gif
memfree
struct
@@ -125,15 +126,16 @@ iff
contextCSN
auditModify
auditSearch
-openldap
OpenLDAP
-resultCode
+openldap
resultcode
+resultCode
sysconfig
indices
blen
APIs
lresolv
+uidObject
Contribware
directoryString
database's
@@ -149,6 +151,7 @@ DkMTwBl
memcalloc
ing
filtertype
+ini
XKqkdPOmY
regcomp
ldapmodify
@@ -160,17 +163,18 @@ reqAttr
dynlist
args
hardcoded
+pgsql
argv
kdz
notAllowedOnRDN
hostport
-starttls
StartTLS
+starttls
ldb
servercredp
ldd
-ipv
IPv
+ipv
hyc
joe
bindmethods
@@ -202,8 +206,8 @@ libpath
acknowledgements
jts
createTimestamp
-LLL
MIB
+LLL
OpenSSL
openssl
LOF
@@ -243,10 +247,10 @@ Subbarao
aeeiib
oidlen
submatches
-olc
PEM
-PDU
+olc
OLF
+PDU
LDAPSchemaExtensionItem
auth
Pierangelo
@@ -262,8 +266,8 @@ cleartext
numattrsets
requestDN
caseExactSubstringsMatch
-PKI
NSS
+PKI
olcSyncProvConfig
ple
NTP
@@ -286,9 +290,9 @@ rdn
wZFQrDD
OTP
olcSizeLimit
-pos
-sbi
PRD
+sbi
+pos
pre
sudoadm
stringal
@@ -308,8 +312,8 @@ bvec
HtZhZS
TBC
stringbv
-Sep
SHA
+Sep
ptr
conn
pwd
@@ -326,8 +330,8 @@ myOID
supportedSASLMechanism
supportedSASLmechanism
realnamingcontext
-SMD
UCD
+SMD
keytab
portnumber
uncached
@@ -340,8 +344,8 @@ sasldb
UCS
searchDN
keytbl
-tgz
UDP
+tgz
freemods
prepend
nssov
@@ -359,22 +363,22 @@ crit
objectClassViolation
ssf
ldapfilter
-rwm
-TOC
vec
+TOC
+rwm
pwdChangedTime
tls
peernamestyle
xpasswd
-tmp
SRP
+tmp
SSL
dupbv
CPUs
SRV
entrymods
-rwx
sss
+rwx
reqNewRDN
nopresent
rebindproc
@@ -435,8 +439,8 @@ pseudorootdn
MezRroT
GDBM
LIBRELEASE
-DSAs
DSA's
+DSAs
realloc
booleanMatch
compareTrue
@@ -455,6 +459,7 @@ de
derated
auditDelete
cn
+ee
versa
cp
bv
@@ -495,8 +500,8 @@ pwdMinLength
iZ
ldapdelete
xyz
-RDBMs
rdbms
+RDBMs
extparam
mk
ng
@@ -560,8 +565,8 @@ ZZ
LDVERSION
testAttr
backend
-backend's
backends
+backend's
BerValues
Solaris
structs
@@ -573,9 +578,9 @@ ostring
policyDN
testObject
pwdMaxAge
-bindDn
-bindDN
binddn
+bindDN
+bindDn
distributedOperation
schemachecking
strvals
@@ -618,14 +623,14 @@ IEEE
regex
SIGINT
slappasswd
-errAbsObject
errABsObject
+errAbsObject
ldapexop
-objectidentifier
objectIdentifier
+objectidentifier
deallocators
-MirrorMode
mirrormode
+MirrorMode
loopDetect
SIGHUP
authMethodNotSupported
@@ -642,8 +647,8 @@ filtercomp
expr
syntaxes
memrealloc
-returnCode
returncode
+returnCode
OpenLDAP's
exts
bitstringa
@@ -667,8 +672,8 @@ lastName
lldap
cachesize
slapauth
-attributetype
attributeType
+attributetype
GSER
olcDbNosync
typedef
@@ -685,11 +690,11 @@ monitoredObject
TLSVerifyClient
noidlen
LDAPNOINIT
-pwdGraceAuthNLimit
pwdGraceAuthnLimit
+pwdGraceAuthNLimit
hnPk
-userPassword
userpassword
+userPassword
noanonymous
LIBVERSION
symas
@@ -708,12 +713,14 @@ IMAP
organisations
rewriteMap
monitoredInfo
-modrdn
-ModRDN
modrDN
+ModRDN
+modrdn
HREF
DQTxCYEApdUtNXGgdUac
inline
+ConnSettings
+ShowSystemTables
multiproxy
reqSizeLimit
kerberos
@@ -723,8 +730,8 @@ reqReferral
rlookups
siiiib
LTSTATIC
-timeLimitExceeded
timelimitExceeded
+timeLimitExceeded
XKYnrjvGT
subtrees
unixODBC
@@ -736,9 +743,10 @@ reqDN
dnstyle
inet
schemas
-pwdPolicySubEntry
pwdPolicySubentry
+pwdPolicySubEntry
reqId
+backsql
scanf
olcBackend
TLSCACertificatePath
@@ -805,6 +813,7 @@ entryAlreadyExists
plaintext
someoneelse
errDisconnect
+UserName
username
accessee
LDAPURLDesc
@@ -969,11 +978,13 @@ structuralObjectClass
proxyAuthz
config
IDSET
+odbc
ODBC
searchFilter
wholeSubtree
SASLprep
nisMailAlias
+libodbcpsqlS
attributeDescription
groupnummer
lsei
@@ -1031,6 +1042,7 @@ attribute's
pPasswd
metadirectory
assciated
+Mitya
myObjectClass
OIDs
oids
@@ -1070,8 +1082,8 @@ noop
errObject
XXLIBS
reqAssertion
-PDUs
nops
+PDUs
baseObject
bvecadd
perl
@@ -1122,6 +1134,7 @@ oMxg
filterlist
generalizedTimeMatch
strongAuthRequired
+Kovalev
Google
sessionlog
balancer
@@ -1188,6 +1201,8 @@ ERXRTc
LxsdLy
lastmod
integerOrderingMatch
+FakeOidIndex
+RowVersioning
searchEntryDN
pwdLockout
sbin
@@ -1212,6 +1227,7 @@ xeXBkeFxlZ
priv
proxyTemplates
bvals
+FileUsage
givenName
givenname
jensen
@@ -1289,6 +1305,7 @@ searchBase
searchbase
berval
slen
+metadata
lookup
databasetype
rewriteRules
@@ -1301,6 +1318,7 @@ reloadhint
reloadHint
moduleload
hasSubordinates
+ShowOidColumn
contextp
LDAPModifying
nameAndOptionalUID
@@ -1379,6 +1397,7 @@ rscdx
dhparam
subr
SSLv
+datebase
SIGTERM
liblunicode
uint
@@ -1435,6 +1454,7 @@ LDAPSync
bitstring
objclass
oplist
+libodbcpsql
LDAPObjectClass
sockurl
somevalue
@@ -1447,6 +1467,7 @@ hostname
TTLs
attrdesc
ghenry
+odbcinst
reqType
slapover
BerkeleyDB's
@@ -1529,6 +1550,7 @@ deleteoldrdn
abcd
olcRootPW
dnattr
+Servername
AttributeTypeDescription
strdup
domainScope
@@ -1567,12 +1589,12 @@ jpegPhoto
supportedSASLMechanisms
ACLs
reqMethod
-authzID
-authzid
authzId
+authzid
+authzID
hasSubordintes
-proxycache
proxyCache
+proxycache
slaptest
olcLogLevel
LDAPDN
@@ -1597,8 +1619,8 @@ wBDARESEhgVG
multi
aaa
ldaprc
-updatedn
UpdateDN
+updatedn
LDAPBASE
LDAPAPIFeatureInfo
authzTo
@@ -1640,6 +1662,6 @@ ali
attributeoptions
BfQ
uidNumber
-CAs
CA's
+CAs
namingContext
diff --git a/doc/guide/admin/install.sdf b/doc/guide/admin/install.sdf
index c7fd12d200c482f6206a3c766c043505c1ac0a60..4d6e1ced1ac9ab55b815f6c1a6bbb80e696fd32d 100644
--- a/doc/guide/admin/install.sdf
+++ b/doc/guide/admin/install.sdf
@@ -115,7 +115,7 @@ H3: Database Software
OpenLDAP's {{slapd}}(8) {{TERM:BDB}} and {{TERM:HDB}} primary database backends
require {{ORG[expand]Oracle}} {{PRD:Berkeley DB}}.
-If not available at configure time, you will not be able build
+If not available at configure time, you will not be able to build
{{slapd}}(8) with these primary database backends.
Your operating system may provide a supported version of
diff --git a/doc/guide/admin/maintenance.sdf b/doc/guide/admin/maintenance.sdf
index 7d480c2ef7248bc4ed317387d6bef40f55da742f..0fb29fe2b39b9c994b017ac5f8b0023c36b76d73 100644
--- a/doc/guide/admin/maintenance.sdf
+++ b/doc/guide/admin/maintenance.sdf
@@ -112,7 +112,7 @@ The advantages of {{F:DB_CONFIG}} usage can be the following:
To figure out the best-practice BDB backup scenario, the reader is highly
recommended to read the whole Chapter 9: Berkeley DB Transactional Data Store Applications.
This chapter is a set of small pages with examples in C language. Non-programming
-people can skip this examples without loss of knowledge.
+people can skip these examples without loss of knowledge.
H2: Checkpointing
diff --git a/doc/guide/admin/quickstart.sdf b/doc/guide/admin/quickstart.sdf
index 833964b03c0118aefa5405118adcbc95c6b28b87..83b10c71dfaebbda08be59a17fab774f3fe13259 100644
--- a/doc/guide/admin/quickstart.sdf
+++ b/doc/guide/admin/quickstart.sdf
@@ -271,8 +271,7 @@ Note that by default, the {{slapd}}(8) database grants {{read access
to everybody}} excepting the {{super-user}} (as specified by the
{{EX:rootdn}} configuration directive). It is highly recommended
that you establish controls to restrict access to authorized users.
-Access controls are discussed in the {{SECT:The access Configuration
-Directive}} section of {{SECT:The slapd Configuration File}} chapter.
+Access controls are discussed in the {{SECT:Access Control}} chapter.
You are also encouraged to read the {{SECT:Security Considerations}},
{{SECT:Using SASL}} and {{SECT:Using TLS}} sections.
diff --git a/doc/guide/admin/runningslapd.sdf b/doc/guide/admin/runningslapd.sdf
index 202645c165dbd909ea1cfbe91440231e6f3761c2..b1374a6ef79a77d728fc167534cb3de68f3fac1b 100644
--- a/doc/guide/admin/runningslapd.sdf
+++ b/doc/guide/admin/runningslapd.sdf
@@ -21,7 +21,7 @@ The default is normally {{F:/usr/local/etc/openldap/slapd.conf}}.
> -F <slapd-config-directory>
-Specifies the slapd configuration directory. The default is {{F:/usr/local/etc/openldap/slapd.d}}
+Specifies the slapd configuration directory. The default is {{F:/usr/local/etc/openldap/slapd.d}}.
If both {{EX:-f}} and {{EX:-F}} are specified, the config file will be read and converted
to config directory format and written to the specified directory.
diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index e638a532de00d9399c2099e36047962b2dfaa02f..e1d45b36bc16280446ae4f792305fda0416ffdcd 100644
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -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
diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index 912d4df5887dce12543d8d05e8fa5c3f967640be..ad37b35f58ea119da678e16716947266995169c8 100644
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -171,7 +171,7 @@ to work (except for the two statistics levels, which are always
enabled). Log levels may be specified as integers or by keyword.
Multiple log levels may be used and the levels are additive.
To display what levels
-correspond to what kind of debugging, invoke slapd with {{EX:-?}}
+correspond to what kind of debugging, invoke slapd with {{EX:-d?}}
or consult the table below. The possible values for <level> are:
!block table; colaligns="RL"; align=Center; \
diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index ecf08723d64226559b16f9cf37d129d49faf393d..93efea090c81a08732b30141f2d28c2dd4e6df2b 100644
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -137,7 +137,7 @@ the {{syslogd}}(8) {{EX:LOG_LOCAL4}} facility). You must have
configured OpenLDAP {{EX:--enable-debug}} (the default) for this
to work (except for the two statistics levels, which are always
enabled). Log levels are additive. To display what numbers
-correspond to what kind of debugging, invoke slapd with {{EX:-?}}
+correspond to what kind of debugging, invoke slapd with {{EX:-d?}}
or consult the table below. The possible values for <integer> are:
!block table; colaligns="RL"; align=Center; \