From 3ba902c32acfc893d9e420d1274465d1d0908fe4 Mon Sep 17 00:00:00 2001
From: Peter Pin-Guang Chen <petercpg@mail.moztw.org>
Date: Thu, 15 May 2014 20:07:08 +0800
Subject: [PATCH] bug 1008162, stop redirecting firefox tips page to mozilla
 taiwan

---
 etc/httpd/global.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/httpd/global.conf b/etc/httpd/global.conf
index 4674a5c69cc..c7544cb7a3f 100644
--- a/etc/httpd/global.conf
+++ b/etc/httpd/global.conf
@@ -29,9 +29,10 @@ RewriteRule ^(.*)$ $1 [L,R=301]
 # bug 845988 - remove double slashes in URLs
 RewriteRule ^(.*)//(.*)$ $1/$2 [L,R=301]
 
-# bug 764261, 841393, 996608
+# bug 764261, 841393, 996608, 1008162
 RewriteRule ^/zh-TW/$ http://mozilla.com.tw/ [L,R=301]
 RewriteCond %{REQUEST_URI} !^/zh-TW/firefox/partners
+RewriteCond %{REQUEST_URI} !^/zh-TW/firefox/tips
 RewriteCond %{REQUEST_URI} !^/zh-TW/firefox(/(?:\d+\.\d+\.?(?:\d+)?\.?(?:\d+)?(?:[a|b]?)(?:\d*)(?:pre)?(?:\d)?))?/firstrun/?
 RewriteCond %{REQUEST_URI} !^/zh-TW/firefox(/(?:\d+\.\d+\.?(?:\d+)?\.?(?:\d+)?(?:[a|b]?)(?:\d*)(?:pre)?(?:\d)?))?/tour/?
 RewriteCond %{REQUEST_URI} !^/zh-TW/firefox(/(?:\d+\.\d+\.?(?:\d+)?\.?(?:\d+)?(?:[a|b]?)(?:\d*)(?:pre)?(?:\d)?))?/whatsnew/?