reorder chapters and start of a migration/upgrade section.

diff --git a/doc/guide/admin/maintenance.sdf b/doc/guide/admin/maintenance.sdf
index 0fb29fe2b39b9c994b017ac5f8b0023c36b76d73..9f57aef4d67243b2958e5fc3c9abbc914f3f03b1 100644 (file)
--- a/doc/guide/admin/maintenance.sdf
+++ b/doc/guide/admin/maintenance.sdf
@@ -138,6 +138,29 @@ a workaround is to invoke "db_checkpoint" from a cron script every so often, say
 
 H2: Migration
 
-Exporting to a new system......
+The simplest steps needed to migrate between versions or upgrade, depending on your deployment
+type are:
+
+.{{S: }}
+^{{B: Stop the current server when convenient}}
+
+.{{S: }}
++{{B: slapcat the current data out}}
+
+.{{S: }}
++{{B: Clear out the current data directory (/usr/local/var/openldap-data/) leaving DB_CONFIG in place}}
+
+.{{S: }}
++{{B: Perform the software upgrades}}
+
+.{{S: }}
++{{B: slapadd the exported data back into the directory}}
+
+.{{S: }}
++{{B: Start the server}}
+
+Obviously this doesn't cater for any complicated deployments like {{SECT: MirrorMode}} or {{SECT: N-Way Multi-Master}}, 
+but following the above sections and using either commercial support or community support should help. Also check the
+{{SECT: Troubleshooting}} section.
 
 

diff --git a/doc/guide/admin/master.sdf b/doc/guide/admin/master.sdf
index d42e9e1daa91dd43764de1cf6c7156341382d8fe..da1bf3b87e0d4e2a0d4ff29382b1a8fd7f780c2e 100644 (file)
--- a/doc/guide/admin/master.sdf
+++ b/doc/guide/admin/master.sdf
@@ -42,10 +42,10 @@ PB:
 !include "slapdconfig.sdf"; chapter
 PB:
 
-!include "access-control.sdf"; chapter
+!include "runningslapd.sdf"; chapter
 PB:
 
-!include "runningslapd.sdf"; chapter
+!include "access-control.sdf"; chapter
 PB:
 
 !include "dbtools.sdf"; chapter