make the new site the main site

diff --git a/.htaccess b/.htaccess
index 381dc9e..6ca4cf4 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -12,20 +12,11 @@ RewriteRule ^mediawiki/css/(.*)$ css/$1 [L]
 RewriteRule ^mediawiki/images/(.*)$ images/$1 [L]
 RewriteRule ^mediawiki/h/(.*)$ h/$1 [L]
 
-# show the stuff in / as /new/*
-RedirectMatch temp ^/new$ http://openbox.org/new/
-RewriteRule ^new/?$ new/home.php [L]
-RewriteRule ^new/(.*)$ $1 [L]
+# use home.php as the root
+RewriteRule ^$ home.php [L]
 
 # old folders
 #RewriteRule ^releases(.*)$ dist/openbox$1 [L]
 RedirectMatch permanent ^/releases(.*)$ http://openbox.org/dist/openbox$1
 #RewriteRule ^obconf(.*)$ dist/obconf$1 [L]
 RedirectMatch permanent ^/obconf(.*)$ http://openbox.org/dist/obconf$1
-
-# serve the wiki on /
-RewriteRule ^$ wiki [L]
-
-# wiki/ shortcut for the old wiki site
-RewriteRule ^wiki/?$ oldwiki/index.php?title=Main_Page [L,QSA]
-RewriteRule ^wiki/(.+)$ oldwiki/index.php?title=$1 [L,QSA]