freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [2/2] incubator-freemarker-site git commit: Fixing references to the old Github and Git addresses. Making olink of the related URL-s.
Date Thu, 17 Dec 2015 13:46:50 GMT
Fixing references to the old Github and Git addresses. Making olink of the related URL-s.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/c77f0717
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/c77f0717
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/c77f0717

Branch: refs/heads/master
Commit: c77f0717ddb0352d6f85ba0de551d7027a06a8c4
Parents: 17e210c
Author: ddekany <ddekany@apache.org>
Authored: Thu Dec 17 14:46:35 2015 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Thu Dec 17 14:46:35 2015 +0100

----------------------------------------------------------------------
 src/main/docgen/book.xml     | 27 +++++++++++----------------
 src/main/docgen/docgen.cjson | 10 ++++++++--
 2 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c77f0717/src/main/docgen/book.xml
----------------------------------------------------------------------
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 @@ two freemarker.jar-s and unpredictable behavior!
       <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 @@ two freemarker.jar-s and unpredictable behavior!
 
         <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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c77f0717/src/main/docgen/docgen.cjson
----------------------------------------------------------------------
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 @@ olinks: {
   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"


Mime
View raw message