commit c30e712010d970ec3364c2a7dba0785bbcf2debe
Author: hiromipaw <hiro(a)torproject.org>
Date: Mon Jan 22 22:56:34 2018 +0100
Remove openbsd from install Tor instruction add to download easy en
---
docs/en/openbsd.wml | 39 ---------------------------------------
docs/en/sidenav.wmi | 3 ---
download/en/download-easy.wml | 20 ++++++++++++++++++++
js/dlpage01.js | 8 +++++---
4 files changed, 25 insertions(+), 45 deletions(-)
diff --git a/docs/en/openbsd.wml b/docs/en/openbsd.wml
deleted file mode 100644
index 2e3bdc12..00000000
--- a/docs/en/openbsd.wml
+++ /dev/null
@@ -1,39 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 2-medium
-
-#include "head.wmi" TITLE="Tor Project: OpenBSD Install Instructions" CHARSET="UTF-8"
-<div id="content" class="clearfix">
- <div id="breadcrumbs">
- <a href="<page index>">Home » </a>
- <a href="<page docs/documentation>">Documentation » </a>
- <a href="<page docs/tor-doc-osx>">OpenBSD Client</a>
- </div>
- <div id="maincol">
- <h1>Running Tor on OpenBSD</h1>
- <br>
-
- <h2>These are advanced installation instructions for running
- Tor in a OpenBSD environment.
- </h2>
-
- <p>To install from OpenBSD's packages, run:</p>
-
-
- <pre>pkg_add tor-browser</pre>
-
-
- <p>To install the Tor Browser port from an updated ports tree, run:</p>
-
- <pre>cd /usr/ports/meta/tor-browser && make install</pre>
-
- </div>
- <!-- END MAINCOL -->
- <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
- </div>
- <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>
diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi
index 3b7b08dd..926a3141 100644
--- a/docs/en/sidenav.wmi
+++ b/docs/en/sidenav.wmi
@@ -39,9 +39,6 @@
{'url' => 'docs/rpms',
'txt' => 'Installing Tor on Fedora/CentOS',
},
- {'url' => 'docs/openbsd',
- 'txt' => 'Installing Tor on OpenBSD',
- },
{'url' => 'docs/tor-doc-unix',
'txt' => 'Installing Tor Source',
},
diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 8ba1d00e..62d9d205 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -119,6 +119,25 @@
<p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
</div>
</div>
+<!-- START BSD -->
+
+ <div id="openbsd" class="easy bsd">
+ <div class="package" style="padding-top: 13px; border-top: 0px;">
+ <div class="desc">
+ <h2>Running Tor on OpenBSD</h2>
+ <p>These are installation instructions for running Tor Browser in a OpenBSD environment.</p>
+ <p>To install from OpenBSD's packages, run:</p>
+
+
+ <pre>pkg_add tor-browser</pre>
+
+
+ <p>To install the Tor Browser port from an updated ports tree, run:</p>
+
+ <pre>cd /usr/ports/meta/tor-browser && make install</pre>
+ </div>
+ </div>
+ </div>
<!-- START Orbot -->
<div id="android" class="easy android">
<div class="package" style="padding-top: 13px; border-top: 0px;">
@@ -268,6 +287,7 @@ are blocked.</p>
<li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
<li class="dropdown"><a href="#mac">Apple OS X</a></li>
<li class="dropdown"><a href="#linux">Linux</a></li>
+<li class="dropdown"><a href="#openbsd">OpenBSD</a></li>
<li class="dropdown"><a href="#android">Android</a></li>
<li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
</ul>
diff --git a/js/dlpage01.js b/js/dlpage01.js
index d2ba4dc8..f95e5ae7 100644
--- a/js/dlpage01.js
+++ b/js/dlpage01.js
@@ -16,7 +16,7 @@ function OScheck() {
}else if(clientos == "Windows"){
$('.easy.windows').css('display', 'block');
}else if(clientos == "Mac"){
- $('.easy.mac').css('display', 'block');
+ $('.easy.mac').css('display', 'block');
}else if(clientos == "Android"){
$('.easy.android').css('display', 'block');
}else{
@@ -92,7 +92,7 @@ $(document).ready(function () {
var url = $.param.fragment();
// Toggle the '.easy' divs to off
- if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'android'){
+ if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'openbsd'|url == 'android'){
$('.easy').css('display', 'none');
}
@@ -102,7 +102,9 @@ $(document).ready(function () {
} else if(url == 'mac'){
$('.easy.mac').css('display', 'block');
} else if(url == 'linux'){
- $('.easy.linux').css('display', 'block');
+ $('.easy.linux').css('display', 'block');
+ } else if(url == 'openbsd'){
+ $('.easy.bsd').css('display', 'block');
} else if(url == 'android'){
$('.easy.android').css('display', 'block');
} else {