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 git commit: Changing official domain from freemarker.org to freemarker.apache.org
Date Sat, 04 Nov 2017 10:14:05 GMT
Changing official domain from freemarker.org to freemarker.apache.org


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

Branch: refs/heads/2.3-gae
Commit: 99cddb10c56c83257885c82e5d3b3d6ee48522d8
Parents: 3dbf1ec
Author: ddekany <ddekany@apache.org>
Authored: Sat Nov 4 10:46:04 2017 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sat Nov 4 11:04:49 2017 +0100

----------------------------------------------------------------------
 README.md                     |  8 ++++----
 build.xml                     |  4 ++--
 src/manual/en_US/docgen.cjson | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/99cddb10/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 0337f86..f1c34f2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Apache FreeMarker {version}
 [![Build Status](https://travis-ci.org/apache/incubator-freemarker.svg?branch=2.3-gae)](https://travis-ci.org/apache/incubator-freemarker)
 
 For the latest version or to report bugs visit:
-http://freemarker.org/
+http://freemarker.apache.org/
 
 
 DISCLAIMER
@@ -44,7 +44,7 @@ See the LICENSE file for more details!
 Documentation
 -------------
 
-Online: http://freemarker.org/docs/
+Online: http://freemarker.apache.org/docs/
 
 Offline: The full documentation is available in the binary distribution
 in the documentation/index.html directory.
@@ -93,7 +93,7 @@ Change log
 ----------
 
 Online (for stable releases only):
-http://freemarker.org/docs/app_versions.html
+http://freemarker.apache.org/docs/app_versions.html
 
 Offline:
 In the binary release, open documentation/index.html, and you will find the
@@ -105,7 +105,7 @@ Building FreeMarker
 
 If you haven't yet, download the source release, or checkout FreeMarker from
 the source code repository. See repository locations here:
-http://freemarker.org/sourcecode.html
+http://freemarker.apache.org/sourcecode.html
 
 You need JDK 8 (not JDK 9!), Apache Ant (tested with 1.9.6) and Ivy (tested
 with 2.4.0) to be installed. To install Ivy (but be sure it's not already

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/99cddb10/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index fd73ab0..28e29d4 100644
--- a/build.xml
+++ b/build.xml
@@ -622,7 +622,7 @@
     <u:manual offline="true" locale="en_US" />
   </target>
 
-  <target name="manualFreemarkerOrg" depends="init" description="Build the Manual to be
upload to freemarker.org" >
+  <target name="manualOnline" depends="init" description="Build the Manual to be upload
to the FreeMarker homepage" >
     <u:manual offline="false" locale="en_US" />
   </target>
   
@@ -630,7 +630,7 @@
     <u:manual offline="true" locale="zh_CN" />
   </target>
 
-  <target name="manualFreemarkerOrg_zh_CN" depends="init" description="Build the Manual
to be upload to freemarker.org" >
+  <target name="manualOnline_zh_CN" depends="init" description="Build the Manual to be
upload to the FreeMarker homepage" >
     <u:manual offline="false" locale="zh_CN" />
   </target>
   

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/99cddb10/src/manual/en_US/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index 076e8f3..fb48a0c 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -17,7 +17,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-deployUrl: "http://freemarker.org/docs/"
+deployUrl: "http://freemarker.apache.org/docs/"
 onlineTrackerHTML: "docgen-misc/googleAnalytics.html"
 searchKey: "003127866208504630097:arjqbv_znfw"
 validation: {
@@ -49,21 +49,21 @@ seoMeta: {
 }
 
 logo: {
-  href: "http://freemarker.org"
+  href: "http://freemarker.apache.org"
   src: logo.png,
   alt: "FreeMarker"
 }
 
 olinks: {
-  homepage: "http://freemarker.org/"
+  homepage: "http://freemarker.apache.org/"
   api: "api/index.html"
   
   // Homepage links:
-  freemarkerdownload: "http://freemarker.org/freemarkerdownload.html"
-  contribute: "http://freemarker.org/contribute.html"
-  history: "http://freemarker.org/history.html"
-  what-is-freemarker: "http://freemarker.org/"
-  mailing-lists: "http://freemarker.org/mailing-lists.html"
+  freemarkerdownload: "http://freemarker.apache.org/freemarkerdownload.html"
+  contribute: "http://freemarker.apache.org/contribute.html"
+  history: "http://freemarker.apache.org/history.html"
+  what-is-freemarker: "http://freemarker.apache.org/"
+  mailing-lists: "http://freemarker.apache.org/mailing-lists.html"
   
   // External URL-s:
   onlineTemplateTester: "http://freemarker-online.kenshoo.com/"


Mime
View raw message