From de8dbc0e24f3e0a637b79d3b9d6b3c8f22cc642d Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 28 Mar 2014 08:33:08 +0000
Subject: [PATCH] CR-3284 Move to latest doc tools

---
 opendj-sdk/opendj3-server-dev/src/site/xdoc/docs.xml |   12 ++++++++----
 opendj-sdk/opendj3-server-dev/pom.xml                |    2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/opendj-sdk/opendj3-server-dev/pom.xml b/opendj-sdk/opendj3-server-dev/pom.xml
index 1600f0d..176c3f4 100644
--- a/opendj-sdk/opendj3-server-dev/pom.xml
+++ b/opendj-sdk/opendj3-server-dev/pom.xml
@@ -169,7 +169,9 @@
         <inherited>false</inherited>
         <configuration>
          <projectName>OpenDJ</projectName>
+         <projectVersion>${docTargetVersion}</projectVersion>
          <googleAnalyticsId>${gaId}</googleAnalyticsId>
+         <latestJson>http://mcraig.org/fr/latest.php</latestJson><!-- Temporary workaround pending #QOZ-985-23233 -->
          <docbkxSourceDirectory>${basedir}/src/main/docbkx</docbkxSourceDirectory>
         </configuration>
         <executions>
diff --git a/opendj-sdk/opendj3-server-dev/src/site/xdoc/docs.xml b/opendj-sdk/opendj3-server-dev/src/site/xdoc/docs.xml
index f541fb9..c204103 100644
--- a/opendj-sdk/opendj3-server-dev/src/site/xdoc/docs.xml
+++ b/opendj-sdk/opendj3-server-dev/src/site/xdoc/docs.xml
@@ -50,28 +50,32 @@
     <a href="./doc/release-notes/index.html">HTML (single page)</a>,
     <a href="./doc/release-notes/index/index.html">HTML (1 page/chapter)</a>,
     <a href="./doc/OpenDJ-Release-Notes.pdf">PDF</a>,
-    <a href="./doc/OpenDJ-Release-Notes.rtf">RTF</a></dd>
+    <a href="./doc/OpenDJ-Release-Notes.rtf">RTF</a>,
+    <a href="./doc/webhelp/release-notes/index.html">Webhelp</a></dd>
 
     <dt>Installation Guide</dt>
     <dd><a href="./doc/OpenDJ-Install-Guide.epub">EPUB</a>,
     <a href="./doc/install-guide/index.html">HTML (single page)</a>,
     <a href="./doc/install-guide/index/index.html">HTML (1 page/chapter)</a>,
     <a href="./doc/OpenDJ-Install-Guide.pdf">PDF</a>,
-    <a href="./doc/OpenDJ-Install-Guide.rtf">RTF</a></dd>
+    <a href="./doc/OpenDJ-Install-Guide.rtf">RTF</a>,
+    <a href="./doc/webhelp/install-guide/index.html">Webhelp</a></dd>
 
     <dt>Administration Guide</dt>
     <dd><a href="./doc/OpenDJ-Admin-Guide.epub">EPUB</a>,
     <a href="./doc/admin-guide/index.html">HTML (single page)</a>,
     <a href="./doc/admin-guide/index/index.html">HTML (1 page/chapter)</a>,
     <a href="./doc/OpenDJ-Admin-Guide.pdf">PDF</a>,
-    <a href="./doc/OpenDJ-Admin-Guide.rtf">RTF</a></dd>
+    <a href="./doc/OpenDJ-Admin-Guide.rtf">RTF</a>,
+    <a href="./doc/webhelp/admin-guide/index.html">Webhelp</a></dd>
 
     <dt>Developer Guide</dt>
     <dd><a href="../doc/OpenDJ-Dev-Guide.epub">EPUB</a>,
     <a href="../doc/dev-guide/index.html">HTML (single page)</a>,
     <a href="../doc/dev-guide/index/index.html">HTML (1 page/chapter)</a>,
     <a href="../doc/OpenDJ-Dev-Guide.pdf">PDF</a>,
-    <a href="../doc/OpenDJ-Dev-Guide.rtf">RTF</a></dd>
+    <a href="../doc/OpenDJ-Dev-Guide.rtf">RTF</a>,
+    <a href="../doc/webhelp/dev-guide/index.html">Webhelp</a></dd>
 
     <dt>Configuration Reference</dt>
     <dd><a href="./configref/index.html">HTML</a></dd>

--
Gitblit v1.10.0