From 2bf064a6911cf09f08d1c5e04178692ce6e0264d Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 03 Apr 2015 12:36:39 +0000
Subject: [PATCH] OPENDJ-1911 Fix broken links

---
 opendj-server-legacy/src/main/docbkx/man-pages/make-ldif-see-also.xml |    2 +-
 src/main/docbkx/dev-guide/chap-extended-ops.xml                       |   14 +++++++-------
 src/main/docbkx/dev-guide/chap-get-sdk.xml                            |   16 ++++++++--------
 pom.xml                                                               |    3 ++-
 src/main/docbkx/dev-guide/chap-controls.xml                           |   20 ++++++++++----------
 5 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/opendj-server-legacy/src/main/docbkx/man-pages/make-ldif-see-also.xml b/opendj-server-legacy/src/main/docbkx/man-pages/make-ldif-see-also.xml
index c659d6f..6363989 100644
--- a/opendj-server-legacy/src/main/docbkx/man-pages/make-ldif-see-also.xml
+++ b/opendj-server-legacy/src/main/docbkx/man-pages/make-ldif-see-also.xml
@@ -33,7 +33,7 @@
 
  <para>
   <link xlink:show="new"
-        xlink:href="reference#makeldif-template-5"
+        xlink:href="reference#make-ldif-template-5"
         xlink:role="http://docbook.org/xlink/role/olink"
    ><citerefentry><refentrytitle
    >make-ldif.template</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>
diff --git a/pom.xml b/pom.xml
index 579b98f..cc20fc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,7 +155,8 @@
     <publicationDate>${pubDate}</publicationDate>
 
     <!-- Permit doc build to override relative locations of non DocBook content -->
-    <coreDocBase>http://opendj.forgerock.org/doc/</coreDocBase>
+    <coreDocBase>http://opendj.forgerock.org/doc/bootstrap/</coreDocBase>
+    <serverDocBase>http://opendj.forgerock.org/opendj-server/doc/bootstrap/</serverDocBase>
     <configRefBase>http://opendj.forgerock.org/opendj-server/configref/</configRefBase>
     <serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
     <sdkJavadocBase>http://opendj.forgerock.org/opendj-core/apidocs/</sdkJavadocBase>
diff --git a/src/main/docbkx/dev-guide/chap-controls.xml b/src/main/docbkx/dev-guide/chap-controls.xml
index d7740b1..811b314 100644
--- a/src/main/docbkx/dev-guide/chap-controls.xml
+++ b/src/main/docbkx/dev-guide/chap-controls.xml
@@ -20,15 +20,15 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2014 ForgeRock AS
+  !      Copyright 2011-2015 ForgeRock AS.
   !    
 -->
 <chapter xml:id='chap-controls'
- 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='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'>
  <title>Working With Controls</title>
  <indexterm>
   <primary>Controls</primary>
@@ -70,7 +70,7 @@
 
   <para>For OpenDJ, the controls supported are listed in the
   <citetitle>Administration Guide</citetitle> appendix, <link xlink:show="new"
-  xlink:href="${coreDocBase}admin-guide#appendix-controls"><citetitle>LDAP
+  xlink:href="${serverDocBase}admin-guide/#appendix-controls"><citetitle>LDAP
   Controls</citetitle></link>. You can access the list of OIDs for
   supported LDAP controls by reading the <literal>supportedControl</literal>
   attribute of the root DSE.</para>
@@ -405,7 +405,7 @@
   password policy configuration to set a short maximum password age, change
   Barbara Jensen's password, and wait for it to expire. See the OpenDJ
   <citetitle>Administration Guide</citetitle> procedure explaining how
-  <link xlink:href="${coreDocBase}admin-guide#default-pwp" xlink:show="new"
+  <link xlink:href="${serverDocBase}admin-guide/#default-pwp" xlink:show="new"
   ><citetitle>To Adjust the Default Password Policy</citetitle></link> for an
   example of how to adjust the maximum password age.</para>
 
@@ -439,7 +439,7 @@
   interval, change Barbara Jensen's password, and wait until you enter the
   warning interval before password expiration. See the OpenDJ
   <citetitle>Administration Guide</citetitle> procedure explaining how
-  <link xlink:href="${coreDocBase}admin-guide#default-pwp"
+  <link xlink:href="${serverDocBase}admin-guide/#default-pwp"
   xlink:show="new"><citetitle>To Adjust the Default Password Policy</citetitle></link>
   for an example of how to adjust the maximum password age. Also set a short
   <literal>password-expiration-warning-interval</literal> value.</para>
@@ -476,7 +476,7 @@
   Barbara Jensen's password, and then run the example during the warning
   interval and after the password has expired. See the OpenDJ
   <citetitle>Administration Guide</citetitle> procedure explaining how
-  <link xlink:href="${coreDocBase}admin-guide#default-pwp" xlink:show="new"><citetitle
+  <link xlink:href="${serverDocBase}admin-guide/#default-pwp" xlink:show="new"><citetitle
   >To Adjust the Default Password Policy</citetitle></link> for an example
   of how to adjust the maximum password age. Also set a short
   <literal>password-expiration-warning-interval</literal> value.</para>
diff --git a/src/main/docbkx/dev-guide/chap-extended-ops.xml b/src/main/docbkx/dev-guide/chap-extended-ops.xml
index 902c389..e59ab82 100644
--- a/src/main/docbkx/dev-guide/chap-extended-ops.xml
+++ b/src/main/docbkx/dev-guide/chap-extended-ops.xml
@@ -20,15 +20,15 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2014 ForgeRock AS
+  !      Copyright 2011-2015 ForgeRock AS
   !    
 -->
 <chapter xml:id='chap-extended-ops'
- 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='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'>
  <title>Working With Extended Operations</title>
  <indexterm>
   <primary>Extended operations</primary>
@@ -66,7 +66,7 @@
 
   <para>For OpenDJ, the extended operations supported are listed in the
   <citetitle>Administration Guide</citetitle> appendix, <link
-  xlink:href="${coreDocBase}admin-guide#appendix-extended-ops"
+  xlink:href="${serverDocBase}admin-guide#/appendix-extended-ops"
   xlink:show="new"><citetitle>LDAP Extended Operations</citetitle></link>.
   You can access the list of OIDs for supported LDAP controls by reading the
   <literal>supportedExtension</literal> attribute of the root DSE.</para>
diff --git a/src/main/docbkx/dev-guide/chap-get-sdk.xml b/src/main/docbkx/dev-guide/chap-get-sdk.xml
index c399f38..684f253 100644
--- a/src/main/docbkx/dev-guide/chap-get-sdk.xml
+++ b/src/main/docbkx/dev-guide/chap-get-sdk.xml
@@ -20,16 +20,16 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2014 ForgeRock AS
+  !      Copyright 2011-2015 ForgeRock AS.
   !    
 -->
 <chapter xml:id='chap-get-sdk'
- 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'>
+         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'>
  <title>Getting OpenDJ LDAP SDK</title>
 
  <para>This chapter introduces OpenDJ LDAP SDK, demonstrating how to get the
@@ -83,7 +83,7 @@
   <para>Before you either download a build of OpenDJ LDAP SDK, or get the
   source code to build your own SDK, make sure you have a Java Development Kit
   installed. See the <citetitle>Release Notes</citetitle> section on
-  <link xlink:href="${coreDocBase}release-notes#prerequisites-java"
+  <link xlink:href="${serverDocBase}release-notes/#prerequisites-java"
   xlink:show="new"><citetitle>Java Environment</citetitle></link>
   requirements.</para>
 

--
Gitblit v1.10.0