From aa010973d2ac0f2e9d4dfdf8a5537a3043361133 Mon Sep 17 00:00:00 2001
From: Gene Hirayama <gene.hirayama@forgerock.com>
Date: Tue, 10 Jun 2014 19:07:16 +0000
Subject: [PATCH] OPENDJ-1489/CR-3718-Update-OpenDJ-Docs-for-2.1.2-Branding-OpenDJ3.0
---
opendj-sdk/opendj3-server-dev/src/main/docbkx/admin-guide/index.xml | 14 +++++++++-----
opendj-sdk/opendj3-server-dev/src/main/docbkx/release-notes/index.xml | 7 +++++--
opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/images/forgerock-opendj-logo.png | 0
opendj-sdk/opendj3-server-dev/src/main/docbkx/install-guide/index.xml | 7 +++++--
opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/mediaobject-fr-logo.xml | 10 ++++++++++
opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/affiliation-fr.xml | 17 +++++++++++++++++
6 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/main/docbkx/admin-guide/index.xml b/opendj-sdk/opendj3-server-dev/src/main/docbkx/admin-guide/index.xml
index bde8323..e2684b2 100644
--- a/opendj-sdk/opendj3-server-dev/src/main/docbkx/admin-guide/index.xml
+++ b/opendj-sdk/opendj3-server-dev/src/main/docbkx/admin-guide/index.xml
@@ -31,7 +31,9 @@
xmlns:xlink='http://www.w3.org/1999/xlink'
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>
@@ -42,16 +44,18 @@
</copyright>
<authorgroup>
<author>
- <personname><firstname>Mark</firstname><surname>Craig</surname></personname>
+ <!-- Need to add a space after firstname for now -->
+ <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' />
diff --git a/opendj-sdk/opendj3-server-dev/src/main/docbkx/install-guide/index.xml b/opendj-sdk/opendj3-server-dev/src/main/docbkx/install-guide/index.xml
index 608cc2f..91e13f7 100644
--- a/opendj-sdk/opendj3-server-dev/src/main/docbkx/install-guide/index.xml
+++ b/opendj-sdk/opendj3-server-dev/src/main/docbkx/install-guide/index.xml
@@ -30,7 +30,9 @@
xmlns:xlink='http://www.w3.org/1999/xlink'
xmlns:xinclude='http://www.w3.org/2001/XInclude'>
<info>
- <title>OpenDJ <?eval ${docTargetVersion}?> Installation Guide</title>
+ <xinclude:include href="../shared/mediaobject-fr-logo.xml" />
+ <title>OpenDJ Installation Guide</title>
+ <subtitle>Version ${sdkDocTargetVersion}</subtitle>
<abstract>
<para>This guide shows you how to install OpenDJ directory services. The
OpenDJ project offers open source LDAP directory services in Java.</para>
@@ -41,7 +43,8 @@
</copyright>
<authorgroup>
<author>
- <personname><firstname>Mark</firstname><surname>Craig</surname></personname>
+ <personname><firstname>Mark </firstname><surname>Craig</surname></personname>
+ <xinclude:include href="../shared/affiliation-fr.xml"/>
</author>
</authorgroup>
<xinclude:include href='../legal.xml' />
diff --git a/opendj-sdk/opendj3-server-dev/src/main/docbkx/release-notes/index.xml b/opendj-sdk/opendj3-server-dev/src/main/docbkx/release-notes/index.xml
index 10efe89..82abf80 100644
--- a/opendj-sdk/opendj3-server-dev/src/main/docbkx/release-notes/index.xml
+++ b/opendj-sdk/opendj3-server-dev/src/main/docbkx/release-notes/index.xml
@@ -30,7 +30,9 @@
xmlns:xlink='http://www.w3.org/1999/xlink'
xmlns:xinclude='http://www.w3.org/2001/XInclude'>
<info>
- <title>OpenDJ <?eval ${docTargetVersion}?> Release Notes</title>
+ <xinclude:include href="../shared/mediaobject-fr-logo.xml" />
+ <title>OpenDJ Release Notes</title>
+ <subtitle>Version ${sdkDocTargetVersion}</subtitle>
<abstract>
<para>Notes covering OpenDJ hardware & software requirements, fixes,
known issues. The OpenDJ project offers open source LDAP directory services
@@ -42,7 +44,8 @@
</copyright>
<authorgroup>
<author>
- <personname><firstname>Mark</firstname><surname>Craig</surname></personname>
+ <personname><firstname>Mark </firstname><surname>Craig</surname></personname>
+ <xinclude:include href="../shared/affiliation-fr.xml"/>
</author>
</authorgroup>
<xinclude:include href='../legal.xml' />
diff --git a/opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/affiliation-fr.xml b/opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/affiliation-fr.xml
new file mode 100644
index 0000000..a3864e6
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/affiliation-fr.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<affiliation xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
+ xmlns:xlink='http://www.w3.org/1999/xlink'
+ xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+
+ <orgname>ForgeRock AS</orgname>
+ <address>
+ <street>33 New Montgomery St.</street>
+ <otheraddr>Suite 1500</otheraddr>
+ <city>San Francisco</city>, <state>CA</state> <postcode>94105</postcode>
+ <country>USA</country>
+ <phone>+1 415-523-0772</phone>
+ <uri>www.forgerock.com</uri>
+ </address>
+</affiliation>
\ No newline at end of file
diff --git a/opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/images/forgerock-opendj-logo.png b/opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/images/forgerock-opendj-logo.png
new file mode 100644
index 0000000..ee4aaf8
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/images/forgerock-opendj-logo.png
Binary files differ
diff --git a/opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/mediaobject-fr-logo.xml b/opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/mediaobject-fr-logo.xml
new file mode 100644
index 0000000..f455105
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/docbkx/shared/mediaobject-fr-logo.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mediaobject xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
+ xmlns:xlink='http://www.w3.org/1999/xlink'
+ xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+ <imageobject>
+ <imagedata fileref="images/forgerock-opendj-logo.png" role="top"/>
+ </imageobject>
+</mediaobject>
--
Gitblit v1.10.0