incubator-freemarker-site git commit: Adding redirections need on the real site

[dd...@apache.org]

Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/asf-site 829e66410 -> 75883df6f


Adding redirections need on the real site


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

Branch: refs/heads/asf-site
Commit: 75883df6f86292f3f1d1adcba43fe684f0c0777e
Parents: 829e664
Author: ddekany <dd...@apache.org>
Authored: Sat Oct 31 21:20:11 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Oct 31 21:20:11 2015 +0100

----------------------------------------------------------------------
 .htaccess | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/75883df6/.htaccess
----------------------------------------------------------------------
diff --git a/.htaccess b/.htaccess
index 0c877a7..d77625f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1 +1,14 @@
-redirect 302 /test-foo.html http://freemarker.incubator.apache.org/test-bar.html
\ No newline at end of file
+# Redirect www to non-www:
+RewriteEngine On
+RewriteBase /
+RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
+RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
+
+# Redirect old URL-s to new ones:
+redirect permanent "^/docs/preface\.html$", "/",
+redirect permanent "^/features\.html$" => "/",
+redirect permanent "^/whoWeAre\.html$" => "/history.html",
+redirect permanent "^/fmpp\.html$" => "http://fmpp.sourceforge.net/"
+
+# We don't have toc.html ATM, but it might will reappear:
+redirect temp "^/docs/toc\.html$", "/docs/",