Sync with HEAD

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

diff --git a/doc/guide/admin/master.sdf b/doc/guide/admin/master.sdf
index fc81cc14418b563a4cfb4115906559a7b5c7af48..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
@@ -13,7 +13,6 @@
 # To generate pages for web
 #      sdf -2topics index.sdf
 #
-
 !include "../preamble.sdf"; plain
 
 # title information
@@ -27,27 +26,58 @@ PB:
 # Chapters
 !include "intro.sdf"; chapter
 PB:
+
 !include "quickstart.sdf"; chapter
 PB:
+
 !include "config.sdf"; chapter
 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 "tuning.sdf"; chapter
+
+!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:
+
 !include "referrals.sdf"; chapter
 PB:
+
 !include "replication.sdf"; chapter
 PB:
 
+!include "syncrepl.sdf"; chapter
+PB:
+
+!include "proxycache.sdf"; chapter
+PB:
+
 # Appendices 
 !include "../release/autoconf.sdf"; appendix
 PB:
@@ -55,4 +85,5 @@ PB:
 # Software Copyright/License
 !include "../release/copyright.sdf"; appendix
 PB:
+
 !include "../release/license.sdf"; appendix