From e9237b05764f5b9062635a363c7d6675e84e4d38 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Thu, 10 Jul 2014 10:49:55 +0000
Subject: [PATCH] Backport CR-3996 Fix for OPENDJ-1501: Publish 2.6.9 SDK javadoc

---
 src/main/docbkx/admin-guide/index.xml |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/docbkx/admin-guide/index.xml b/src/main/docbkx/admin-guide/index.xml
index fc86958..cc280db 100644
--- a/src/main/docbkx/admin-guide/index.xml
+++ b/src/main/docbkx/admin-guide/index.xml
@@ -29,7 +29,9 @@
  xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
  xmlns:xinclude='http://www.w3.org/2001/XInclude'>
  <info>
-  <title>OpenDJ <?eval ${docTargetVersion}?> Administration Guide</title>
+  <xinclude:include href="../shared/mediaobject-fr-logo.xml" />
+  <title>OpenDJ Administration Guide</title>
+  <subtitle>Version ${docTargetVersion}</subtitle>
   <abstract>
    <para>Hands-on guide to configuring and using OpenDJ features. The OpenDJ
    project offers open source LDAP directory services in Java.</para>
@@ -40,22 +42,23 @@
   </copyright>
   <authorgroup>
    <author>
-    <personname><firstname>Mark</firstname><surname>Craig</surname></personname>
+    <personname><firstname>Mark </firstname><surname>Craig</surname></personname>
    </author>
    <author>
-    <personname><firstname>Nemanja</firstname><surname>Lukić</surname></personname>
+    <personname><firstname>Nemanja </firstname><surname>Lukić</surname></personname>
    </author>
    <author>
-    <personname><firstname>Ludovic</firstname><surname>Poitou</surname></personname>
+    <personname><firstname>Ludovic </firstname><surname>Poitou</surname></personname>
    </author>
    <author>
-    <personname><firstname>Chris</firstname><surname>Ridd</surname></personname>
+    <personname><firstname>Chris </firstname><surname>Ridd</surname></personname>
+    <xinclude:include href="../shared/affiliation-fr.xml"/>
    </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 />

--
Gitblit v1.10.0