diff --git a/CHANGES b/CHANGES
index 7187d5aed8b5ba39237313faa690249372ac6366..4d4b33f5fc8c5fe5a00ae9e64a859524255090de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,8 @@ OpenLDAP 2.4.24 Engineering
 	Fixed slapo-pcache to ignore undefined attrs (ITS#6600)
 	Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608)
 	Fixed slapo-syncprov to send error if consumer is newer (ITS#6606)
+	Documentation
+		admin24 guide typo fixes (ITS#6609)
 
 OpenLDAP 2.4.23 Release (2010/06/30)
 	Fixed libldap to return server's error code (ITS#6569)
diff --git a/doc/guide/admin/access-control.sdf b/doc/guide/admin/access-control.sdf
index 2546eb51ed8b25c8a33624ea8b0d3d243ecb7b92..6d705a645534f1a35c9b6dfe737eaf81201e9403 100644
--- a/doc/guide/admin/access-control.sdf
+++ b/doc/guide/admin/access-control.sdf
@@ -826,7 +826,7 @@ This ACL grants read permissions to authenticated users while denying others
 
 H3: Controlling rootdn access
 
-You could specify the {{rootdn}} in {{slapd.conf}}(5) or {[slapd.d}} without 
+You could specify the {{rootdn}} in {{slapd.conf}}(5) or {{slapd.d}} without 
 specifying a {{rootpw}}. Then you have to add an actual directory entry with 
 the same dn, e.g.:
 
@@ -876,7 +876,7 @@ One can then grant access to the members of this this group by adding appropriat
 >        by group.exact="cn=Administrators,dc=example,dc=com" write  
 >        by * auth
 
-Like by {[dn}} clauses, one can also use {{expand}} to expand the group name 
+Like by {{dn}} clauses, one can also use {{expand}} to expand the group name 
 based upon the regular expression matching of the target, that is, the to {{dn.regex}}). 
 For instance,
 
diff --git a/doc/guide/admin/appendix-common-errors.sdf b/doc/guide/admin/appendix-common-errors.sdf
index 4ff03563499580d58674903163353c4b5c0d0887..124853b5c0405f11fb05a8e2fc1d50c902026504 100644
--- a/doc/guide/admin/appendix-common-errors.sdf
+++ b/doc/guide/admin/appendix-common-errors.sdf
@@ -11,7 +11,7 @@ H2: Common causes of LDAP errors
 
 H3: ldap_*: Can't contact LDAP server
 
-The {[B:Can't contact LDAP server}} error is usually returned when the LDAP 
+The {{B:Can't contact LDAP server}} error is usually returned when the LDAP 
 server cannot be contacted. This may occur for many reasons:
 
 * the LDAP server is not running; this can be checked by running, for example,