Fixing references to the old Github and Git addresses. Making olink of the related URL-s.
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index ccb6869..36c1c31 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1200,11 +1200,10 @@
<itemizedlist>
<listitem>
<para><literal>freemarker</literal>: The engine itself (i.e.,
- <literal>freemarker.jar</literal>) and the documentation. URL: <link
- xlink:href="https://git-wip-us.apache.org/repos/asf/incubator-freemarker.git">https://git-wip-us.apache.org/repos/asf/incubator-freemarker.git</link>.
- GitHub mirror: <link
- xlink:href="https://github.com/apache/incubator-freemarker">https://github.com/apache/incubator-freemarker</link>.
- Relevant branches (as of 2015-09-04):</para>
+ <literal>freemarker.jar</literal>) and the documentation. URL:
+ <olink targetdoc="gitFreemarker"/>. GitHub mirror: <olink
+ targetdoc="githubMirrorFreemarker"/>. Relevant branches (as of
+ 2015-09-04):</para>
<itemizedlist>
<listitem>
@@ -1234,27 +1233,23 @@
<listitem>
<para><literal>freemarker-site</literal>: Web site (freemarker.org)
- contents. URL: <link
- xlink:href="https://git-wip-us.apache.org/repos/asf/incubator-freemarker-site.git">https://git-wip-us.apache.org/repos/asf/incubator-freemarker-site.git</link>.
- GitHub mirror: <link
- xlink:href="https://github.com/apache/incubator-freemarker-site">https://github.com/apache/incubator-freemarker-site</link>.
- Relevant branches: <literal>master</literal></para>
+ contents. URL: <olink targetdoc="gitSite"/>. GitHub mirror: <olink
+ targetdoc="githubMirrorSite"/>. Relevant branches:
+ <literal>master</literal></para>
</listitem>
<listitem>
<para><literal>freemarker-docgen</literal>: DocBook transformation
used for generating both the FreeMarker Manual and the Web site.
- URL: <link
- xlink:href="https://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen.git">https://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen.git</link>.
- GitHub mirror: <link
- xlink:href="https://github.com/apache/incubator-freemarker-docgen">https://github.com/apache/incubator-freemarker-docgen</link>.
- Relevant branches: <literal>master</literal></para>
+ URL: <olink targetdoc="gitDocgen"/>. GitHub mirror: <olink
+ targetdoc="githubMirrorDocgen"/>. Relevant branches:
+ <literal>master</literal></para>
</listitem>
</itemizedlist>
<para>There are some other FreeMarker-related repositories, such FMPP
and Tutorials, which you can only find on the <olink
- targetdoc="githubProject">old GitHub project</olink> page, as they
+ targetdoc="githubProjectOld">old GitHub project</olink> page, as they
aren't part of the ongoing Apache Incubation effort.</para>
<para><emphasis>Disclaimer: Apache FreeMarker is an effort undergoing
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index 4d349bb..239e648 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -50,8 +50,14 @@
fmpp: "http://fmpp.sourceforge.net/"
twitter: "https://twitter.com/freemarker"
sourceforgeProject: "https://sourceforge.net/projects/freemarker/"
- gitFreemarker: "https://github.com/freemarker/freemarker"
- githubProject: "https://github.com/freemarker/"
+ gitFreemarker: "https://git-wip-us.apache.org/repos/asf/incubator-freemarker.git"
+ githubMirrorFreemarker: "https://github.com/apache/incubator-freemarker"
+ gitDocgen: "https://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen.git"
+ githubMirrorDocgen: "https://github.com/apache/incubator-freemarker-docgen"
+ gitSite: "https://git-wip-us.apache.org/repos/asf/incubator-freemarker-site.git"
+ githubMirrorSite: "https://github.com/apache/incubator-freemarker-site"
+ githubProject: "olink:githubMirrorFreemarker"
+ githubProjectOld: "https://github.com/freemarker/"
devMailingList: "mailto:dev@freemarker.incubator.apache.org"
devMailingListSubscribe: "mailto:dev-subscribe@freemarker.incubator.apache.org"
devMailingListUnsubscribe: "mailto:dev-unsubscribe@freemarker.incubator.apache.org"
