From 10d3163f71b4d0f30179398a3936d63b5856a8e7 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 28 Mar 2014 08:39:58 +0000
Subject: [PATCH] CR-3284 Move to latest doc tools
---
opends/pom.xml | 4 +++-
pom.xml | 4 +++-
src/site/xdoc/docs.xml | 12 ++++++++----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/opends/pom.xml b/opends/pom.xml
index 27835c4..e6211ce 100644
--- a/opends/pom.xml
+++ b/opends/pom.xml
@@ -99,7 +99,7 @@
<docPreviousVersion>2.6.0</docPreviousVersion>
<sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
- <frDocPluginVersion>2.0.0</frDocPluginVersion>
+ <frDocPluginVersion>2.1.0-SNAPSHOT</frDocPluginVersion>
<gaId>UA-23412190-8</gaId>
<!--
@@ -196,6 +196,8 @@
<inherited>false</inherited>
<configuration>
<projectName>OpenDJ</projectName>
+ <projectVersion>${docTargetVersion}</projectVersion>
+ <latestJson>http://mcraig.org/fr/latest.php</latestJson><!-- Temporary workaround pending #QOZ-985-23233 -->
<googleAnalyticsId>${gaId}</googleAnalyticsId>
<docbkxSourceDirectory>${basedir}/src/main/docbkx</docbkxSourceDirectory>
</configuration>
diff --git a/pom.xml b/pom.xml
index 5870a3b..d5454d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
<docPreviousVersion>2.6.0</docPreviousVersion>
<sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
- <frDocPluginVersion>2.0.0</frDocPluginVersion>
+ <frDocPluginVersion>2.1.0-SNAPSHOT</frDocPluginVersion>
<gaId>UA-23412190-8</gaId>
<siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
@@ -168,6 +168,8 @@
<inherited>false</inherited>
<configuration>
<projectName>OpenDJ</projectName>
+ <projectVersion>${docTargetVersion}</projectVersion>
+ <latestJson>http://mcraig.org/fr/latest.php</latestJson><!-- Temporary workaround pending #QOZ-985-23233 -->
<googleAnalyticsId>${gaId}</googleAnalyticsId>
</configuration>
<executions>
diff --git a/src/site/xdoc/docs.xml b/src/site/xdoc/docs.xml
index 4ad5d0e..09419b9 100644
--- a/src/site/xdoc/docs.xml
+++ b/src/site/xdoc/docs.xml
@@ -44,28 +44,32 @@
<a href="./opendj-server/doc/release-notes/index.html">HTML (single page)</a>,
<a href="./opendj-server/doc/release-notes/index/index.html">HTML (1 page/chapter)</a>,
<a href="./opendj-server/doc/OpenDJ-Release-Notes.pdf">PDF</a>,
- <a href="./opendj-server/doc/OpenDJ-Release-Notes.rtf">RTF</a></dd>
+ <a href="./opendj-server/doc/OpenDJ-Release-Notes.rtf">RTF</a>,
+ <a href="./opendj-server/doc/webhelp/release-notes/index.html">Webhelp</a></dd>
<dt>Installation Guide</dt>
<dd><a href="./opendj-server/doc/OpenDJ-Install-Guide.epub">EPUB</a>,
<a href="./opendj-server/doc/install-guide/index.html">HTML (single page)</a>,
<a href="./opendj-server/doc/install-guide/index/index.html">HTML (1 page/chapter)</a>,
<a href="./opendj-server/doc/OpenDJ-Install-Guide.pdf">PDF</a>,
- <a href="./opendj-server/doc/OpenDJ-Install-Guide.rtf">RTF</a></dd>
+ <a href="./opendj-server/doc/OpenDJ-Install-Guide.rtf">RTF</a>,
+ <a href="./opendj-server/doc/webhelp/install-guide/index.html">Webhelp</a></dd>
<dt>Administration Guide</dt>
<dd><a href="./opendj-server/doc/OpenDJ-Admin-Guide.epub">EPUB</a>,
<a href="./opendj-server/doc/admin-guide/index.html">HTML (single page)</a>,
<a href="./opendj-server/doc/admin-guide/index/index.html">HTML (1 page/chapter)</a>,
<a href="./opendj-server/doc/OpenDJ-Admin-Guide.pdf">PDF</a>,
- <a href="./opendj-server/doc/OpenDJ-Admin-Guide.rtf">RTF</a></dd>
+ <a href="./opendj-server/doc/OpenDJ-Admin-Guide.rtf">RTF</a>,
+ <a href="./opendj-server/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="./opendj-server/configref/index.html">HTML</a></dd>
--
Gitblit v1.10.0