incubator-freemarker-site git commit: Updated redirections to include freemarker.apache.org

[dd...@apache.org]

Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/asf-site 616641937 -> b4a21e406


Updated redirections to include freemarker.apache.org


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/b4a21e40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/b4a21e40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/b4a21e40

Branch: refs/heads/asf-site
Commit: b4a21e4064f9e3cd7bc18eaa67f6c0e6ff1e5c24
Parents: 6166419
Author: ddekany <dd...@apache.org>
Authored: Mon Jul 17 01:24:14 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Mon Jul 17 01:24:14 2017 +0200

----------------------------------------------------------------------
 .htaccess | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/b4a21e40/.htaccess
----------------------------------------------------------------------
diff --git a/.htaccess b/.htaccess
index 8cedab3..a683916 100644
--- a/.htaccess
+++ b/.htaccess
@@ -12,5 +12,6 @@ RewriteBase /
 
 # Redirect to the canonical domain: 
 RewriteCond %{HTTP_HOST} ^www\.freemarker\.org$ [NC,OR]
-RewriteCond %{HTTP_HOST} ^freemarker\.incubator\. [NC]
+RewriteCond %{HTTP_HOST} ^freemarker\.incubator\. [NC,OR]
+RewriteCond %{HTTP_HOST} ^freemarker\.apache\. [NC]
 RewriteRule ^(.*)$ http://freemarker.org/$1 [R=301,L]