ITS#741 fixes

diff --git a/doc/guide/admin/quickstart.sdf b/doc/guide/admin/quickstart.sdf
index fdc2187a6346165bea7a173bb48653eed9ea6f81..d3757fc83b5731cc0f3fd5996b34cc565ff2a10b 100644 (file)
--- a/doc/guide/admin/quickstart.sdf
+++ b/doc/guide/admin/quickstart.sdf
@@ -209,22 +209,22 @@ in the {{slapd}}(8) manual page and the
 ..{{EX:objectclass: organization}}
 ..{{EX:o: <MY ORGANIZATION>}}
 ..{{EX:dc: <MY-DOMAIN>}}
-..{{EX: }}
+..{{EX:}}
 ..{{EX:dn: cn=Manager, dc=<MY-DOMAIN>, dc=<COM>}}
 ..{{EX:objectclass: organizationalRole}}
 ..{{EX:cn: Manager}}
 
 . Be sure to replace <MY-DOMAIN> and <COM> with the appropriate domain
 components of your domain name.  <MY ORGANIZATION> should be replaced
-with the name of your organization. If you cut and paste, be sure
-to trim any leading whitespace from the example:
+with the name of your organization.  If you cut and paste, be sure
+to trim any leading and trailing whitespace from the example.
 
 ..{{EX:dn: dc=example, dc=com}}
 ..{{EX:objectclass: dcObject}}
 ..{{EX:objectclass: organization}}
 ..{{EX:o: Example Company}}
 ..{{EX:dc: example}}
-..{{EX: }}
+..{{EX:}}
 ..{{EX:dn: cn=Manager, dc=example, dc=com}}
 ..{{EX:objectclass: organizationalRole}}
 ..{{EX:cn: Manager}}

diff --git a/doc/guide/admin/replication.sdf b/doc/guide/admin/replication.sdf
index 9c557e3c7f7b0a3bd0d2e2d31e1323da7d7a3a5e..63aa6512099bbca052a65814b35ce6b4a41806d5 100644 (file)
--- a/doc/guide/admin/replication.sdf
+++ b/doc/guide/admin/replication.sdf
@@ -302,7 +302,7 @@ string "{{F:.rej}}" appended. For example, for a replica running
 on host {{EX:slave.example.com}}, port 389, the reject file, if it
 exists, will be named
 
->      /usr/local/var/openldap/replog.slave.example.com:389.
+>      /usr/local/var/openldap/replog.slave.example.com:389.rej
 
 A sample rejection log entry follows:
 

diff --git a/doc/guide/admin/runningslapd.sdf b/doc/guide/admin/runningslapd.sdf
index 50376544e0f1231043e78f02887744960a7f0df8..377769a558e33b6c763d678c9abaa5715e561cdc 100644 (file)
--- a/doc/guide/admin/runningslapd.sdf
+++ b/doc/guide/admin/runningslapd.sdf
@@ -28,7 +28,7 @@ specific host-port pairs or other protocol schemes (such as
 ldaps:// or ldapi://).  For example,
 {{EX:-h "ldaps:// ldap://127.0.0.1:666"}} will create
 two listeners: one for LDAP over SSL on all interfaces on
-the default LDAP/SSL port 646, and one for LDAP over TCL on
+the default LDAP/SSL port 646, and one for LDAP over TCP on
 the {{EX:localhost}} ({{loopback}}) interface on port 666.
 Hosts may be specified using IPv4 dotted-decimal form or
 using host names.  Port values must be numeric.

diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index 1e47e97fb46420ea272ad6f5d0938d7a18844671..e916ff4c0008d29cbb8790ba4d1f98ed334de37a 100644 (file)
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -387,10 +387,10 @@ prefix of another, it must appear after it in the config file.
 
 H4: updatedn <dn>
 
-This directive is only applicable in a slave slapd. It specifies the
-DN allowed to make changes to the replica.  This may be the
-the DN slurpd binds as when making changes to the replica or
-the DN associated with a SASL identity.
+This directive is only applicable in a slave slapd. It specifies
+the DN allowed to make changes to the replica.  This may be the DN
+{{slurpd}}(8) binds as when making changes to the replica or the DN
+associated with a SASL identity.
 
 Entry-based Example: