ITS#5476

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

diff --git a/doc/guide/admin/master.sdf b/doc/guide/admin/master.sdf
index 004e62e38dbca51dbcca226a8b9f3a7f3b50af7c..d42e9e1daa91dd43764de1cf6c7156341382d8fe 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-2008 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 #
 # master file for the OpenLDAP Administrator's Guide
@@ -36,23 +36,38 @@ PB:
 !include "install.sdf"; chapter
 PB:
 
+!include "slapdconf2.sdf"; chapter
+PB:
+
 !include "slapdconfig.sdf"; chapter
 PB:
 
-!include "runningslapd.sdf"; chapter
+!include "access-control.sdf"; chapter
 PB:
 
-#!include "monitoringslapd.sdf"; chapter
-#PB:
+!include "runningslapd.sdf"; chapter
+PB:
 
 !include "dbtools.sdf"; chapter
 PB:
 
+!include "backends.sdf"; chapter
+PB:
+
+!include "overlays.sdf"; chapter
+PB:
+
 !include "schema.sdf"; chapter
 PB:
 
-#!include "tuning.sdf"; chapter
-#PB:
+!include "security.sdf"; chapter
+PB:
+
+!include "sasl.sdf"; chapter
+PB:
+
+!include "tls.sdf"; chapter
+PB:
 
 !include "referrals.sdf"; chapter
 PB:
@@ -60,10 +75,56 @@ PB:
 !include "replication.sdf"; chapter
 PB:
 
-!include "sasl.sdf"; chapter
+!include "maintenance.sdf"; chapter
+PB:
+
+!include "monitoringslapd.sdf"; chapter
+PB:
+
+!include "tuning.sdf"; chapter
+PB:
+
+!include "troubleshooting.sdf"; chapter
 PB:
 
 # Appendices 
+!include "appendix-changes.sdf"; appendix
+PB:
+
+# Upgrade from 2.3.x
+!include "appendix-upgrading.sdf"; appendix
+PB:
+
+# Common Errors
+!include "appendix-common-errors.sdf"; appendix
+PB:
+
+# What versions we recommend 
+!include "appendix-recommended-versions.sdf"; appendix
+PB:
+
+# Real Deployments
+!include "appendix-deployments.sdf"; appendix
+PB:
+
+# Contributions
+!include "appendix-contrib.sdf"; appendix
+PB:
+
+# Config file examples
+!include "appendix-configs.sdf"; appendix
+PB:
+
+# LDAP Result Codes
+!include "appendix-ldap-result-codes.sdf"; appendix
+PB:
+
+
+# Terms
+!include "glossary.sdf"; appendix
+PB:
+
+# Autoconf 
 !include "../release/autoconf.sdf"; appendix
 PB: