Fix a few typos (including those from ITS#683)

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index ce8b021d96165f10c8fb2a5f4a1718536f49a799..9b362114d66bf043f7fd86e6dc4fe5f5e1d17eb4 100644 (file)
--- a/doc/guide/admin/intro.sdf
+++ b/doc/guide/admin/intro.sdf
@@ -19,7 +19,7 @@ H2: What is a directory service?
 A directory is specialized database optimized for reading, browsing and
 searching.  Directories tend to contain descriptive, attribute-based
 information and support sophisticated filtering capabilities.  Directories
-are generally do not support complicated transaction or roll-back schemes
+generally do not support complicated transaction or roll-back schemes
 found in database management systems designed for handling high-volume
 complex updates.  Directory updates are typically simple all-or-nothing
 changes, if they are allowed at all.  Directories are tuned to give
@@ -225,7 +225,7 @@ H2: What about X.500?
 
 Technically, LDAP is a directory access protocol to an {{TERM:X.500}}
 directory service, the {{TERM:OSI}} directory service.  Initial
-LDAP servers were gateway between LDAP and the X.500 {{TERM[expand]DAP}}
+LDAP servers were gateways between LDAP and the X.500 {{TERM[expand]DAP}}
 ({{TERM:DAP}}).  DAP is a heavyweight protocol that operates over a full
 OSI protocol stack and requires a significant amount of computing
 resources.  LDAP is designed to operate over {{TERM:TCP}}/{{TERM:IP}}

diff --git a/doc/guide/admin/quickstart.sdf b/doc/guide/admin/quickstart.sdf
index cae13dc44220ed91b9106579efa60a77896c67e3..66452012fbdae23153fdb209cb3078637d8e66ed 100644 (file)
--- a/doc/guide/admin/quickstart.sdf
+++ b/doc/guide/admin/quickstart.sdf
@@ -43,7 +43,7 @@ following commands:
 
 . then relocate yourself into the distribution directory:
 
-..{{EX:cd openldap-VERSION.tgz}}
+..{{EX:cd openldap-VERSION}}
 
 . You'll have to replace {{F:VERSION}} with the version
 name of the release.
@@ -130,12 +130,12 @@ whatever installation prefix was used by {{EX:configure}}.
 +{{B:Edit the configuration file}}.
 
 . Use your favorite editor to edit the provided {{slapd.conf}}(5)
-example (usually installed as {{F:/usr/local/etc/slapd.conf}}) to
-contain an LDBM database definition of the form:
+example (usually installed as {{F:/usr/local/etc/openldap/slapd.conf}})
+to contain an LDBM database definition of the form:
 
 ..{{EX:database        ldbm}}
 ..{{EX:suffix          "dc=<MY-DOMAIN>, dc=<COM>"}}
-..{{EX:rootdn          "cn=Manager, dc=<MY-DOMAIN, dc=<COM>"}}
+..{{EX:rootdn          "cn=Manager, dc=<MY-DOMAIN>, dc=<COM>"}}
 ..{{EX:rootpw          secret}}
 ..{{EX:directory       /usr/local/var/openldap-ldbm}}