Added -F option. Need to sync with current slap*(8)

diff --git a/doc/guide/admin/dbtools.sdf b/doc/guide/admin/dbtools.sdf
index 61b2aec692241cf127327899ed1f6376f85aab9d..32bbefc5c928f05d609c0e05ed66cc4a5a58f784 100644 (file)
--- a/doc/guide/admin/dbtools.sdf
+++ b/doc/guide/admin/dbtools.sdf
@@ -187,6 +187,15 @@ format}} section).
 Specifies the slapd configuration file that tells where to create
 the indices, what indices to create, etc.
 
+>      -F <slapdconfdirectory>
+
+Specifies a config directory.  If both {{EX:-f}} and {{EX:-F}} are specified, 
+the config file will be read and converted to config  directory format and 
+written to the specified directory.  If neither option is specified, an attempt 
+to read the default config directory will be made before trying to use the 
+default config file. If a valid config directory exists then the default 
+config file is ignored. If dryrun mode is also specified, no conversion will occur.
+
 >      -d <debuglevel>
 
 Turn on debugging, as specified by {{EX:<debuglevel>}}. The debug

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index 5a34cd6f057478e35e6cd41d08a9d6dba0f150da..6c41397b657c8de2ca14830140773923fcc868d8 100644 (file)
--- a/doc/guide/admin/intro.sdf
+++ b/doc/guide/admin/intro.sdf
@@ -175,6 +175,9 @@ Some common examples found throughout the industry are, but not limited to:
 * PBX Configuration store
 * etc.....
 
+There are various {{SECT:Distributed Schema Files}} that are standards based, but
+you can always create your own {{SECT:Schema Specification}}.
+
 There are always new ways to use a Directory and apply LDAP principles to address
 certain problems, therefore there is no simple answer to this question.
 
@@ -270,8 +273,7 @@ sharing of data with other applications.
 
 The short answer is that use of an embedded database and custom indexing system 
 allows OpenLDAP to provide greater performance and scalability without loss of 
-reliability. OpenLDAP, since release 2.1, in its main storage-oriented backends 
-(back-bdb and, since 2.2, back-hdb) uses Berkeley DB concurrent / transactional 
+reliability. OpenLDAP uses Berkeley DB concurrent / transactional 
 database software. This is the same software used by leading commercial 
 directory software.
 

diff --git a/doc/guide/admin/replication.sdf b/doc/guide/admin/replication.sdf
index 0df0beab287137560b4c70087bbb8bdbabd8f47c..5bf6a3faab8db1cf5a47810c093d42731d690312 100644 (file)
--- a/doc/guide/admin/replication.sdf
+++ b/doc/guide/admin/replication.sdf
@@ -37,7 +37,7 @@ slaves. It has been replaced for many reasons, in brief:
 
 {{What was it replaced with?}}
 
-Syncrepl.
+Syncrepl
 
 {{Why is Syncrepl better?}}