Reorganize tree to better support multiple documents.

doc/guide/config.sdf → doc/guide/admin/config.sdf

@@ -14,7 +14,7 @@ In this configuration, you run a {{I:slapd}} which provides directory service
 for your local domain only. It does not interact with other directory
 servers in any way. This configuration is shown in Figure 2.
 
-!import "figure_2.gif"; align="center"; title="Local service via slapd configuration"
+!import "config_local.gif"; align="center"; title="Local service via slapd configuration"
 FT: Figure 2: Local service via slapd configuration.
 
 Use this configuration if you are just starting out (it's the one the
@@ -32,7 +32,7 @@ X.500 world (you don't have to run the ldapd yourself - you can just
 point to somebody else who does and doesn't mind you pointing to
 their service). This configuration is shown in Figure 3.
 
-!import "figure_3.gif"; align="center"; title="Local service via slapd + X.500 referrals configuration"
+!import "config_x500ref.gif"; align="center"; title="Local service via slapd + X.500 referrals configuration"
 FT: Figure 3: Local service via slapd + X.500 referrals configuration
 
 Use this configuration if you want to provide local service but still want
@@ -50,7 +50,7 @@ rest of the X.500 world. LDAP clients gain access to the directory
 through an ldapd which runs at your site. This configuration is shown
 in Figure 4.
 
-!import "figure_4.gif"; align="center"; title="Local service via X.500 and ldapd configuration"
+!import "config_x500fe.gif"; align="center"; title="Local service via X.500 and ldapd configuration"
 FT: Figure 4: Local service via X.500 and ldapd configuration
 
 Use this configuration if you are already running an X.500 service.
@@ -65,7 +65,7 @@ The slurpd daemon is used to propagate changes from a master slapd
 to one or more slave slapds. An example master-slave configuration
 is shown in figure 5.
 
-!import "figure_5.gif"; align="center"; title="Master slapd with two slaves replicated with slurpd"
+!import "config_repl.gif"; align="center"; title="Master slapd with two slaves replicated with slurpd"
 FT: Figure 5: Master slapd with two slaves replicated with slurpd
 
 This configuration can be used in conjunction with the first two

doc/guide/intro.sdf → doc/guide/admin/intro.sdf

@@ -69,7 +69,7 @@ think of. Figure 1 shows an example LDAP directory tree, which should help
 make things clear.
 
 
-!import "figure_1.gif"; align="center"; title="An example LDAP directory tree"
+!import "intro_tree.gif"; align="center"; title="An example LDAP directory tree"
 FT: Figure 1: An example LDAP directory tree.
 
 

doc/guide/master.sdf → doc/guide/admin/master.sdf

 # Copyright 1999, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 #
-# master.sdf 
 # SDF master file for the OpenLDAP Administrator's guide
+# master.sdf 
 
 # title information
 !include "title.sdf"
@@ -11,20 +11,21 @@
 !include "preamble.sdf"; plain
 
 # Chapters
-!include "intro.sdf"
-!include "quickstart.sdf"
-!include "config.sdf"
-!include "install.sdf"
-!include "slapdconfig.sdf"
-!include "runningslapd.sdf"
-!include "monitoringslapd.sdf"
-!include "dbtools.sdf"
-!include "tuning.sdf"
-!include "referrals.sdf"
-!include "replication.sdf"
+!include "intro.sdf"; chapter
+!include "quickstart.sdf"; chapter
+!include "config.sdf"; chapter
+!include "install.sdf"; chapter
+!include "slapdconfig.sdf"; chapter
+!include "runningslapd.sdf"; chapter
+!include "monitoringslapd.sdf"; chapter
+!include "dbtools.sdf"; chapter
+!include "tuning.sdf"; chapter
+!include "referrals.sdf"; chapter
+!include "replication.sdf"; chapter
 
 # Appendices 
+!include "../release/autoconf.sdf"; appendix
 
 # Software Copyright/License
-!include "copyright.sdf"; appendix
-!include "license.sdf"; appendix
+!include "../release/copyright.sdf"; appendix
+!include "../release/license.sdf"; appendix

doc/guide/replication.sdf → doc/guide/admin/replication.sdf

@@ -381,7 +381,7 @@ X.500 DSA, slurpd runs on the master slapd host, and
 sends changes to an ldapd which acts as a gateway to
 the X.500 DSA:
 
-!import "figure_1.gif"; align="center"; title="Replication from slapd to an X.500 DSA"
+!import "replication.gif"; align="center"; title="Replication from slapd to an X.500 DSA"
 FT: Figure 6: Replication from slapd to an X.500 DSA
 
 Note that the X.500 DSA must be a read-only copy. Since