summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain R. Learmonth <irl@fsfe.org>2019-04-02 14:08:02 +0100
committerArlo Breault <arlolra@gmail.com>2019-04-08 12:31:06 -0400
commit513656ea359765191a1757a8fd7a776868c4a935 (patch)
tree335c9db60923a6b5366650af4a93c3a531ebf8c9
parentc6a82190f970a6598541d1fbd1422c9ef16fc4fe (diff)
Updates URLs for new Tor Project website
Fixes: #29983
-rw-r--r--public/base.html4
-rw-r--r--public/index.html13
2 files changed, 7 insertions, 10 deletions
diff --git a/public/base.html b/public/base.html
index 2f9facc..902ede2 100644
--- a/public/base.html
+++ b/public/base.html
@@ -50,8 +50,8 @@
{{ template "body" . }}
</div>
<div class="foot">
- <p class="project">{{ GetText .Lang "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy." }} <a href="https://www.torproject.org/about/overview.html.en">{{ GetText .Lang "Learn More &raquo;" | UnEscaped }}</a></p>
+ <p class="project">{{ GetText .Lang "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy." }} <a href="https://www.torproject.org/about/history/">{{ GetText .Lang "Learn More &raquo;" | UnEscaped }}</a></p>
{{ template "foot" . }}
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/public/index.html b/public/index.html
index 73a79b5..84f7c81 100644
--- a/public/index.html
+++ b/public/index.html
@@ -89,13 +89,13 @@
{{ if .NotUpToDate }}
<p class="security">
{{ GetText .Lang "There is a security update available for Tor Browser." }}<br />
- {{ GetText .Lang "<a href=\"https://www.torproject.org/download/download-easy.html\">Click here to go to the download page</a>" | UnEscaped }}
+ {{ GetText .Lang "<a href=\"https://www.torproject.org/download/\">Click here to go to the download page</a>" | UnEscaped }}
</p>
{{ else }}
{{ if .NotTBB }}
<p class="security">
{{ GetText .Lang "However, it does not appear to be Tor Browser." }}<br />
- {{ GetText .Lang "<a href=\"https://www.torproject.org/download/download-easy.html\">Click here to go to the download page</a>" | UnEscaped }}
+ {{ GetText .Lang "<a href=\"https://www.torproject.org/download/\">Click here to go to the download page</a>" | UnEscaped }}
</p>
{{ end }}
{{ end }}
@@ -104,14 +104,11 @@
{{ if .IsTor }}
{{ GetText .Lang "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously." | UnEscaped }} {{ GetText .Lang "For more information about this exit relay, see:" }} <a href="https://metrics.torproject.org/rs.html#search/{{ .IP }}">Relay Search</a>.
{{ else }}
- {{ GetText .Lang "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for configuring your Tor client</a>." | UnEscaped }}
+ {{ GetText .Lang "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://support.torproject.org/#faq\">frequently asked questions</a>." | UnEscaped }}
{{ end }}
</p>
- <a id="donate" href="https://www.torproject.org/donate/donate.html">{{ GetText .Lang "Donate to Support Tor" }}</a>
+ <a id="donate" href="https://donate.torproject.org/">{{ GetText .Lang "Donate to Support Tor" }}</a>
<ul id="links">
- <!-- <li>
- <a href="https://torproject.org/dist/manual/short-user-manual_{{ UserManual .Lang }}.xhtml">{{ GetText .Lang "Short User Manual" }}</a>
- </li> -->
<li>
<a href="https://tor.stackexchange.com/">{{ GetText .Lang "Tor Q&A Site" }}</a>
</li>
@@ -131,7 +128,7 @@
<script>
// javascript enabled?
var a = document.createElement("a");
- a.href = "https://www.torproject.org/docs/faq#TBBJavaScriptEnabled";
+ a.href = "https://support.torproject.org/#tbb-34";
var c = document.createTextNode("{{ GetText .Lang "JavaScript is enabled." }}");
a.appendChild(c);
document.getElementById("js").appendChild(a);