Merge remote-tracking branch 'origin/mdb.master'

[openldap] / doc / guide / admin / quickstart.sdf

diff --git a/doc/guide/admin/quickstart.sdf b/doc/guide/admin/quickstart.sdf
index 6c3b0320ae19961afd950e5ecdae2e3e9165acb5..a766a52e410b67cd3ca386396891d8107e244f21 100644 (file)
--- a/doc/guide/admin/quickstart.sdf
+++ b/doc/guide/admin/quickstart.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2006 The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2012 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: A Quick-Start Guide
@@ -86,9 +86,9 @@ what's best:
 
 . Assuming {{EX:configure}} doesn't dislike your system, you can
 proceed with building the software.  If {{EX:configure}} did
-complain, well, you'll likely need to go to the FAQ Installation
-Section ({{URL:http://www.openldap.org/faq/}} and/or actually
-read the {{SECT:Building and Installing OpenLDAP Software}}
+complain, well, you'll likely need to go to the Software FAQ
+{{Installation}} section ({{URL:http://www.openldap.org/faq/?file=8}})
+and/or actually read the {{SECT:Building and Installing OpenLDAP Software}}
 chapter of this document.
 
 
@@ -172,7 +172,7 @@ specified directory must exist prior to starting {{slapd}}(8).
 .{{S: }}
 +{{B:Start SLAPD}}.
 
-. You are now ready to start the stand-alone LDAP server, {{slapd}}(8),
+. You are now ready to start the Standalone LDAP Daemon, {{slapd}}(8),
 by running the command:
 
 ..{{EX:su root -c /usr/local/libexec/slapd}}
@@ -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.