From d7c4661c64051b020834a44fdb58d93088c757eb Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 24 Jul 2012 10:51:24 +0000
Subject: [PATCH] Return to 2.5.0 in progress docs

---
 opendj3/src/main/docbkx/release-notes/index.xml          |    6 ------
 opendj3/src/main/docbkx/release-notes/chap-whats-new.xml |    4 ----
 opendj3/pom.xml                                          |    3 +--
 3 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index d630ba7..b58a3fe 100644
--- a/opendj3/pom.xml
+++ b/opendj3/pom.xml
@@ -105,8 +105,7 @@
     <stableSDKversion>version.not.defined</stableSDKversion>
     <currentServerVersion>2.5.0-SNAPSHOT</currentServerVersion>
     <stableServerVersion>2.4.5</stableServerVersion>
-<!--     <docTargetVersion>2.5.0</docTargetVersion> -->
-    <docTargetVersion>2.5.0-Xpress1</docTargetVersion>
+    <docTargetVersion>2.5.0</docTargetVersion>
     <siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
     <i18nFrameworkVersion>1.4.0</i18nFrameworkVersion>
     <gaId>UA-23412190-8</gaId>
diff --git a/opendj3/src/main/docbkx/release-notes/chap-whats-new.xml b/opendj3/src/main/docbkx/release-notes/chap-whats-new.xml
index 0343e9d..489d105 100644
--- a/opendj3/src/main/docbkx/release-notes/chap-whats-new.xml
+++ b/opendj3/src/main/docbkx/release-notes/chap-whats-new.xml
@@ -233,12 +233,8 @@
       <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"
- -->
-      <link xlink:show="new"
-      xlink:href="http://opendj.forgerock.org/doc/admin-guide/index.html#chap-pta"
       ><citetitle>Administration Guide</citetitle></link> for details.</para>
     </listitem>
     <listitem>
diff --git a/opendj3/src/main/docbkx/release-notes/index.xml b/opendj3/src/main/docbkx/release-notes/index.xml
index 7dff734..496d23e 100644
--- a/opendj3/src/main/docbkx/release-notes/index.xml
+++ b/opendj3/src/main/docbkx/release-notes/index.xml
@@ -76,15 +76,9 @@
   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
- -->
-  <para>See the <link
-  xlink:href="http://opendj.forgerock.org/doc/install-guide/index.html#install-guide"
-  xlink:show="new"><citetitle>Installation
-  Guide</citetitle></link> for more after you read these release notes. The
   installation guide covers installation and upgrade for OpenDJ directory
   server and OpenDJ DSML gateway.</para>
  </preface>

--
Gitblit v1.10.0