RDBM/RDBMS consistency, add GnuTLS, tweak Replication/Configuration notes

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index 71f4f543fc31b4c57557f978d3e7d2fd076e561e..6813868ed6965a03966c02c5856ddb4acaaa4540 100644 (file)
--- a/doc/guide/admin/intro.sdf
+++ b/doc/guide/admin/intro.sdf
@@ -231,8 +231,8 @@ H2: LDAP vs RDBMS
 
 This question is raised many times, in different forms. The most common, 
 however, is: {{Why doesn't OpenLDAP drop Berkeley DB and use a relational 
-database management system (RDBM) instead?}} In general, expecting that the 
-sophisticated algorithms implemented by commercial-grade RDBM would make 
+database management system (RDBMS) instead?}} In general, expecting that the 
+sophisticated algorithms implemented by commercial-grade RDBMS would make 
 {{OpenLDAP}} be faster or somehow better and, at the same time, permitting 
 sharing of data with other applications.
 
@@ -244,7 +244,7 @@ database software. This is the same software used by leading commercial
 directory software.
 
 Now for the long answer. We are all confronted all the time with the choice 
-RDBMs vs. directories. It is a hard choice and no simple answer exists.
+RDBMSes vs. directories. It is a hard choice and no simple answer exists.
 
 It is tempting to think that having a RDBMS backend to the directory solves all 
 problems. However, it is a pig. This is because the data models are very 
@@ -354,7 +354,7 @@ SASL}} software which supports a number of mechanisms including
 {{B:{{TERM[expand]TLS}}}}: {{slapd}} supports certificate-based
 authentication and data security (integrity and confidentiality)
 services through the use of TLS (or SSL).  {{slapd}}'s TLS
-implementation utilizes {{PRD:OpenSSL}} software.
+implementation can utilize either {{PRD:OpenSSL}} or {{PRD:GnuTLS}} software.
 
 {{B:Topology control}}: {{slapd}} can be configured to restrict
 access at the socket layer based upon network topology information.
@@ -405,8 +405,10 @@ required while providing high performance.
 {{B:Replication}}: {{slapd}} can be configured to maintain shadow
 copies of directory information.  This {{single-master/multiple-slave}}
 replication scheme is vital in high-volume environments where a
-single {{slapd}} just doesn't provide the necessary availability
-or reliability.  {{slapd}} includes support for {{LDAP Sync}}-based
+single {{slapd}} installation just doesn't provide the necessary availability
+or reliability.  For extremely demanding environments where a
+single point of failure is not acceptable, {{multi-master}} replication
+is also available.  {{slapd}} includes support for {{LDAP Sync}}-based
 replication.
 
 {{B:Proxy Cache}}: {{slapd}} can be configured as a caching
@@ -415,5 +417,7 @@ LDAP proxy service.
 {{B:Configuration}}: {{slapd}} is highly configurable through a
 single configuration file which allows you to change just about
 everything you'd ever want to change.  Configuration options have
-reasonable defaults, making your job much easier.
+reasonable defaults, making your job much easier. Configuration can
+also be performed dynamically using LDAP itself, which greatly
+improves manageability.
 

diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index 86678304d724a36ffb3021b9da9347e23ec45d95..aab78a59940d79cdfefbaa7326f6ddf687da0593 100644 (file)
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -132,6 +132,7 @@ CVS|http://www.cvshome.org/
 Cyrus|http://cyrusimap.web.cmu.edu/generalinfo.html
 Cyrus SASL|http://asg.web.cmu.edu/sasl/sasl-library.html
 GNU|http://www.gnu.org/software/
+GnuTLS|http://www.gnu.org/software/gnutls/
 GDBM|http://www.gnu.org/software/gdbm/
 Heimdal|http://www.pdc.kth.se/heimdal/
 JLDAP|http://www.openldap.org/jldap/