From 5dc5690c953e28b9ffc214384d8545ab912a1dad Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Thu, 02 Jul 2015 06:40:38 +0000
Subject: [PATCH] FR-763 OPENDJ-2155 Update release notes

---
 src/main/docbkx/release-notes/chap-issues.xml             |   26 +++--
 pom.xml                                                   |   65 ++++-----------
 src/main/docbkx/admin-guide/SKIP-index.xml                |    0 
 src/main/docbkx/release-notes/chap-update-install.xml     |   15 ++-
 src/main/docbkx/release-notes/chap-support.xml            |   13 --
 src/main/docbkx/dev-guide/SKIP-index.xml                  |    0 
 src/main/docbkx/sdk-release-notes/SKIP-index.xml          |    0 
 src/main/docbkx/release-notes/chap-before-you-install.xml |   11 ++
 src/main/docbkx/release-notes/chap-whats-new.xml          |   77 ++++++++++++++++++
 src/main/docbkx/release-notes/index.xml                   |   11 +-
 src/main/docbkx/shared/affiliation-fr.xml                 |    6 
 src/main/docbkx/release-notes/chap-compatibility.xml      |    9 +-
 src/main/docbkx/install-guide/SKIP-index.xml              |    0 
 13 files changed, 140 insertions(+), 93 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0f30038..3f2bf51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   !
   ! CDDL HEADER END
   !
-  !      Copyright 2011-2015 ForgeRock AS
+  !      Copyright 2011-2015 ForgeRock AS.
   !
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -117,13 +117,13 @@
     <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
 
     <!-- START Documentation properties -->
-    <docTargetVersion>${project.version}</docTargetVersion><!-- Reset before final publication -->
-    <docPreviousVersion>2.6.1</docPreviousVersion>
+    <docTargetVersion>2.6.3</docTargetVersion>
+    <docPreviousVersion>2.6.2</docPreviousVersion>
     <stableServerVersion>2.6.0</stableServerVersion>
     <sdkDocTargetVersion>2.6.9</sdkDocTargetVersion>
 
-    <frDocPluginVersion>2.1.5</frDocPluginVersion>
-    <gaId>UA-23412190-8</gaId>
+    <frDocPluginVersion>3.0.0</frDocPluginVersion>
+    <gaId>UA-23412190-14</gaId>
 
     <siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
 
@@ -139,7 +139,7 @@
     <publicationDate>${pubDate}</publicationDate>
 
     <!-- Permit doc build to override relative locations of non DocBook content -->
-    <coreDocBase>http://docs.forgerock.org/en/opendj/${stableServerVersion}</coreDocBase>
+    <coreDocBase>https://backstage.forgerock.com/#!/docs/opendj/${stableServerVersion}</coreDocBase>
     <configRefBase>${coreDocBase}/configref/</configRefBase>
     <serverJavadocBase>${coreDocBase}/javadoc/</serverJavadocBase>
     <sdkJavadocBase>${coreDocBase}/apidocs/</sdkJavadocBase>
@@ -183,56 +183,29 @@
         <configuration>
          <projectName>OpenDJ</projectName>
          <projectVersion>${docTargetVersion}</projectVersion>
-         <latestJson>http://docs.forgerock.org/latest.json</latestJson>
+         <releaseVersion>${docTargetVersion}</releaseVersion>
          <googleAnalyticsId>${gaId}</googleAnalyticsId>
+         <!-- Work around JCite failing to run on docs that should not be built. -->
+         <jCiteSourcePaths>
+           <jCiteSourcePath>opendj-ldap-sdk-examples/src/main/java</jCiteSourcePath>
+         </jCiteSourcePaths>
         </configuration>
         <executions>
           <execution>
-            <id>copy-common</id>
+            <id>prepare-docs</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>
-            <sourcePaths>
-             <sourcePath>${project.basedir}/opendj-ldap-sdk-examples/src/main/java</sourcePath>
-            </sourcePaths>
-           </configuration>
-           <goals>
-            <goal>jcite</goal>
-           </goals>
-          </execution>
-          <execution>
-            <id>prepare-sources</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>prepare</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>build-doc</id>
-            <phase>pre-site</phase>
-            <goals>
+              <goal>process</goal>
               <goal>build</goal>
             </goals>
           </execution>
           <execution>
-            <id>layout-doc</id>
-            <phase>site</phase>
-            <goals>
-              <goal>layout</goal>
-            </goals>
+           <id>lay-out-docs</id>
+           <phase>site</phase>
+           <goals>
+            <goal>site</goal>
+            <goal>backstage</goal>
+           </goals>
           </execution>
         </executions>
       </plugin>
diff --git a/src/main/docbkx/admin-guide/index.xml b/src/main/docbkx/admin-guide/SKIP-index.xml
similarity index 100%
rename from src/main/docbkx/admin-guide/index.xml
rename to src/main/docbkx/admin-guide/SKIP-index.xml
diff --git a/src/main/docbkx/dev-guide/index.xml b/src/main/docbkx/dev-guide/SKIP-index.xml
similarity index 100%
rename from src/main/docbkx/dev-guide/index.xml
rename to src/main/docbkx/dev-guide/SKIP-index.xml
diff --git a/src/main/docbkx/install-guide/index.xml b/src/main/docbkx/install-guide/SKIP-index.xml
similarity index 100%
rename from src/main/docbkx/install-guide/index.xml
rename to src/main/docbkx/install-guide/SKIP-index.xml
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 b0be0e0..813e374 100644
--- a/src/main/docbkx/release-notes/chap-before-you-install.xml
+++ b/src/main/docbkx/release-notes/chap-before-you-install.xml
@@ -9,8 +9,7 @@
   ! 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.
+  ! You can also obtain a copy of the license at legal-notices/CC-BY-NC-ND.txt.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
@@ -20,7 +19,7 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2014 ForgeRock AS
+  !      Copyright 2011-2015 ForgeRock AS.
   !    
 -->
 <chapter xml:id='chap-before-you-install'
@@ -31,6 +30,12 @@
          xmlns:xlink='http://www.w3.org/1999/xlink'>
  <title>Before You Install OpenDJ Software</title>
 
+ <note>
+  <para>
+   This chapter has not changed since the release of OpenDJ 2.6.2.
+  </para>
+ </note>
+
  <para>This chapter covers requirements to consider before you run OpenDJ,
  especially before you run OpenDJ in your production environment.</para>
 
diff --git a/src/main/docbkx/release-notes/chap-compatibility.xml b/src/main/docbkx/release-notes/chap-compatibility.xml
index 7254386..8663d09 100644
--- a/src/main/docbkx/release-notes/chap-compatibility.xml
+++ b/src/main/docbkx/release-notes/chap-compatibility.xml
@@ -9,8 +9,7 @@
   ! 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.
+  ! You can also obtain a copy of the license at legal-notices/CC-BY-NC-ND.txt.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
@@ -20,7 +19,7 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2014 ForgeRock AS
+  !      Copyright 2011-2015 ForgeRock AS.
   !    
 -->
 <chapter xml:id='chap-compatibility'
@@ -53,7 +52,7 @@
      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"
+     xlink:href="https://backstage.forgerock.com/#!/docs/opendj/2.6.0/install-guide#chap-upgrade"
      ><citetitle>Upgrading to OpenDJ ${stableServerVersion}</citetitle></link>
      for instructions.
     </para>
@@ -109,7 +108,7 @@
     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="http://docs.forgerock.org/en/opendj/2.6.0/admin-guide/#access-control-disable-anonymous"
+    xlink:href="https://backstage.forgerock.com/#!/docs/opendj/2.6.0/admin-guide#access-control-disable-anonymous"
     ><citetitle>ACI: Disable Anonymous Access</citetitle></link>.</para>
    </listitem>
 
diff --git a/src/main/docbkx/release-notes/chap-issues.xml b/src/main/docbkx/release-notes/chap-issues.xml
index 6739062..dabcb0c 100644
--- a/src/main/docbkx/release-notes/chap-issues.xml
+++ b/src/main/docbkx/release-notes/chap-issues.xml
@@ -20,7 +20,7 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2014 ForgeRock AS
+  !      Copyright 2011-2015 ForgeRock AS.
   !    
 -->
 <chapter xml:id='chap-issues'
@@ -61,15 +61,14 @@
 
   <para>The following important bugs were fixed in this release.</para>
 
-  <!-- List generated at 18:11:06 20141013 using http://bugster.forgerock.org/jira/rest/api/2/search?jql=project+%3D+OpenDJ+AND+type+%3D+Bug+AND+resolution+%3D+Fixed+AND+fixVersion+%3D+%222.6.2%22+AND+component+not+in+%28Documentation%2C+QA%29+AND+labels+%3D+release-notes&startAt=0&maxResults=500&fields=summary-->
+  <!-- List generated at 10:47:41 20150619 using http://bugster.forgerock.org/jira/rest/api/2/search?jql=project+%3D+OpenDJ+AND+type+%3D+Bug+AND+resolution+%3D+Fixed+AND+fixVersion+%3D+%222.6.3%22+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-1427" xlink:show="new">OPENDJ-1427</link>: Control-panel reports duplicate ds-sync-hist values for pwdHistory</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1354" xlink:show="new">OPENDJ-1354</link>: replication threads BLOCKED in pendingChanges queue</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-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-1142" xlink:show="new">OPENDJ-1142</link>: OpenDJ setup does not work in Java8 EA - A security class cannot be found in this JVM</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-1952" xlink:show="new">OPENDJ-1952</link>: Backport OPENDJ-1056: 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-1947" xlink:show="new">OPENDJ-1947</link>: Backport OPENDJ-1605: Schema is incorrect for ds-base-dn-entry-count attribute used in monitor backend</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1890" xlink:show="new">OPENDJ-1890</link>: Backport OPENDJ-1882: currentConnections from cn=monitor is not decremented when JMX connections close</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1764" xlink:show="new">OPENDJ-1764</link>: admin-backend.ldif can end up empty</para></listitem>
   </itemizedlist>
+  <!-- Issue count: 4 -->
  </section>
 
  <section xml:id="limitations">
@@ -153,12 +152,16 @@
   <para>The following important issues remained open at the time this release
   became available.</para>
 
-  <!-- List generated at 11:44:24 20141014 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%222.6.0%22%2C+%222.6.1%22%2C+%222.6.2%22%29+AND+fixVersion+%3E+%222.6.2%22%29%29+AND+component+not+in+%28Documentation%2C+QA%2C+%22opendj+sdk%22%29+AND+labels+%3D+release-notes&startAt=0&maxResults=500&fields=summary-->
+  <!-- List generated at 10:49:54 20150619 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%222.6.0%22%2C+%222.6.1%22%2C+%222.6.2%22%2C+%222.6.3%22%29+AND+fixVersion+in+%28%222.8.0%22%2C+%223.0.0%22%29%29%29+AND+component+not+in+%28Documentation%2C+QA%2C+%22opendj+sdk%22%2C+%22next+gen+backend%22%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-1969" xlink:show="new">OPENDJ-1969</link>: IdleTimeLimitThread fails with null ConnectionHandlers or null ClientConnections</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1968" xlink:show="new">OPENDJ-1968</link>: NPE in GoverningStructureRuleVirtualAttributeProvider if entry has no structural object classes</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1882" xlink:show="new">OPENDJ-1882</link>: currentConnections from cn=monitor is not decremented when JMX connections close</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1829" xlink:show="new">OPENDJ-1829</link>: JMX connector listens on a random port number</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1586" xlink:show="new">OPENDJ-1586</link>: Nested Groups fail to return indirect members with db's larger than 10 entries</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1431" xlink:show="new">OPENDJ-1431</link>: Trimming of draftcndb gets stuck, changelog keeps growing in size</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1375" xlink:show="new">OPENDJ-1375</link>: Subtree delete control can wait forever for an id2subtree lock</para></listitem>
-   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1358" xlink:show="new">OPENDJ-1358</link>: Backup task logs path in ID field, and ID in path field</para></listitem>
+   <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1366" xlink:show="new">OPENDJ-1366</link>: Arguments logged in wrong order for ERROR_REPLAYING_OPERATION</para></listitem>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-1325" xlink:show="new">OPENDJ-1325</link>: An error occurred while attempting to perform index rebuild:  The database environment could not be opened: (JE 5.0.73)</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>
@@ -178,12 +181,12 @@
    <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-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-737" xlink:show="new">OPENDJ-737</link>: OpenDJ Administration Connector KeyStore Pin File must be defined and non empty</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>
@@ -196,5 +199,6 @@
    <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>
    <listitem><para><link xlink:href="https://bugster.forgerock.org/jira/browse/OPENDJ-49" xlink:show="new">OPENDJ-49</link>: Replication replay does not take into consideration the server/backend's writability mode.</para></listitem>
   </itemizedlist>
+  <!-- Issue count: 44 -->
  </section>
 </chapter>
diff --git a/src/main/docbkx/release-notes/chap-support.xml b/src/main/docbkx/release-notes/chap-support.xml
index 2c5192c..b3e04a0 100644
--- a/src/main/docbkx/release-notes/chap-support.xml
+++ b/src/main/docbkx/release-notes/chap-support.xml
@@ -9,8 +9,7 @@
   ! 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.
+  ! You can also obtain a copy of the license at legal-notices/CC-BY-NC-ND.txt.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
@@ -20,7 +19,7 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2014 ForgeRock AS
+  !      Copyright 2011-2015 ForgeRock AS.
   !    
 -->
 <chapter xml:id='chap-support'
@@ -31,16 +30,10 @@
  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/" />.</para>
+ xlink:href="http://forgerock.com/partners/" />.</para>
 </chapter>
diff --git a/src/main/docbkx/release-notes/chap-update-install.xml b/src/main/docbkx/release-notes/chap-update-install.xml
index 3ba8b6f..05a4bc5 100644
--- a/src/main/docbkx/release-notes/chap-update-install.xml
+++ b/src/main/docbkx/release-notes/chap-update-install.xml
@@ -9,8 +9,7 @@
   ! 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.
+  ! You can also obtain a copy of the license at legal-notices/CC-BY-NC-ND.txt.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
@@ -20,7 +19,7 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2014 ForgeRock AS
+  !      Copyright 2014-2015 ForgeRock AS.
   !
 -->
 <chapter xml:id='chap-update-install'
@@ -48,14 +47,15 @@
 
    <para>
     Find a link to the OpenDJ download page from
-    <link xlink:show="new" xlink:href="http://forgerock.com/download-stack/" />.
+    <link xlink:show="new" xlink:href="https://backstage.forgerock.com/"
+    >backstage.forgerock.com</link>.
    </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"
+    xlink:href="https://backstage.forgerock.com/#!/docs/opendj/2.6.0/install-guide#chap-upgrade"
     ><citetitle>Upgrading to OpenDJ ${stableServerVersion}</citetitle></link>
     in the <citetitle>Installation Guide</citetitle>.
    </para>
@@ -78,14 +78,15 @@
 
    <para>
     Find a link to the OpenDJ download page from
-    <link xlink:show="new" xlink:href="http://forgerock.com/download-stack/" />.
+    <link xlink:show="new" xlink:href="https://backstage.forgerock.com/"
+    >backstage.forgerock.com</link>.
    </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/"
+    xlink:href="https://backstage.forgerock.com/#!/docs/opendj/2.6.0/install-guide"
     ><citetitle>OpenDJ ${stableServerVersion} Installation Guide</citetitle></link>.
    </para>
   </step>
diff --git a/src/main/docbkx/release-notes/chap-whats-new.xml b/src/main/docbkx/release-notes/chap-whats-new.xml
index 2181237..26064f8 100644
--- a/src/main/docbkx/release-notes/chap-whats-new.xml
+++ b/src/main/docbkx/release-notes/chap-whats-new.xml
@@ -46,6 +46,74 @@
    read these release notes. Then update or install OpenDJ.
   </para>
 
+  <section xml:id="security-advisory">
+   <title>Security Advisory</title>
+
+   <para>
+    A security vulnerability has been discovered in OpenDJ.
+    This issue is present in all versions of OpenDJ
+    including 2.6.x, 2.5.0-Xpress1, 2.4.x, and possibly previous versions.
+   </para>
+
+   <para>
+    A security advisory has been issued to provide guidance on
+    how to ensure your deployments can be secured.
+    Workarounds or patches are available for the issue,
+    with fixes included in OpenDJ 2.6.3.
+   </para>
+
+   <para>
+    The severity of the issue in the advisory is High.
+    Deployers should take immediate steps as outlined in the advisory
+    and apply the relevant update at the earliest opportunity.
+   </para>
+
+   <para>
+    The recommendation is to deploy the relevant patch
+    or to upgrade to OpenDJ 2.6.3.
+   </para>
+
+   <para>
+    Customers without existing patches can obtain the relevant patch from
+    <link xlink:href="https://backstage.forgerock.com" xlink:show="new"
+    >BackStage</link>.
+    Customers with deployed patches should contact the support organization
+    to obtain a combo patch.
+    The fix is also present in the community "trunk" nightly builds.
+   </para>
+
+   <itemizedlist>
+    <para>
+     The following security fix has been included in this release:
+    </para>
+
+    <listitem>
+     <para>
+      <emphasis role="strong">Issue #201504-01:
+       Proxied Authorization may allow unexpected escalation
+       of privileges and access.</emphasis>
+      When someone has been granted the privileges to Proxy requests
+      and use the Proxied Authorization control,
+      it is not possible to control who that user can impersonate.
+      It is thus possible to impersonate "cn=Directory Manager"
+      and bypass all access controls.
+     </para>
+
+     <para>
+      Severity: <emphasis role="strong">High</emphasis>
+     </para>
+
+     <para>
+      For more information, see
+      <link
+       xlink:href="https://forgerock.org/2015/06/opendj-security-advisory-201504/"
+       xlink:show="new"
+      >OpenDJ Security Advisory #201504</link>.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </section>
+
   <section xml:id="product-enhancements">
    <title>Product Enhancements</title>
 
@@ -54,6 +122,11 @@
     OpenDJ ${docTargetVersion} provides these important enhancements.
    </para>
 
+   <para>
+    OpenDJ ${docTargetVersion} includes no new enhancements
+    beyond those included in OpenDJ 2.6.2.
+   </para>
+
    <itemizedlist>
     <para>
      The following improvement is new in OpenDJ 2.6.2.
@@ -159,8 +232,8 @@
 
    <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>.
+    for OpenDJ 2.6 online at ForgeRock
+    <link xlink:show="new" xlink:href="${coreDocBase}">BackStage</link>.
    </para>
 
    <itemizedlist>
diff --git a/src/main/docbkx/release-notes/index.xml b/src/main/docbkx/release-notes/index.xml
index 2f559cb..5bbfe75 100644
--- a/src/main/docbkx/release-notes/index.xml
+++ b/src/main/docbkx/release-notes/index.xml
@@ -9,8 +9,7 @@
   ! 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.
+  ! You can also obtain a copy of the license at legal-notices/CC-BY-NC-ND.txt.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
@@ -20,7 +19,7 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2014 ForgeRock AS
+  !      Copyright 2011-2015 ForgeRock AS.
   !    
 -->
 <book xml:id='release-notes'
@@ -40,8 +39,8 @@
    in Java.</para>
   </abstract>
   <copyright>
-   <year>2011-2014</year>
-   <holder>ForgeRock AS</holder>
+   <year>2011-2015</year>
+   <holder>ForgeRock AS.</holder>
   </copyright>
   <authorgroup>
    <author>
@@ -87,7 +86,7 @@
    
   <para>
    See the <link xlink:show="new"
-   xlink:href="http://docs.forgerock.org/en/opendj/2.6.0/install-guide/"
+   xlink:href="https://backstage.forgerock.com/#!/docs/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
diff --git a/src/main/docbkx/sdk-release-notes/index.xml b/src/main/docbkx/sdk-release-notes/SKIP-index.xml
similarity index 100%
rename from src/main/docbkx/sdk-release-notes/index.xml
rename to src/main/docbkx/sdk-release-notes/SKIP-index.xml
diff --git a/src/main/docbkx/shared/affiliation-fr.xml b/src/main/docbkx/shared/affiliation-fr.xml
index a3864e6..9d13643 100644
--- a/src/main/docbkx/shared/affiliation-fr.xml
+++ b/src/main/docbkx/shared/affiliation-fr.xml
@@ -7,11 +7,11 @@
 
    <orgname>ForgeRock AS</orgname>
    <address>
-    <street>33 New Montgomery St.</street>
-    <otheraddr>Suite 1500</otheraddr>
+    <street>201 Mission St.</street>
+    <otheraddr>Suite 2900</otheraddr>
     <city>San Francisco</city>, <state>CA</state> <postcode>94105</postcode>
     <country>USA</country>
-    <phone>+1 415-523-0772</phone>
+    <phone>+1 415-599-1100 (US)</phone>
     <uri>www.forgerock.com</uri>
    </address>
 </affiliation>
\ No newline at end of file

--
Gitblit v1.10.0