[tor-commits] [webwml/staging] removing 404 page and restoring htaccess

Sat Jul 1 08:34:27 UTC 2017

commit 2781bc91d0aafbcc0f11025b51fdb2af770102c7
Author: hiromipaw <hiro at torproject.org>
Date:   Sat Jul 1 10:34:22 2017 +0200

    removing 404 page and restoring htaccess
---
 .htaccess  |  2 +-
 en/404.wml | 54 ------------------------------------------------------
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/.htaccess b/.htaccess
index 8b3fd56..ced8f1f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,6 @@
 RewriteEngine On
 
-ErrorDocument 404 /404
+#ErrorDocument 404 /404
 
 # moved to /docs/
 RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
diff --git a/en/404.wml b/en/404.wml
deleted file mode 100644
index 0f396e7..0000000
--- a/en/404.wml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
- <html>
- <head>
-
-   <meta charset="utf-8">
-   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-   <meta name="viewport" content="width=device-width, initial-scale=1">
-   <meta name="author" content="The Tor Project, Inc.">
-   <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor at torproject.org] for help downloading Tor Browser.">
-   <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser">
-   <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
-{#meta#}
-
-   <title>$(TITLE)</title>
-
-   <link rel="icon" href="$(IMGROOT)/favicon.ico">
-   <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
-   <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
-
-   # begin WML to generate css/js paths
-   <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">">
-   <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">">
-
-   #<link href="css/master.css" rel="stylesheet">
-   <!--[if lte IE 8]>
-   <link href="$(DOCROOT)/css/ie8-and-down.css" rel="stylesheet">
-   <![endif]-->
-   <!--[if lte IE 7]>
-   <link href="$(DOCROOT)/css/ie7-and-down.css" rel="stylesheet">
-   <![endif]-->
-   <!--[if IE 6]>
-   <link href="$(DOCROOT)/css/ie6.css" rel="stylesheet">
-   <![endif]-->
- #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
-   # end WML to generate css/js paths
-</head>
-<body>
-<div id="wrap">
-  <div id="header">
-    <h1 id="logo"><a href="<page index>">Tor</a></h1>
-  </div>
-</div>
-<p>The requested URL was not found at this server.</p>
-<div id="banner">
-
-  <p class="desc">Are you looking to download Tor and ended up here instead?</p>
-
-<div id="download">
-<a href="<page download/download-easy>">
-  <span class="download-tor">Download Tor</span></a>
-</div>
-</div>
-</body>
-</html>

