ITS#6130

diff --git a/CHANGES b/CHANGES
index c8e861cd7002108b20bc7b3950ebf9834014c646..73adca6930c57dbf3acae765055066c172a9fff1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -37,6 +37,7 @@ OpenLDAP 2.4.17 Engineering
                Fixed winsock detection for windows (ITS#6102, ITS#6078)
        Documentation
                admin24 fixed example regex (ITS#6052)
+               admin24 removed temporary back-monitor note (ITS#6130)
                ldapsearch(1) output format description (ITS#6146)
                ldap.conf(5) improve sizelimit/timelimit limits (ITS#6127)
                slapd.conf(5) pidfile/argsfile description fix (ITS#5975)

diff --git a/doc/guide/admin/appendix-upgrading.sdf b/doc/guide/admin/appendix-upgrading.sdf
index d9655314f7c0255896844bba8b85cef2a03bafc4..805be1ba9fe60d9f4cae3e5c5d471ded2c08996c 100644 (file)
--- a/doc/guide/admin/appendix-upgrading.sdf
+++ b/doc/guide/admin/appendix-upgrading.sdf
@@ -10,26 +10,6 @@ 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