From e0f79df5318d2bdfd21caa199d4cc8295595bd30 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 07 Feb 2014 10:47:06 +0000
Subject: [PATCH] FR-74 fix for OPENDJ-1324: Prepare OpenDJ 2.6.1 release notes

---
 src/main/docbkx/release-notes/chap-update-install.xml     |   93 +++++
 src/main/docbkx/release-notes/chap-issues.xml             |  194 ++++-------
 src/main/docbkx/release-notes/chap-support.xml            |   17 
 src/main/docbkx/release-notes/chap-before-you-install.xml |   14 
 src/main/docbkx/release-notes/chap-whats-new.xml          |  511 +++++++----------------------
 src/main/docbkx/release-notes/index.xml                   |   27 
 src/main/docbkx/release-notes/chap-compatibility.xml      |   36 +
 pom.xml                                                   |   79 +--
 src/main/docbkx/admin-guide/index.xml                     |    7 
 src/main/docbkx/release-notes/chap-feedback.xml           |   17 
 10 files changed, 394 insertions(+), 601 deletions(-)

diff --git a/pom.xml b/pom.xml
index a44c2bf..3407491 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,8 +102,8 @@
     <stableSDKversion>version.not.defined</stableSDKversion>
     <currentServerVersion>2.6.0</currentServerVersion>
     <stableServerVersion>2.6.0</stableServerVersion>
-    <docTargetVersion>2.6.0</docTargetVersion>
-    <sdkDocTargetVersion>2.6.0</sdkDocTargetVersion>
+    <docTargetVersion>2.6.1</docTargetVersion>
+    <sdkDocTargetVersion>2.6.7</sdkDocTargetVersion>
     <siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
     <i18nFrameworkVersion>1.4.0</i18nFrameworkVersion>
     <grizzlyFrameworkVersion>2.3.4</grizzlyFrameworkVersion>
@@ -122,60 +122,27 @@
      *
     </opendj.osgi.import>
     <!--
-      Release date is specified only when building the documentation
-      for publication. For example:
-          -D"releaseDate=Software release date: January 1, 1970"
-      Otherwise release date should remain empty.
+       Release date and publication date are set at release build time.
+         -D"releaseDate=Software release date: January 1, 1970"
+         -D"pubDate=Publication date: December 31, 1969"
+       At all other times, the dates should be empty.
     -->
     <releaseDate />
     <softwareReleaseDate>${releaseDate}</softwareReleaseDate>
+    <pubDate />
+    <publicationDate>${pubDate}</publicationDate>
     <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
-    <frDocPluginVersion>1.2.0</frDocPluginVersion>
+    <frDocPluginVersion>2.0.0</frDocPluginVersion>
 
     <!-- Permit doc build to override relative locations of non DocBook content -->
-    <configRefBase>http://opendj.forgerock.org/opendj-server/configref/</configRefBase>
-    <serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
-    <sdkJavadocBase>http://opendj.forgerock.org/opendj-ldap-sdk/apidocs/</sdkJavadocBase>
+    <configRefBase>http://docs.forgerock.org/en/opendj/2.6.0/configref/</configRefBase>
+    <serverJavadocBase>http://docs.forgerock.org/en/opendj/2.6.0/javadoc/</serverJavadocBase>
+    <sdkJavadocBase>http://docs.forgerock.org/en/opendj/2.6.0/javadoc/</sdkJavadocBase>
     
-    <!-- Filtered docbkx sources -->
-    <docbkxSourceDirectory>target/docbkx-filtered</docbkxSourceDirectory>
   </properties>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter-docbkx-resources</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <inherited>false</inherited>
-            <configuration>
-              <!-- Filter XML to allow ${property} in attribute values. -->
-              <outputDirectory>${docbkxSourceDirectory}</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/docbkx</directory>
-                  <filtering>true</filtering>
-                  <includes>
-                    <include>**/*.xml</include>
-                  </includes>
-                </resource>
-                <resource>
-                  <directory>src/main/docbkx</directory>
-                  <filtering>false</filtering>
-                  <excludes>
-                    <exclude>**/*.xml</exclude>
-                  </excludes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+<!-- For 2.6.x, we deliver only release notes, so leave out the log reference.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -202,18 +169,32 @@
           </artifactItems>
         </configuration>
       </plugin>
+-->
       <plugin>
         <groupId>org.forgerock.commons</groupId>
         <artifactId>forgerock-doc-maven-plugin</artifactId>
         <version>${frDocPluginVersion}</version>
         <inherited>false</inherited>
         <configuration>
-         <docbkxSourceDirectory>${docbkxSourceDirectory}</docbkxSourceDirectory> <!-- Use filtered XML -->
          <projectName>OpenDJ</projectName>
          <googleAnalyticsId>${gaId}</googleAnalyticsId>
         </configuration>
         <executions>
           <execution>
+            <id>copy-common</id>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>boilerplate</goal>
+            </goals>
+          </execution>
+          <execution>
+           <id>filter-sources</id>
+           <phase>pre-site</phase>
+           <goals>
+            <goal>filter</goal>
+           </goals>
+          </execution>
+          <execution>
            <id>run-jcite</id>
            <phase>pre-site</phase>
            <configuration>
@@ -226,10 +207,10 @@
            </goals>
           </execution>
           <execution>
-            <id>copy-common</id>
+            <id>prepare-sources</id>
             <phase>pre-site</phase>
             <goals>
-              <goal>boilerplate</goal>
+              <goal>prepare</goal>
             </goals>
           </execution>
           <execution>
diff --git a/src/main/docbkx/admin-guide/index.xml b/src/main/docbkx/admin-guide/index.xml
index b7eef2e..fc86958 100644
--- a/src/main/docbkx/admin-guide/index.xml
+++ b/src/main/docbkx/admin-guide/index.xml
@@ -20,14 +20,13 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !
 -->
 <book xml:id='admin-guide'
  xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
  xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
- xmlns:xlink='http://www.w3.org/1999/xlink'
  xmlns:xinclude='http://www.w3.org/2001/XInclude'>
  <info>
   <title>OpenDJ <?eval ${docTargetVersion}?> Administration Guide</title>
@@ -36,7 +35,7 @@
    project offers open source LDAP directory services in Java.</para>
   </abstract>
   <copyright>
-   <year>2011-2013</year>
+   <year>2011-2014</year>
    <holder>ForgeRock AS</holder>
   </copyright>
   <authorgroup>
@@ -147,6 +146,7 @@
  <xinclude:include href='appendix-extended-ops.xml' />
  <xinclude:include href='appendix-l10n.xml' />
  <xinclude:include href='appendix-interface-stability.xml' />
+<!-- For 2.6.x, we deliver only release notes, so leave out the log reference.
  <xinclude:include href='../../../target/logref/log-message-reference.xml'>
   <xinclude:fallback>
    <appendix>
@@ -156,6 +156,7 @@
    </appendix>
   </xinclude:fallback>
  </xinclude:include>
+-->
 
  <index />
 </book>
diff --git a/src/main/docbkx/release-notes/chap-before-you-install.xml b/src/main/docbkx/release-notes/chap-before-you-install.xml
index 63acf2d..23fe3bf 100644
--- a/src/main/docbkx/release-notes/chap-before-you-install.xml
+++ b/src/main/docbkx/release-notes/chap-before-you-install.xml
@@ -20,20 +20,26 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-before-you-install'
          xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-         xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
-         xmlns:xlink='http://www.w3.org/1999/xlink'
-         xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+         xsi:schemaLocation='http://docbook.org/ns/docbook
+                             http://docbook.org/xml/5.0/xsd/docbook.xsd'
+         xmlns:xlink='http://www.w3.org/1999/xlink'>
  <title>Before You Install OpenDJ Software</title>
 
  <para>This chapter covers requirements to consider before you run OpenDJ,
  especially before you run OpenDJ in your production environment.</para>
 
+ <note xml:id="requirements-not-changed">
+  <para>
+   These requirements have not changed since OpenDJ ${stableServerVersion}.
+  </para>
+ </note>
+
  <para>If you have a special request to support a combination not listed here,
  contact ForgeRock at <link xlink:href='mailto:info@forgerock.com'
  >info@forgerock.com</link>.</para>
diff --git a/src/main/docbkx/release-notes/chap-compatibility.xml b/src/main/docbkx/release-notes/chap-compatibility.xml
index 52a06da..ade21a6 100644
--- a/src/main/docbkx/release-notes/chap-compatibility.xml
+++ b/src/main/docbkx/release-notes/chap-compatibility.xml
@@ -20,20 +20,27 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-compatibility'
  xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
- xmlns:xlink='http://www.w3.org/1999/xlink'
- xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+ xsi:schemaLocation='http://docbook.org/ns/docbook
+                     http://docbook.org/xml/5.0/xsd/docbook.xsd'
+ xmlns:xlink='http://www.w3.org/1999/xlink'>
  <title>OpenDJ Compatibility</title>
 
  <para>This chapter covers both major changes to existing functionality, and
  also deprecated and removed functionality.</para>
 
+ <note xml:id="compatibility-not-changed">
+  <para>
+   No incompatible changes have been made since OpenDJ ${stableServerVersion}.
+   This chapter reflects changes made in version ${stableServerVersion}.
+  </para>
+ </note>
+
  <section xml:id="changed-functionality">
   <title>Important Changes to Existing Functionality</title>
 
@@ -42,12 +49,14 @@
 
   <itemizedlist>
    <listitem>
-    <para>The upgrade process and <command>upgrade</command> command have
-    changed to facilitate native packaging on more platforms. See
-    <link xlink:show="new" xlink:href="install-guide#chap-upgrade"
-    xlink:role="http://docbook.org/xlink/role/olink"><citetitle>Upgrading to
-    OpenDJ <?eval ${docTargetVersion}?></citetitle></link> for
-    instructions.</para>
+    <para>
+     The upgrade process and <command>upgrade</command> command have
+     changed to facilitate native packaging on more platforms.
+     See <link xlink:show="new"
+     xlink:href="http://docs.forgerock.org/en/opendj/2.6.0/install-guide/#chap-upgrade"
+     ><citetitle>Upgrading to OpenDJ ${stableServerVersion}</citetitle></link>
+     for instructions.
+    </para>
    </listitem>
 
    <listitem>
@@ -100,9 +109,8 @@
     settings by using the <command>dsconfig</command> command. An example of
     how to change a <literal>global-aci</literal> property can be found in the
     <citetitle>Administration Guide</citetitle>, <link xlink:show="new"
-    xlink:href="admin-guide#access-control-disable-anonymous"
-    xlink:role="http://docbook.org/xlink/role/olink"><citetitle>ACI: Disable
-    Anonymous Access</citetitle></link>.</para>
+    xlink:href="http://docs.forgerock.org/en/opendj/2.6.0/admin-guide/#access-control-disable-anonymous"
+    ><citetitle>ACI: Disable Anonymous Access</citetitle></link>.</para>
    </listitem>
 
    <listitem>
@@ -131,7 +139,7 @@
  <section xml:id="deprecated-functionality">
   <title>Deprecated Functionality</title>
   
-  <para>OpenDJ <?eval ${docTargetVersion}?> makes use of new environment
+  <para>OpenDJ ${stableServerVersion} makes use of new environment
   variables aligned with the project name to use <literal>OPENDJ</literal>.
   Use of the old variables is Deprecated. The old variables are likely to be
   removed in a future release.</para>
diff --git a/src/main/docbkx/release-notes/chap-feedback.xml b/src/main/docbkx/release-notes/chap-feedback.xml
index ba7eeea..771bae2 100644
--- a/src/main/docbkx/release-notes/chap-feedback.xml
+++ b/src/main/docbkx/release-notes/chap-feedback.xml
@@ -20,22 +20,27 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-feedback'
  xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
- xmlns:xlink='http://www.w3.org/1999/xlink'
- xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+ xsi:schemaLocation='http://docbook.org/ns/docbook
+                     http://docbook.org/xml/5.0/xsd/docbook.xsd'
+ xmlns:xlink='http://www.w3.org/1999/xlink'>
  <title>How to Report Problems &amp; Provide Feedback</title>
 
  <para>If you have questions regarding OpenDJ which are not answered by the
  documentation, there is a mailing list which can be found at
  <link xlink:href="https://lists.forgerock.org/mailman/listinfo/opendj"
- xlink:show="new">https://lists.forgerock.org/mailman/listinfo/opendj</link>
- where you are likely to find an answer.</para>
+ xlink:show="new" /> where you are likely to find an answer.</para>
+
+ <note xml:id="feedback-not-changed">
+  <para>
+   The content of this chapter has not changed in this release.
+  </para>
+ </note>
 
  <para>If you have found issues or reproducible bugs within OpenDJ
  <?eval ${docTargetVersion}?>, report them in the <link xlink:show="new"
diff --git a/src/main/docbkx/release-notes/chap-issues.xml b/src/main/docbkx/release-notes/chap-issues.xml
index c538dfd..11016f0 100644
--- a/src/main/docbkx/release-notes/chap-issues.xml
+++ b/src/main/docbkx/release-notes/chap-issues.xml
@@ -20,22 +20,25 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-issues'
          xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-         xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
-         xmlns:xlink='http://www.w3.org/1999/xlink'
-         xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+         xsi:schemaLocation='http://docbook.org/ns/docbook
+                             http://docbook.org/xml/5.0/xsd/docbook.xsd'
+         xmlns:xlink='http://www.w3.org/1999/xlink'>
  <title>OpenDJ Fixes, Limitations, &amp; Known Issues</title>
 
- <para>This chapter covers the status of key issues and limitations for OpenDJ
- <?eval ${docTargetVersion}?> and OpenDJ SDK <?eval ${docTargetVersion}?>.
- For details and information on other issues, see the <link xlink:show="new"
- xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ" >OpenDJ issue
- tracker</link>.</para>
+ <para>
+  This chapter covers the status of key issues and limitations
+  for OpenDJ ${docTargetVersion} and OpenDJ SDK ${sdkDocTargetVersion}.
+  For details and information on other issues,
+  see the <link xlink:show="new"
+  xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ"
+  >OpenDJ issue tracker</link>.
+ </para>
 
  <section xml:id="fixes">
   <title>Key Fixes</title>
@@ -47,120 +50,46 @@
    customers can contact support for details.</para>
 
    <!-- TODO: reconsider when 2.4.x is no longer supported. -->
-   <para>OpenDJ 2.6.0 also includes important improvements to replication.
-   Replication remains fully compatible with earlier versions. However, some
-   operations that work fine with OpenDJ 2.6.0, such as replicating large
-   groups and replicating high volumes of adds and deletes, can cause
-   issues for earlier versions. Make sure you upgrade all servers to 2.6.0
-   before allowing clients to take advantage of write operations that could
-   cause trouble for older servers.</para>
+   <para>
+    OpenDJ 2.6.0 and later maintenance releases
+    include important improvements to replication.
+    Replication remains fully compatible with earlier versions.
+    However, some operations that work fine with the current OpenDJ release,
+    such as replicating large groups
+    and replicating high volumes of adds and deletes,
+    can cause issues for earlier versions.
+    Make sure you upgrade all servers to this version
+    before allowing clients to take advantage of write operations
+    that could cause trouble for older servers.
+   </para>
   </note>
 
   <para>The following important bugs were fixed in this release.</para>
 
-  <!-- List generated at 08:22:22 20130703 using http://bugster.forgerock.org/jira/rest/api/2/search?jql=project+%3D+OpenDJ+AND+fixVersion+%3D+"2.6.0"+AND+type+%3D+Bug+AND+resolution+%3D+Fixed+AND+labels+%3D+release-notes&startAt=0&maxResults=500&fields=summary-->
+  <!-- List generated at 18:07:57 20140205 using http://bugster.forgerock.org/jira/rest/api/2/search?jql=project+%3D+OpenDJ+AND+type+%3D+Bug+AND+resolution+%3D+Fixed+AND+%28fixVersion+%3D+"2.6.1"+OR+fixVersion+in+%28"2.6.1-sdk"%2C+"2.6.2-sdk"%2C+"2.6.3-sdk"%2C+"2.6.4-sdk"%2C+"2.6.5-sdk"%2C+"2.6.6-sdk"%2C+"2.6.7-sdk"%29%29+AND+component+not+in+%28Documentation%2C+QA%29+AND+labels+%3D+release-notes&startAt=0&maxResults=500&fields=summary-->
   <itemizedlist>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-988" xlink:show="new">OPENDJ-988</link>: Filtering access logs by userdn doesn't work</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-982" xlink:show="new">OPENDJ-982</link>: Upgrade: SNMP Connection Handler does not start after the upgrade</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-962" xlink:show="new">OPENDJ-962</link>: Subject Attr To User Attr Cert Mapper has wrong default configuration</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-940" xlink:show="new">OPENDJ-940</link>: Import-ldif NPE if base entry contains invalid attribute values and skipDNValidation is set</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-926" xlink:show="new">OPENDJ-926</link>: SchemaBackend ignores instance dir</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-925" xlink:show="new">OPENDJ-925</link>: SchemaConfigManager tries to load files twice</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-922" xlink:show="new">OPENDJ-922</link>: Replication window size is too small on high latency networks</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-900" xlink:show="new">OPENDJ-900</link>: Cannot use backups to initialize a replica</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-899" xlink:show="new">OPENDJ-899</link>: ModDN with the same value ignored by ACIs</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-895" xlink:show="new">OPENDJ-895</link>: Document ACIs and privileges required for basic LDAP operations</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-888" xlink:show="new">OPENDJ-888</link>: Maintaining ds-sync-hist for a large group is inefficient</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-886" xlink:show="new">OPENDJ-886</link>: connected-to attributes under cn=monitor are wrong when all RSes are down</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-885" xlink:show="new">OPENDJ-885</link>: Replication replay may lose changes if it can't acquire a writeLock</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-882" xlink:show="new">OPENDJ-882</link>: NullPointerException in access log filtering code</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-875" xlink:show="new">OPENDJ-875</link>: Use of hostnames in replication protocol causes failover problems</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-868" xlink:show="new">OPENDJ-868</link>: cannot add attributes to referential integrity plugin</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-846" xlink:show="new">OPENDJ-846</link>: Intermittent Replication Failure</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-818" xlink:show="new">OPENDJ-818</link>: dsreplication status shows disabled servers as enabled</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-798" xlink:show="new">OPENDJ-798</link>: Cannot be part of 2 replication topologies if a third topology shares a common suffix</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-797" xlink:show="new">OPENDJ-797</link>: dsconfig cannot edit custom password policy after upgrade to 2.5.0-Xpress1</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-765" xlink:show="new">OPENDJ-765</link>: Modify with replace attr=value and delete attr gets misrecorded in ds-sync-hist</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-761" xlink:show="new">OPENDJ-761</link>: Migration from deprecated password storage schemes doesn't work during a simple bind</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-680" xlink:show="new">OPENDJ-680</link>: Upgrade may change ds-cfg-base-dn to dc=example,dc=com on userRoot configuration</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-668" xlink:show="new">OPENDJ-668</link>: Cannot configure ssl-cipher-suites on admin connector</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-664" xlink:show="new">OPENDJ-664</link>: Password validator: default of check-substrings = false breaks rule of least surprise</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-652" xlink:show="new">OPENDJ-652</link>: Connections from Solaris 10 ldapclient can cause LDAPS request handler to spin</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-649" xlink:show="new">OPENDJ-649</link>: Add supportedTLSCiphers and supportedTLSProtocols to RootDSE and system monitor</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-627" xlink:show="new">OPENDJ-627</link>: ConnectionPool internal state becomes invalid when stale connections are discarded</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-625" xlink:show="new">OPENDJ-625</link>: ModifyDN does not allow the same (normalized) DN</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-622" xlink:show="new">OPENDJ-622</link>: DSML ExtendedRequest text requestValues don't work</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-621" xlink:show="new">OPENDJ-621</link>: No documentation for schema definition extensions</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-618" xlink:show="new">OPENDJ-618</link>: DSML gateway should send an AuthResponse for the initial bind</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-615" xlink:show="new">OPENDJ-615</link>: Replication silently skips entries referring to non-existent global password policies</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-608" xlink:show="new">OPENDJ-608</link>: DSML gateway NPE in response to extended requests without request values</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-602" xlink:show="new">OPENDJ-602</link>: Referrals returned when not in scope.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-601" xlink:show="new">OPENDJ-601</link>: Syntax for offline backup is incorrect</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-590" xlink:show="new">OPENDJ-590</link>: ConnectionPool may return already closed/disconnected connections</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-587" xlink:show="new">OPENDJ-587</link>: Control-panel rebuild-index shouldn't disable the backend and use offline command</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-578" xlink:show="new">OPENDJ-578</link>: Documentation should reflect that --type is now required for `dsconfig create-password-policy`</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-568" xlink:show="new">OPENDJ-568</link>: ldiffdiff and ldifmodify documentation is incorrect</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-565" xlink:show="new">OPENDJ-565</link>: Attribute Value password validator finds password in the userPassword attribute</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-564" xlink:show="new">OPENDJ-564</link>: SSF based access controls don't seem to be working</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-561" xlink:show="new">OPENDJ-561</link>: Add operation doesn't get password policy from ds-pwp-password-policy-dn;collective</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-556" xlink:show="new">OPENDJ-556</link>: Strange ACI results</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-548" xlink:show="new">OPENDJ-548</link>: Unable to run ldap commands as any user other than root after updating java.properties</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-532" xlink:show="new">OPENDJ-532</link>: When replication is enabled cn=changelog appears in namingcontexts output</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-528" xlink:show="new">OPENDJ-528</link>: rebuild-index doesn't rebuild properly DN2ID after an upgrade from OpenDS 2.2. </para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-520" xlink:show="new">OPENDJ-520</link>: Worker threads are too greedy when caching memory used for encoding/decoding entries and protocol messages</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-504" xlink:show="new">OPENDJ-504</link>: Performing Query on telephoneNumber attribute thats not a number returns all entries</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-500" xlink:show="new">OPENDJ-500</link>: Upgrade trunk (2.5.0) to JE 5.0.48</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-494" xlink:show="new">OPENDJ-494</link>: dsreplication initialize reports negative percentage of completion</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-488" xlink:show="new">OPENDJ-488</link>: Cancel request succeeds with result code 118 (CANCELED) when it should receive result code 0 (SUCCESS)</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-487" xlink:show="new">OPENDJ-487</link>: Normal acis under cn=config are not loaded at startup</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-475" xlink:show="new">OPENDJ-475</link>: Incorrect behaviour/result code regarding non-critical controls</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-472" xlink:show="new">OPENDJ-472</link>: offline import LDIF reject entries, doesn't report the correct count of them, and store them in both rejected and skipped files.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-464" xlink:show="new">OPENDJ-464</link>: NPE in PasswordPolicyStateExtendedResult results in eternal waiting</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-462" xlink:show="new">OPENDJ-462</link>: Spinning threads in JE backend importer</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-459" xlink:show="new">OPENDJ-459</link>: User's privileges not working with SASL EXTERNAL auth</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-456" xlink:show="new">OPENDJ-456</link>: OpenDJ schema replication fails for 3rd server of topology</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-433" xlink:show="new">OPENDJ-433</link>: Every other permissions-subjects pair in ACI is ignored</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-432" xlink:show="new">OPENDJ-432</link>: LDAPURL doesn't always url-decode baseDN</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-427" xlink:show="new">OPENDJ-427</link>: AuthenticatedConnectionFactory hides exception with NPE</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-420" xlink:show="new">OPENDJ-420</link>: Rare SSLExceptions while handling LDAPS connections and big LDAP searches</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-410" xlink:show="new">OPENDJ-410</link>: Frequent corruption in ds-sync-hist ordering index.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-400" xlink:show="new">OPENDJ-400</link>: ControlPanel issue with values containing \n (such as sunxmlkeyvalue)</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-398" xlink:show="new">OPENDJ-398</link>: Misleading replication messages: "Replication server XXXX was attempting to connect to replication server YYYY but has disconnected in handshake phase"</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-387" xlink:show="new">OPENDJ-387</link>: dsreplication initialize-all reports negative percentage of completion</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-380" xlink:show="new">OPENDJ-380</link>: index-entry-limit=0 not working as expected</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-377" xlink:show="new">OPENDJ-377</link>: Kerberos authentication with AD KDC fails with LoginException(Client not found in Kerberos database (6))</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-349" xlink:show="new">OPENDJ-349</link>: manage-account returns Seconds Until Idle Account Lockout: 0 (zero) if the last log on date is more than 24 days before the idle lock out interval.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-344" xlink:show="new">OPENDJ-344</link>: Upgrade fails when there's an extension with additional JAR dependency.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-333" xlink:show="new">OPENDJ-333</link>: Missing entryUUID attributes in "cn=admin data" backend prevent updates from being replicated.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-323" xlink:show="new">OPENDJ-323</link>: If you attempt to rebuild an index that doesn't exist while OpenDJ is running then the backend is left offline</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-322" xlink:show="new">OPENDJ-322</link>: Binary encoding option causing problems in replace operations</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-320" xlink:show="new">OPENDJ-320</link>: log-file-permissions ignores group permissions</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-315" xlink:show="new">OPENDJ-315</link>: OpenDJ not restart when enable as automatic windows service after reboot</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-310" xlink:show="new">OPENDJ-310</link>: Replicated changes to referral entries are not applied on replicas</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-293" xlink:show="new">OPENDJ-293</link>: InternalClientConnection memory leak when performing password modify/state extended operations or SASL binds</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-282" xlink:show="new">OPENDJ-282</link>: dsreplication enable fails with duplicate server ID, while it's about the same server being referenced.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-274" xlink:show="new">OPENDJ-274</link>: Replication mishandles a Modify operation with multiple modifications on the same attribute.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-271" xlink:show="new">OPENDJ-271</link>: ExternalSASLBindRequestImpl throws java.lang.IllegalStateException</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-254" xlink:show="new">OPENDJ-254</link>: The show-all-attributes flag breaks schema modification, when enabled.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-242" xlink:show="new">OPENDJ-242</link>: Password Policy State Extended Operation anomalities...</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-223" xlink:show="new">OPENDJ-223</link>: Modify operation isn't replayed on replica exactly as on original server.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-219" xlink:show="new">OPENDJ-219</link>: Replication server and draft changelog DB code may attempt to reference closed DB</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-184" xlink:show="new">OPENDJ-184</link>: Transient errors when accessing cn=changelog DraftCN DB result in complete shutdown of the replication service. </para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-173" xlink:show="new">OPENDJ-173</link>: External ChangeLog cookies content is altered by Change purging and prevents from continuing search with a previous returned cookie.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-169" xlink:show="new">OPENDJ-169</link>: Modifying an existing object class definition requires server restart</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-159" xlink:show="new">OPENDJ-159</link>: LDAP connections use stale default schema if it is changed after factory creation.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-156" xlink:show="new">OPENDJ-156</link>: Errors when parsing collective attribute definitions </para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-150" xlink:show="new">OPENDJ-150</link>: ChangeLogEntry schema is not compliant with internet-draft</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-146" xlink:show="new">OPENDJ-146</link>: java.lang.OutOfMemoryError: Java heap space</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-136" xlink:show="new">OPENDJ-136</link>: On Windows, upgrade fails with NPE during Verify phase</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-135" xlink:show="new">OPENDJ-135</link>: upgrade -r fails on Windows</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-134" xlink:show="new">OPENDJ-134</link>: upgrade fails when server registered as Windows service</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-130" xlink:show="new">OPENDJ-130</link>: External change log, used in compliance with Internet-draft, shows a divergence between replicas under load.</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-98" xlink:show="new">OPENDJ-98</link>: Searches on cn=monitor take a long time</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-65" xlink:show="new">OPENDJ-65</link>: Host domain name lost from FQDN while enabling replication for a new replica using disreplication enable</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-57" xlink:show="new">OPENDJ-57</link>: ECL: lastChangeNumber and firstChangeNumber reset to zero when the changelog is purged to empty</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-55" xlink:show="new">OPENDJ-55</link>: Failing modify operations causing memory leak</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-21" xlink:show="new">OPENDJ-21</link>: Account Status Notifications (password changed/reset) are not sent for the Password Modify Extended Operation</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1322" xlink:show="new">OPENDJ-1322</link>: Control-Panel.bat can not start and stop the OpenDJ server when running as a windows service</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1283" xlink:show="new">OPENDJ-1283</link>: Replayed Modify operations are rejected if the backend writability mode is internal-only</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1275" xlink:show="new">OPENDJ-1275</link>: Connections stop getting closed due to idle time outs</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1270" xlink:show="new">OPENDJ-1270</link>: Avoid unnecessary DNS lookups when performing bind requests</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1269" xlink:show="new">OPENDJ-1269</link>: JMX connection counter not being decremented when connections are closed.</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1266" xlink:show="new">OPENDJ-1266</link>: State index is not updated when an index is deleted</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1249" xlink:show="new">OPENDJ-1249</link>: ConnectionFactory timeout setting is applied for Active Directory persistent search requests</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1247" xlink:show="new">OPENDJ-1247</link>: Client side timeouts do not cancel bind or startTLS requests properly</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1228" xlink:show="new">OPENDJ-1228</link>: Concatenated schema may contain more than valid schema, possibly leading to further issues</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1226" xlink:show="new">OPENDJ-1226</link>: Upgrade should only consider .ldif files under config/schema</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1204" xlink:show="new">OPENDJ-1204</link>: Access Log timestamp doesn't have milliseconds for Connect and Disconnect entries</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1200" xlink:show="new">OPENDJ-1200</link>: SDK should use octet string matching by default for unrecognized attribute types</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1196" xlink:show="new">OPENDJ-1196</link>: updateSchemaFile "succeeds" if it can't find schema in the templates</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1190" xlink:show="new">OPENDJ-1190</link>: Under rare circumstances the DS replication recovery thread (RSUpdater) can spin</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1183" xlink:show="new">OPENDJ-1183</link>: Can not reset userPassword through REST interface due to lack of privileges</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1168" xlink:show="new">OPENDJ-1168</link>: Warning message displayed when heartbeat check fails with a bind connection pool</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1160" xlink:show="new">OPENDJ-1160</link>: Write operations to non-groups force groups to be reloaded</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1115" xlink:show="new">OPENDJ-1115</link>: Internal errors from ModifyOperation - change number was not found in pending list</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1090" xlink:show="new">OPENDJ-1090</link>: ECL changenumbers get reset after a purge and server restart</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1048" xlink:show="new">OPENDJ-1048</link>: OpenDJ QuickSetup creates the "licenseAccepted" file in the wrong place</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-877" xlink:show="new">OPENDJ-877</link>: ldifsearch.bat is not working</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-661" xlink:show="new">OPENDJ-661</link>: TimeoutChecker throws NullPointerException on application shutdown</para></listitem>
   </itemizedlist>
  </section>
 
@@ -245,19 +174,38 @@
   <para>The following important issues remained open at the time this release
   became available.</para>
 
-  <!-- List generated at 17:03:19 20130703 using http://bugster.forgerock.org/jira/rest/api/2/search?jql=project+%3D+OpenDJ+AND+%28resolution+%3D+Unresolved+OR+%28resolution+%3D+Fixed+AND+fixVersion++>+"2.6.0"+and+fixVersion+%21%3D+"2.6.0"%29%29+AND+labels+%3D+release-notes&startAt=0&maxResults=500&fields=summary-->
+  <!-- List generated at 18:08:35 20140205 using http://bugster.forgerock.org/jira/rest/api/2/search?jql=project+%3D+OpenDJ+AND+type+%3D+Bug+AND+%28resolution+%3D+unresolved+or+%28fixVersion+not+in+%28"2.6.1"%2C+"2.6.1-sdk"%2C+"2.6.2-sdk"%2C+"2.6.3-sdk"%2C+"2.6.4-sdk"%2C+"2.6.5-sdk"%2C+"2.6.6-sdk"%2C+"2.6.7-sdk"%29+AND+%28fixVersion+>+"2.6.1"+OR+fixVersion+>+"2.6.7-sdk"%29%29%29+AND+component+not+in+%28Documentation%2C+QA%29+AND+labels+%3D+release-notes&startAt=0&maxResults=500&fields=summary-->
   <itemizedlist>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1048" xlink:show="new">OPENDJ-1048</link>: OpenDJ QuickSetup creates the "licenseAccepted" file in the wrong place</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1309" xlink:show="new">OPENDJ-1309</link>: First dsreplication enable could warn before replicating schema</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1294" xlink:show="new">OPENDJ-1294</link>: ldappasswordmodify -D &lt;DN&gt; -w - fails without prompting password from stdin</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1290" xlink:show="new">OPENDJ-1290</link>: Nested backends handles hasSubordinates attribute incorrectly</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1213" xlink:show="new">OPENDJ-1213</link>: LDIFReader should reject LDIF that contains trailing space</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1169" xlink:show="new">OPENDJ-1169</link>: Exception/error lost when logging ERR_LOOP_REPLAYING_OPERATION</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1158" xlink:show="new">OPENDJ-1158</link>: rebuild-index leaves backend offline if a backup is running</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1151" xlink:show="new">OPENDJ-1151</link>: OpenDJ unable to initialize the SSL context an doesn't start</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1146" xlink:show="new">OPENDJ-1146</link>: Memory leak on opendj 2.6.0</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1138" xlink:show="new">OPENDJ-1138</link>: searchrate throws java.lang.IndexOutOfBoundsException</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1131" xlink:show="new">OPENDJ-1131</link>: Rest2LDAP fails to start with GlassFish3.1</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1094" xlink:show="new">OPENDJ-1094</link>: ECL virtual lastChangeNumber attribute can decrement</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1087" xlink:show="new">OPENDJ-1087</link>: OpenDJ Console: Validation checks missing</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1056" xlink:show="new">OPENDJ-1056</link>: secure listener should not be created if proper keying material is not available for some reason</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1051" xlink:show="new">OPENDJ-1051</link>: Upgrade: add task to update lastChangeNumber/firstChangeNumber attributes definition when upgrading from 2.4.x</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1043" xlink:show="new">OPENDJ-1043</link>: Worker Thread was interrupted while waiting for new work while shutting down </para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1033" xlink:show="new">OPENDJ-1033</link>: The Rest2LDAP servlet does not support SSL</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1016" xlink:show="new">OPENDJ-1016</link>: Control panel does not follow static group recommendation from documentation</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1009" xlink:show="new">OPENDJ-1009</link>: CryptoManagerTestCase:testStreamEncryptDecryptSuccess fails</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1007" xlink:show="new">OPENDJ-1007</link>: InstallHelper: endless loop, etc.</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-948" xlink:show="new">OPENDJ-948</link>: unauthorized disclosure of directory contents</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-934" xlink:show="new">OPENDJ-934</link>: Changes to RS window-size property require a server restart</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-862" xlink:show="new">OPENDJ-862</link>: Strange ds-privilege-name behavior</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-810" xlink:show="new">OPENDJ-810</link>: Non-atomic password state updates</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-631" xlink:show="new">OPENDJ-631</link>: Modifications made by ldif-diff causes bad replication data</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-640" xlink:show="new">OPENDJ-640</link>: Text Query Against indexed telephoneNumber Attribute Very Slow</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-573" xlink:show="new">OPENDJ-573</link>: mustChangePassword function makes-up password change state</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-557" xlink:show="new">OPENDJ-557</link>: Identical changes recorded in duplicate changelog records</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-527" xlink:show="new">OPENDJ-527</link>: rebuild-index --rebuildAll corrupts the indexes for certain data sets </para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-518" xlink:show="new">OPENDJ-518</link>: Cannot log into the administrative control panel with FIPS-140 enabled  in certain cases</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-514" xlink:show="new">OPENDJ-514</link>: OpenDJ SDK SASL integrity/confidentiality violates protocol</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-452" xlink:show="new">OPENDJ-452</link>: Manual add of new schema objectclass in 99-user.ldif are not replicated</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-505" xlink:show="new">OPENDJ-505</link>: dsreplication enable fails when hostname contains an underscore</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-431" xlink:show="new">OPENDJ-431</link>: Server side sort control only works on result sets of less than 100000 entries</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-412" xlink:show="new">OPENDJ-412</link>: Blocked persistent searches may block all worker threads</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-365" xlink:show="new">OPENDJ-365</link>: Potential deadlock in JE backend while performing a mix of update operations</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-270" xlink:show="new">OPENDJ-270</link>: dsreplication disable takes a long time</para></listitem>
diff --git a/src/main/docbkx/release-notes/chap-support.xml b/src/main/docbkx/release-notes/chap-support.xml
index 148ff21..2c5192c 100644
--- a/src/main/docbkx/release-notes/chap-support.xml
+++ b/src/main/docbkx/release-notes/chap-support.xml
@@ -20,22 +20,27 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2012 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-support'
  xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
- xmlns:xlink='http://www.w3.org/1999/xlink'
- xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+ xsi:schemaLocation='http://docbook.org/ns/docbook
+                     http://docbook.org/xml/5.0/xsd/docbook.xsd'
+ xmlns:xlink='http://www.w3.org/1999/xlink'>
  <title>Support</title>
 
+ <note xml:id="support-not-changed">
+  <para>
+   The content of this chapter has not changed in this release.
+  </para>
+ </note>
+
  <para>You can purchase OpenDJ support subscriptions and training courses
  from ForgeRock and from consulting partners around the world and in your
  area. To contact ForgeRock, send mail to <link
  xlink:href='mailto:info@forgerock.com'>info@forgerock.com</link>. To find a
  partner in your area, see <link xlink:show="new"
- xlink:href="http://forgerock.com/partners/find-a-partner/"
- >http://forgerock.com/partners/find-a-partner/</link>.</para>
+ xlink:href="http://forgerock.com/partners/find-a-partner/" />.</para>
 </chapter>
diff --git a/src/main/docbkx/release-notes/chap-update-install.xml b/src/main/docbkx/release-notes/chap-update-install.xml
new file mode 100644
index 0000000..3ba8b6f
--- /dev/null
+++ b/src/main/docbkx/release-notes/chap-update-install.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ! CCPL HEADER START
+  !
+  ! This work is licensed under the Creative Commons
+  ! Attribution-NonCommercial-NoDerivs 3.0 Unported License.
+  ! To view a copy of this license, visit
+  ! http://creativecommons.org/licenses/by-nc-nd/3.0/
+  ! or send a letter to Creative Commons, 444 Castro Street,
+  ! Suite 900, Mountain View, California, 94041, USA.
+  !
+  ! You can also obtain a copy of the license at
+  ! trunk/opendj3/legal-notices/CC-BY-NC-ND.txt.
+  ! See the License for the specific language governing permissions
+  ! and limitations under the License.
+  !
+  ! If applicable, add the following below this CCPL HEADER, with the fields
+  ! enclosed by brackets "[]" replaced with your own identifying information:
+  !      Portions Copyright [yyyy] [name of copyright owner]
+  !
+  ! CCPL HEADER END
+  !
+  !      Copyright 2014 ForgeRock AS
+  !
+-->
+<chapter xml:id='chap-update-install'
+         xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
+         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+         xsi:schemaLocation='http://docbook.org/ns/docbook
+                      http://docbook.org/xml/5.0/xsd/docbook.xsd'
+         xmlns:xlink='http://www.w3.org/1999/xlink'>
+ <title>Updating &amp; Installing OpenDJ</title>
+
+ <para>
+  ForgeRock recommends that you update
+  OpenDJ ${stableServerVersion} installations to this release.
+  If you are installing OpenDJ for the first time,
+  you can use the same installation instructions as for ${stableServerVersion}.
+ </para>
+
+ <procedure xml:id="update-software">
+  <title>To Update OpenDJ Software</title>
+
+  <step>
+   <para>
+    Download and unpack OpenDJ ${docTargetVersion} software.
+   </para>
+
+   <para>
+    Find a link to the OpenDJ download page from
+    <link xlink:show="new" xlink:href="http://forgerock.com/download-stack/" />.
+   </para>
+  </step>
+
+  <step>
+   <para>
+    Follow the instructions in the chapter on <link xlink:show="new"
+    xlink:href="http://docs.forgerock.org/en/opendj/2.6.0/install-guide/#chap-upgrade"
+    ><citetitle>Upgrading to OpenDJ ${stableServerVersion}</citetitle></link>
+    in the <citetitle>Installation Guide</citetitle>.
+   </para>
+
+   <para>
+    When upgrading from OpenDJ 2.5.0-Xpress1,
+    you no longer need to rebuild the <literal>ds-sync-hist</literal> index
+    as a separate step.
+   </para>
+  </step>
+ </procedure>
+
+ <procedure xml:id="install-software">
+  <title>To Install OpenDJ Software</title>
+
+  <step>
+   <para>
+    Download and unpack OpenDJ ${docTargetVersion} software.
+   </para>
+
+   <para>
+    Find a link to the OpenDJ download page from
+    <link xlink:show="new" xlink:href="http://forgerock.com/download-stack/" />.
+   </para>
+  </step>
+
+  <step>
+   <para>
+    Follow the instructions in the <link xlink:show="new"
+    xlink:href="http://docs.forgerock.org/en/opendj/2.6.0/install-guide/"
+    ><citetitle>OpenDJ ${stableServerVersion} Installation Guide</citetitle></link>.
+   </para>
+  </step>
+ </procedure>
+</chapter>
diff --git a/src/main/docbkx/release-notes/chap-whats-new.xml b/src/main/docbkx/release-notes/chap-whats-new.xml
index 509dd48..cc6e3ff 100644
--- a/src/main/docbkx/release-notes/chap-whats-new.xml
+++ b/src/main/docbkx/release-notes/chap-whats-new.xml
@@ -20,427 +20,168 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-whats-new'
   xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
   xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-  xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
-  xmlns:xlink='http://www.w3.org/1999/xlink'
-  xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+  xsi:schemaLocation='http://docbook.org/ns/docbook
+                      http://docbook.org/xml/5.0/xsd/docbook.xsd'
+  xmlns:xlink='http://www.w3.org/1999/xlink'>
   <title>What's New in OpenDJ <?eval ${docTargetVersion}?></title>
 
-  <para>Compared to the OpenDJ <?eval ${stableServerVersion}?> release, OpenDJ
-  <?eval ${docTargetVersion}?> provides the following new features.</para>
-  
-  <itemizedlist>
-    <listitem>
-     <para>OpenDJ now provides native RESTful access over HTTP to directory
-     data (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-808"
-     >OPENDJ-808</link>). See the procedure, <link xlink:show="new"
-     xlink:href="admin-guide#setup-rest2ldap-connection-handler"
-     xlink:role="http://docbook.org/xlink/role/olink"><citetitle>To Set Up REST
-     Access to OpenDJ Directory Server</citetitle></link>, to activate this
-     feature.</para>
+  <para>
+   OpenDJ ${docTargetVersion} is a maintenance release
+   that resolves a number of issues,
+   including security issues in OpenDJ directory server.
+   It is strongly recommended that you update
+   to this release to make your deployment more secure,
+   and to take advantage of important functional fixes.
+   ForgeRock customers can contact support for help and further information.
+  </para>
 
-     <para>OpenDJ REST LDAP gateway lets clients access directory data in remote
-     LDAP servers over HTTP (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-757"
-     >OPENDJ-757</link>, <link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1033"
-     >OPENDJ-1033</link>). See the procedure, <link xlink:show="new"
-     xlink:href="install-guide#install-rest2ldap-servlet"
-     xlink:role="http://docbook.org/xlink/role/olink"><citetitle>To Install
-     OpenDJ REST LDAP Gateway</citetitle></link>, to get started.</para>
+  <para>
+   Before you install OpenDJ or update your existing OpenDJ installation,
+   read these release notes. Then update or install OpenDJ.
+  </para>
+
+  <section xml:id="product-enhancements">
+   <title>Product Enhancements</title>
+
+   <para>
+    Compared to the OpenDJ ${stableServerVersion} release,
+    OpenDJ ${docTargetVersion} provides these important enhancements.
+   </para>
+
+   <itemizedlist>
+    <listitem>
+     <para>
+      OpenDJ directory server ships with updated Commons REST,
+      OpenDJ LDAP SDK, and Berkeley DB Java Edition components
+      (<link xlink:show="new"
+             xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1323"
+             >OPENDJ-1323</link>).
+     </para>
     </listitem>
 
     <listitem>
-      <para>OpenDJ now lets you delegate authentication to another LDAP
-      directory service, such as Active Directory. The feature is called
-      <firstterm>pass through authentication</firstterm> (PTA) (<link
-      xlink:show="new"
-      xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-262"
-      >OPENDJ-262</link>).
-      With PTA, OpenDJ replays a user's simple bind operation against the remote
-      directory service. If the bind is successful, OpenDJ considers the user
-      authenticated to perform subsequent operations like searches and updates
-      in OpenDJ.</para>
-      <itemizedlist>
-       <para>For PTA to work, OpenDJ must be able to match its OpenDJ entry for
-       the user with the user's entry on the remote directory service. The two
-       entries must correspond in one of the following ways.</para>
-       <listitem>
-        <para>Both the OpenDJ entry and the remote entry have the same
-        DN.</para>
-       </listitem>
-       <listitem>
-        <para>The OpenDJ entry has an attribute that holds the DN of the entry
-        on the remote directory service.</para>
-       </listitem>
-       <listitem>
-        <para>The OpenDJ entry and the remote entry share an attribute that
-        has exactly the same value.</para>
-       </listitem>
-      </itemizedlist>
-      <para>If user entries do not match originally, you can no doubt add an
-      attribute to users' OpenDJ entries when configuring them to use pass
-      through authentication.</para>
-      <para>To configure PTA, you set up an LDAP pass through authentication
-      policy in OpenDJ's configuration, and then assign the policy to users in
-      the same way you would assign a password policy. See the
-      <link xlink:href="admin-guide#chap-pta"
-      xlink:role="http://docbook.org/xlink/role/olink"
-      ><citetitle>Administration Guide</citetitle></link> for details.</para>
+     <para>
+      OpenDJ directory server now makes it possible
+      to specify password validators in subentry based password policies
+      (<link xlink:show="new"
+             xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1295"
+             >OPENDJ-1295</link>).
+     </para>
+
+     <para>
+      To configure password validators for a subentry password policy,
+      add the auxiliary object class <literal>pwdValidatorPolicy</literal>
+      and setting the multi-valued attribute,
+      <literal>ds-cfg-password-validator</literal>,
+      to the DNs of the password validator configuration entries.
+     </para>
     </listitem>
 
     <listitem>
-     <para>OpenDJ now provides Debian and RPM packages (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-408"
-     >OPENDJ-408</link>).</para>
+     <para>
+      OpenDJ directory server now orders attributes
+      according to search request attribute list order
+      (<link xlink:show="new"
+             xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1082"
+             >OPENDJ-1082</link>).
+     </para>
     </listitem>
 
     <listitem>
-     <para>The OpenDJ upgrade process and <command>upgrade</command> command
-     have changed to facilitate native packaging on more platforms and to
-     make upgrade easier to handle over time (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-455"
-     >OPENDJ-455</link>).</para>
-
-     <para>Also, you can now force OpenDJ upgrade to complete if errors occur in
-     non-interactive mode (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-522"
-     >OPENDJ-522</link>).</para>
-
-     <para>See <link xlink:show="new" xlink:href="install-guide#chap-upgrade"
-     xlink:role="http://docbook.org/xlink/role/olink"><citetitle>Upgrading to
-     OpenDJ <?eval ${docTargetVersion}?></citetitle></link> for
-     instructions.</para>
+     <para>
+      OpenDJ directory server logs information to help you more effectively
+      determine why a directory server replica switches its connection
+      to a different replication server
+      (<link xlink:show="new"
+             xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1053"
+             >OPENDJ-1053</link>).
+     </para>
     </listitem>
 
     <listitem>
-     <para>OpenDJ now lets you filter access and audit logs to focus on
-     messages that interest you. OpenDJ supports many criteria for flexible
-     log filtering (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-308"
-     >OPENDJ-308</link>).</para>
+     <para>
+      The REST LDAP Gateway now supports LDAPS connections and StartTLS
+      (<link xlink:show="new"
+             xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1033"
+             >OPENDJ-1033</link>).
+     </para>
+
+     <para>
+      For information on configuring the gateway to use LDAPS or StartTLS,
+      see the comments in the configuration file,
+      <filename>opendj-rest2ldap-servlet.json</filename>.
+      Find the settings to change in the configuration for
+      <literal>"ldapConnectionFactories"</literal>.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </section>
+
+  <section xml:id="product-documentation">
+   <title>OpenDJ Documentation</title>
+
+   <para>
+    You can read the following additional product documentation
+    for OpenDJ 2.6 online at <link xlink:show="new"
+    xlink:href="http://docs.forgerock.org/">docs.forgerock.org</link>.
+   </para>
+
+   <itemizedlist>
+    <listitem>
+     <para>
+      <link xlink:show="new"
+            xlink:href="http://docs.forgerock.org/en/opendj/2.6.0/install-guide/"><citetitle
+              >OpenDJ ${stableServerVersion} Installation Guide</citetitle></link>
+     </para>
     </listitem>
 
     <listitem>
-     <para>OpenDJ now includes an ETag attribute for optimistic concurrency
-     control (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-409"
-     >OPENDJ-409</link>).</para>
+     <para>
+      <link xlink:show="new"
+            xlink:href="http://docs.forgerock.org/en/opendj/2.6.0/admin-guide/"><citetitle
+              >OpenDJ ${stableServerVersion} Administration Guide</citetitle></link>
+     </para>
     </listitem>
 
     <listitem>
-     <para>OpenDJ now supports the PBKDF2 password storage scheme (<link
-     xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-510"
-     >OPENDJ-510</link>).</para>
+     <para>
+      <link xlink:show="new"
+            xlink:href="${configRefBase}"><citetitle
+              >OpenDJ ${stableServerVersion} Configuration Reference</citetitle></link>
+     </para>
     </listitem>
 
     <listitem>
-     <para>OpenDJ now lets you use more TLS cipher suites in SSFs, including
-     those provided by Bouncy Castle and IBM (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-826"
-     >OPENDJ-826</link>).</para>
+     <para>
+      <link xlink:show="new"
+            xlink:href="http://docs.forgerock.org/en/opendj/2.6.0/dev-guide/"><citetitle
+              >OpenDJ ${stableServerVersion} Developer's Guide</citetitle></link>
+     </para>
     </listitem>
 
     <listitem>
-     <para>OpenDJ can now synchronize Samba password attribute values with the
-     <literal>userPassword</literal> attribute value, ensuring that when users
-     change their LDAP passwords in OpenDJ or change their LanMan or NT
-     passwords in Samba, their password attribute values all stay in sync
-     (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-233"
-     >OPENDJ-233</link>, <link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-511"
-     >OPENDJ-511</link>). To activate this feature, configure the OpenDJ Samba
-     Password plugin by using the <command>dsconfig</command> command.</para>
+     <para>
+      <link xlink:show="new"
+            xlink:href="${sdkJavadocBase}"><citetitle
+              >OpenDJ ${stableServerVersion} LDAP SDK API Specification</citetitle></link>
+     </para>
     </listitem>
 
     <listitem>
-     <para>The OpenDJ dictionary password validator can now check whether a
-     password value contains dictionary words as substrings (<link
-     xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-295"
-     >OPENDJ-295</link>).</para>
+     <para>
+      <link xlink:show="new"
+            xlink:href="${serverJavadocBase}"><citetitle
+              >OpenDJ ${stableServerVersion} Server Plugin API Specification</citetitle></link>
+     </para>
     </listitem>
+   </itemizedlist>
 
-    <listitem>
-     <para>The character set password validator now supports optional character
-     sets (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-168"
-     >OPENDJ-168</link>). Also, The character set password validator now
-     understands classes like "All non-Latin characters" (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-620"
-     >OPENDJ-620</link>)</para>
-    </listitem>
+  </section>
 
-    <listitem>
-     <para>OpenDJ now provides a read-only, non-searchable operational
-     attribute, <literal>ds-pwd-password-expiration-time</literal>, to make
-     it easier to read the password expiration time for an account (<link
-     xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-441"
-     >OPENDJ-441</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now computes last login time as UTC time when the value is
-     expressed in GeneralizedTime syntax (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-418"
-     >OPENDJ-418</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now lets you escape characters in <command>make-ldif</command>
-     templates (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-800"
-     >OPENDJ-800</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>Country String syntax now validates ISO 3166 codes (<link
-     xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-562"
-     >OPENDJ-562</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now sets <literal>isMemberOf</literal> on groups as well as
-     user entries (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-513"
-     >OPENDJ-513</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>Performance has been significantly improved for searches with a
-     virtual attribute in the filter (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-508"
-     >OPENDJ-508</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now better supports more, and larger static groups
-     (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-197"
-     >OPENDJ-197</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now supports checking that entries of new group members
-     exist (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-221"
-     >OPENDJ-221</link>). OpenDJ can now ensure both that members' entries
-     exist when they are added to groups, and also that members are removed
-     from groups when their entries are deleted.</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now includes attribute syntax validation for X.509
-     certificate values (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-482"
-     >OPENDJ-482</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now runs more reliably as a Windows Service (<link
-     xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-617"
-     >OPENDJ-617</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now provides the <command>rebuild-index
-     --rebuildDegraded</command> command for rebuilding degraded indexes
-     (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-406"
-     >OPENDJ-406</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>The OpenDJ <command>rebuild-index</command> command now provides
-     an option, <option>--clearDegradedState</option>, to forcefully clear
-     the state of an unused index for a newly created attribute (<link
-     xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-473"
-     >OPENDJ-473</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>Import now performs better when handling LDIF entries with
-     attributes that have many values, such as large static group entries
-     (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-469"
-     >OPENDJ-469</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>Persistent connections can now be identified when querying
-     <literal>cn=monitor</literal> for the LDAP client connection handler.
-     (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-677"
-     >OPENDJ-677</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now lets you configure the access log to display LDAP
-     controls (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-60"
-     >OPENDJ-60</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now adds <literal>Unindexed</literal> to access log response
-     messages for unindexed searches, making it easier to identify searches
-     rejected by default (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-246"
-     >OPENDJ-246</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now logs use of the proxied authorization V1 control with
-     <literal>obsoleteProxiedAuthzV1Control</literal> (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-283"
-     >OPENDJ-283</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now logs only fatal errors, severe errors, warnings, and
-     notices at startup time (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-438"
-     >OPENDJ-438</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>The mechanism to determine during setup whether the configuration
-     has been modified runs a more effective check (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-446"
-     >OPENDJ-446</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now lets you setup the server in command-line mode without
-     creating a default backend (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-435"
-     >OPENDJ-435</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ schema for configuration attributes has been cleaned up
-     (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-393"
-     >OPENDJ-393</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now uses Berkeley JE 5, which brings many performance
-     improvements (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-371"
-     >OPENDJ-371</link>, <link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-662"
-     >OPENDJ-662</link>).</para>
-
-     <para>With the new version, explicitly use the Java setting
-     <option>-XX:+UseCompressedOops</option> to improve performance, even if
-     the setting is enabled by default in recent versions of the Java runtime
-     environment. To apply JVM settings for your server, edit
-     <filename>config/java.properties</filename>, and apply the changes with
-     the <command>dsjavaproperties</command> command.</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now exposes the <literal>je.log.fileCacheSize</literal>
-     property through the <literal>ds-cfg-db-log-filecache-size</literal>
-     configuration attribute (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-383"
-     >OPENDJ-383</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ verify and rebuild index commands now use JE 5 disk ordered
-     cursoring (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-372"
-     >OPENDJ-372</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>More OpenDJ tools now prompt for a bind password when none is
-     provided (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-358"
-     >OPENDJ-358</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ DSML gateway now allows authentication using an ID rather
-     than a DN (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-352"
-     >OPENDJ-352</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ DSML gateway can now connect over SSL to the LDAP
-     server (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-269"
-     >OPENDJ-269</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now lets you configure attributes to be removed or renamed
-     on update (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-258"
-     >OPENDJ-258</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>Subordinate indexes <literal>id2children</literal> and
-     <literal>id2subtree</literal> can now be disabled on OpenDJ JE backends to
-     improve performance when repeated adds and deletes are performed beneath
-     the same entry (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-250"
-     >OPENDJ-250</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now calls Account Status Notification Handlers when an
-     account in enabled or disabled by the <command>manage-account</command>
-     (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-248"
-     >OPENDJ-248</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>Change log content and configuration has been improved in this
-     release (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-194"
-     >OPENDJ-194</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>Default database cache size, request handler counts, and replication
-     purge delay are now set more sensibly for default installations
-     (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-116"
-     >OPENDJ-116</link>, <link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-186"
-     >OPENDJ-186</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>Collective attributes can now be applied based on the values of
-     virtual attributes (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-76"
-     >OPENDJ-76</link>).</para>
-    </listitem>
-
-    <listitem>
-     <para>OpenDJ now lets you execute control-panel as any user, not only the
-     user who installed OpenDJ (<link xlink:show="new"
-     xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-19"
-     >OPENDJ-19</link>).</para>
-    </listitem>
-  </itemizedlist>
 </chapter>
diff --git a/src/main/docbkx/release-notes/index.xml b/src/main/docbkx/release-notes/index.xml
index 36a52bf..a96fc2c 100644
--- a/src/main/docbkx/release-notes/index.xml
+++ b/src/main/docbkx/release-notes/index.xml
@@ -20,13 +20,14 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <book xml:id='release-notes'
  xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
+ xsi:schemaLocation='http://docbook.org/ns/docbook
+                     http://docbook.org/xml/5.0/xsd/docbook.xsd'
  xmlns:xlink='http://www.w3.org/1999/xlink'
  xmlns:xinclude='http://www.w3.org/2001/XInclude'>
  <info>
@@ -37,7 +38,7 @@
    in Java.</para>
   </abstract>
   <copyright>
-   <year>2011-2013</year>
+   <year>2011-2014</year>
    <holder>ForgeRock AS</holder>
   </copyright>
   <authorgroup>
@@ -46,9 +47,9 @@
    </author>
   </authorgroup>
   <xinclude:include href='../legal.xml' />
-  <date><?dbtimestamp format="B d, Y"?></date>
-  <pubdate>Publication date: <?dbtimestamp format="B d, Y"?></pubdate>
-  <releaseinfo><?eval ${softwareReleaseDate}?></releaseinfo>
+  <date>${publicationDate}</date>
+  <pubdate>${publicationDate}</pubdate>
+  <releaseinfo>${softwareReleaseDate}</releaseinfo>
  </info>
 
  <toc />
@@ -81,15 +82,19 @@
   Finally, these notes list both issues fixed since the previous
   release and known issues open at the time of release.</para>
    
-  <para>See the <link xlink:role="http://docbook.org/xlink/role/olink"
-  xlink:href="install-guide#install-guide"><citetitle>Installation
-  Guide</citetitle></link> for more after you read these release notes. The
-  installation guide covers installation and upgrade for OpenDJ directory
-  server, OpenDJ REST LDAP gateway, and OpenDJ DSML gateway.</para>
+  <para>
+   See the <link xlink:show="new"
+   xlink:href="http://docs.forgerock.org/en/opendj/2.6.0/install-guide/"
+   ><citetitle>Installation Guide</citetitle></link> for more
+   after you read these release notes.
+   The installation guide covers installation and upgrade
+   for OpenDJ directory server, OpenDJ REST LDAP gateway, and OpenDJ DSML gateway.
+  </para>
  </preface>
 
  <xinclude:include href='chap-whats-new.xml' />
  <xinclude:include href='chap-before-you-install.xml' />
+ <xinclude:include href='chap-update-install.xml' />
  <xinclude:include href='chap-compatibility.xml' />
  <xinclude:include href='chap-issues.xml' />
  <xinclude:include href='chap-feedback.xml' />

--
Gitblit v1.10.0