Renaming web server to www.privoxy.org (from privoxy.org)

diff --git a/doc/webserver/.htaccess b/doc/webserver/.htaccess
index 0ecf688..e2c3e3d 100644 (file)
--- a/doc/webserver/.htaccess
+++ b/doc/webserver/.htaccess
@@ -6,10 +6,10 @@
 #    http://ijbswa.sourceforge.net/
 #    http://privoxy.com/
 #    http://www.privoxy.com/
-#    http://www.privoxy.org/
+#    http://privoxy.org/
 #
 # And redirects all requests to the canonical web server:
-#    http://privoxy.org/
+#    http://www.privoxy.org/
 #
 #
 # Uses Apache's mod_rewrite
@@ -20,7 +20,7 @@
 RewriteEngine on
 
 
-RewriteCond %{HTTP_HOST}   !^privoxy\.org\.?$ [NC]
+RewriteCond %{HTTP_HOST}   !^www\.privoxy\.org\.?$ [NC]
 RewriteCond %{HTTP_HOST}   !^$
-RewriteRule ^(.*)$         http://privoxy.org/$1 [R,L]
+RewriteRule ^(.*)$         http://www\.privoxy.org/$1 [R,L]
 

diff --git a/doc/webserver/config/.htaccess b/doc/webserver/config/.htaccess
index 0a2bfbf..f7d165f 100644 (file)
--- a/doc/webserver/config/.htaccess
+++ b/doc/webserver/config/.htaccess
@@ -4,7 +4,7 @@
 #
 # Redirects any request for any file in this directory tree
 # to an error page.  The error page is reached through the
-# URL http://privoxy.org/config/ and is actually in
+# URL http://www.privoxy.org/config/ and is actually in
 # the file index.php
 #
 # Uses Apache's mod_rewrite
@@ -18,17 +18,17 @@ RewriteEngine on
 RewriteBase   /config/
 
 # The only file which really exists is index.php - allow this
-RewriteCond %{HTTP_HOST}   ^privoxy\.org\.?$ [NC,OR]
+RewriteCond %{HTTP_HOST}   ^www\.privoxy\.org\.?$ [NC,OR]
 RewriteCond %{HTTP_HOST}   ^$
 RewriteRule  index.php - [L]
 
 # Silently redirect the config dir to index.php
-RewriteCond %{HTTP_HOST}   ^privoxy\.org\.?$ [NC,OR]
+RewriteCond %{HTTP_HOST}   ^www\.privoxy\.org\.?$ [NC,OR]
 RewriteCond %{HTTP_HOST}   ^$
 RewriteRule  ^$      index.php [L]
 
 # anything else gets redirected to the config dir, and we update
 # the browser's location bar.
-RewriteRule  ^(.*)$  http://privoxy.org/config/  [R,L]
+RewriteRule  ^(.*)$  http://www.privoxy.org/config/  [R,L]