From 3a4fe0ff0d0a7135c50f5810ad36d28f6c09b630 Mon Sep 17 00:00:00 2001
From: Gavin Henry <ghenry@openldap.org>
Date: Mon, 3 Sep 2007 22:59:36 +0000
Subject: [PATCH] Upgrading from 2.3.x Appendix added. Please comment.

---
 doc/guide/admin/Makefile               |  4 ++-
 doc/guide/admin/appendix-upgrading.sdf | 44 ++++++++++++++++++++++++++
 doc/guide/admin/aspell.en.pws          |  3 +-
 doc/guide/admin/master.sdf             |  4 +++
 4 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 doc/guide/admin/appendix-upgrading.sdf

diff --git a/doc/guide/admin/Makefile b/doc/guide/admin/Makefile
index 6b33980f98..f4ba869bc8 100644
--- a/doc/guide/admin/Makefile
+++ b/doc/guide/admin/Makefile
@@ -18,7 +18,9 @@ sdf-src: \
 	../plain.sdf \
 	../preamble.sdf \
 	abstract.sdf \
+	appendix-changes.sdf \
 	appendix-configs.sdf \
+	appendix-upgrading.sdf \
 	backends.sdf \
 	config.sdf \
 	dbtools.sdf \
@@ -66,4 +68,4 @@ guide.pdf: admin.html
 	htmldoc --batch guide.book
 
 clean: 
-	rm -f *.pdf *.html *~
+	rm -f *.pdf *.html *~ *.bak
diff --git a/doc/guide/admin/appendix-upgrading.sdf b/doc/guide/admin/appendix-upgrading.sdf
new file mode 100644
index 0000000000..eedfb1009e
--- /dev/null
+++ b/doc/guide/admin/appendix-upgrading.sdf
@@ -0,0 +1,44 @@
+# $OpenLDAP$
+# Copyright 2007 The OpenLDAP Foundation, All Rights Reserved.
+# COPYING RESTRICTIONS APPLY, see COPYRIGHT.
+
+H1: Upgrading from 2.3.x
+
+The following sections attempt to document the steps you will need to take in order 
+to upgrade from the latest 2.3.x OpenLDAP version.
+
+The normal upgrade procedure, as discussed in the {{SECT:Maintenance}} section, should 
+of course still be followed prior to doing any of this.
+
+H2: Monitor Backend
+
+Note: This is a temporary requirement and is subject to change over the next 2.4.x beta release cycle
+
+A monitor ({{slapd-monitor(5)}}) now needs a {{rootdn}} entry. If you do not have
+one, {{slapd}} will fail to start up with an error message like so:
+
+>           monitor_back_register_entry_attrs(""): base="cn=databases,cn=monitor" scope=one
+>           filter="(namingContexts:distinguishedNameMatch:=dc=example,dc=com)": unable to find entry
+>           backend_startup_one: bi_db_open failed! (1)
+>           slap_startup failed (test would succeed using the -u switch)
+
+Here is a complete {{database monitor}} example:
+
+
+>           database monitor
+>           rootdn cn=monitor
+>           rootpw change_me
+
+
+H2: {{B:cn=config}} olc* attributes
+
+Quite a few {{olc*}} attributes have now become obsolete, if you see in your logs 
+entries like below, just remove them from the relevant ldif file.
+
+>           olcReplicationInterval: value #0: <olcReplicationInterval> keyword is obsolete (ignored)
+
+
+
+
+ADD MORE HERE
+
diff --git a/doc/guide/admin/aspell.en.pws b/doc/guide/admin/aspell.en.pws
index a28b908c2f..ef1e8fb3bd 100644
--- a/doc/guide/admin/aspell.en.pws
+++ b/doc/guide/admin/aspell.en.pws
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 1405 
+personal_ws-1.1 en 1406 
 nattrsets
 inappropriateAuthentication
 api
@@ -648,6 +648,7 @@ olcBackendConfig
 dn
 fd
 LDAPSync
+olcReplicationInterval
 fG
 fi
 eq
diff --git a/doc/guide/admin/master.sdf b/doc/guide/admin/master.sdf
index f9dc9ee61a..ec495af909 100644
--- a/doc/guide/admin/master.sdf
+++ b/doc/guide/admin/master.sdf
@@ -88,6 +88,10 @@ PB:
 !include "appendix-changes.sdf"; appendix
 PB:
 
+# Upgrade from 2.3.x
+!include "appendix-upgrading.sdf"; appendix
+PB:
+
 # Config file examples
 !include "appendix-configs.sdf"; appendix
 PB:
-- 
2.39.5