Sync with HEAD

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

diff --git a/doc/guide/admin/master.sdf b/doc/guide/admin/master.sdf
index 3a2d6efcc3e1d3abd2c247e4c55090c4d95d886b..c8d7f046b3b60fb705e1a002ccf3ee7ddb4dd022 100644 (file)
--- a/doc/guide/admin/master.sdf
+++ b/doc/guide/admin/master.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2005, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 #
 # master file for the OpenLDAP Administrator's Guide
@@ -36,21 +36,33 @@ PB:
 !include "install.sdf"; chapter
 PB:
 
+!include "slapdconf2.sdf"; chapter
+PB:
+
 !include "slapdconfig.sdf"; chapter
 PB:
 
 !include "runningslapd.sdf"; chapter
 PB:
 
-#!include "monitoringslapd.sdf"; chapter
-#PB:
-
 !include "dbtools.sdf"; chapter
 PB:
 
 !include "schema.sdf"; chapter
 PB:
 
+!include "security.sdf"; chapter
+PB:
+
+!include "sasl.sdf"; chapter
+PB:
+
+!include "tls.sdf"; chapter
+PB:
+
+#!include "monitoringslapd.sdf"; chapter
+#PB:
+
 #!include "tuning.sdf"; chapter
 #PB:
 
@@ -60,6 +72,12 @@ PB:
 !include "replication.sdf"; chapter
 PB:
 
+!include "syncrepl.sdf"; chapter
+PB:
+
+!include "proxycache.sdf"; chapter
+PB:
+
 # Appendices 
 !include "../release/autoconf.sdf"; appendix
 PB: