From 695493c1ac74e69eeb6315a6a1cada566b304421 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Wed, 10 Jul 2013 09:28:19 +0000
Subject: [PATCH] CR-1977 Fix for OPENDJ-1005: Move server doc sources alongside other server code
---
opends/src/main/docbkx/admin-guide/index.xml | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/opendj3/src/main/docbkx/admin-guide/index.xml b/opends/src/main/docbkx/admin-guide/index.xml
similarity index 72%
rename from opendj3/src/main/docbkx/admin-guide/index.xml
rename to opends/src/main/docbkx/admin-guide/index.xml
index b7eef2e..5d6a9fd 100644
--- a/opendj3/src/main/docbkx/admin-guide/index.xml
+++ b/opends/src/main/docbkx/admin-guide/index.xml
@@ -101,40 +101,40 @@
server. For example, <filename>/path/to/opendj/bin</filename>.</para>
</partintro>
- <xinclude:include href='../shared/man-backup.xml' />
- <xinclude:include href='../shared/man-base64.xml' />
- <xinclude:include href='../shared/man-control-panel.xml' />
- <xinclude:include href='../shared/man-create-rc-script.xml' />
- <xinclude:include href='../shared/man-dbtest.xml' />
- <xinclude:include href='../shared/man-dsconfig.xml' />
- <xinclude:include href='../shared/man-dsframework.xml' />
- <xinclude:include href='../shared/man-dsjavaproperties.xml' />
- <xinclude:include href='../shared/man-dsreplication.xml' />
- <xinclude:include href='../shared/man-encode-password.xml' />
- <xinclude:include href='../shared/man-export-ldif.xml' />
- <xinclude:include href='../shared/man-import-ldif.xml' />
+ <xinclude:include href='man-backup.xml' />
+ <xinclude:include href='man-base64.xml' />
+ <xinclude:include href='man-control-panel.xml' />
+ <xinclude:include href='man-create-rc-script.xml' />
+ <xinclude:include href='man-dbtest.xml' />
+ <xinclude:include href='man-dsconfig.xml' />
+ <xinclude:include href='man-dsframework.xml' />
+ <xinclude:include href='man-dsjavaproperties.xml' />
+ <xinclude:include href='man-dsreplication.xml' />
+ <xinclude:include href='man-encode-password.xml' />
+ <xinclude:include href='man-export-ldif.xml' />
+ <xinclude:include href='man-import-ldif.xml' />
<xinclude:include href='man-ldapcompare.xml' />
- <xinclude:include href='../shared/man-ldapdelete.xml' />
+ <xinclude:include href='man-ldapdelete.xml' />
<xinclude:include href='man-ldapmodify.xml' />
<xinclude:include href='man-ldappasswordmodify.xml' />
<xinclude:include href='man-ldapsearch.xml' />
- <xinclude:include href='../shared/man-ldif-diff.xml' />
+ <xinclude:include href='man-ldif-diff.xml' />
<xinclude:include href='man-ldifmodify.xml' />
<xinclude:include href='man-ldifsearch.xml' />
- <xinclude:include href='../shared/man-list-backends.xml' />
- <xinclude:include href='../shared/man-make-ldif.xml' />
- <xinclude:include href='../shared/man-make-ldif-template.xml' />
- <xinclude:include href='../shared/man-manage-account.xml' />
- <xinclude:include href='../shared/man-manage-tasks.xml' />
- <xinclude:include href='../shared/man-rebuild-index.xml' />
- <xinclude:include href='../shared/man-restore.xml' />
- <xinclude:include href='../shared/man-setup.xml' />
- <xinclude:include href='../shared/man-start-ds.xml' />
- <xinclude:include href='../shared/man-status.xml' />
- <xinclude:include href='../shared/man-stop-ds.xml' />
- <xinclude:include href='../shared/man-uninstall.xml' />
- <xinclude:include href='../shared/man-upgrade.xml' />
- <xinclude:include href='../shared/man-verify-index.xml' />
+ <xinclude:include href='man-list-backends.xml' />
+ <xinclude:include href='man-make-ldif.xml' />
+ <xinclude:include href='man-make-ldif-template.xml' />
+ <xinclude:include href='man-manage-account.xml' />
+ <xinclude:include href='man-manage-tasks.xml' />
+ <xinclude:include href='man-rebuild-index.xml' />
+ <xinclude:include href='man-restore.xml' />
+ <xinclude:include href='man-setup.xml' />
+ <xinclude:include href='man-start-ds.xml' />
+ <xinclude:include href='man-status.xml' />
+ <xinclude:include href='man-stop-ds.xml' />
+ <xinclude:include href='man-uninstall.xml' />
+ <xinclude:include href='man-upgrade.xml' />
+ <xinclude:include href='man-verify-index.xml' />
</reference>
<xinclude:include href="../shared/glossary.xml" />
@@ -147,12 +147,11 @@
<xinclude:include href='appendix-extended-ops.xml' />
<xinclude:include href='appendix-l10n.xml' />
<xinclude:include href='appendix-interface-stability.xml' />
- <xinclude:include href='../../../target/logref/log-message-reference.xml'>
+ <xinclude:include href='${basedir}/build/docgen/logref/log-message-reference.xml'>
<xinclude:fallback>
<appendix>
<title>Log Message Reference Missing</title>
- <para>The log message reference is missing. It should be in
- <filename>../../../target/logref/log-message-reference.xml</filename>.</para>
+ <para>The log message reference is missing.</para>
</appendix>
</xinclude:fallback>
</xinclude:include>
--
Gitblit v1.10.0