Browse code

Fix merge conflicts in sidenav

hiromipaw authored on23/01/2018 11:33:17
Showing5 changed files
... ...
@@ -101,12 +101,21 @@
101 101
     
102 102
 	<a id="security"></a>
103 103
 	<h3><a class="anchor" href="#security">Security Issues</a></h3>
104
-	<p>If you've found a security issue in one of our projects or our
105
-	infrastructure, please email the respective maintainer. You can find
106
-	their GPG fingerprint/key on our <a
107
-	href="https://db.torproject.org">developer ldap search page</a>. Due
108
-	to the many different projects we have, we do not offer a single
109
-	list for security issues.</p>
104
+	<p>If you've found a security issue in one of our projects or in our
105
+	infrastructure, please email tor-security@lists.torproject.org. 
106
+	You can get the GPG public key for the list by contacting 
107
+	tor-security-sendkey@lists.torproject.org or from 
108
+	pool.sks-keyservers.net. Here is the fingerprint:
109
+	<blockquote><pre>
110
+	gpg --fingerprint tor-security@lists.torproject.org
111
+	pub   4096R/1A7BF184 2017-03-13
112
+	      Key fingerprint = 8B90 4624 C5A2 8654 E453  9BC2 E135 A8B4 1A7B F184
113
+	uid                  tor-security@lists.torproject.org <tor-security@lists.torproject.org>
114
+	uid                  tor-security@lists.torproject.org <tor-security-owner@lists.torproject.org>
115
+	uid                  tor-security@lists.torproject.org <tor-security-request@lists.torproject.org>
116
+	sub   4096R/C00942E4 2017-03-13
117
+	</pre></blockquote>
118
+	</p>
110 119
 
111 120
 	<a id="badrelays"></a>
112 121
 	<h3><a class="anchor" href="#badrelays">Report Bad Relays</a></h3>
113 122
deleted file mode 100644
... ...
@@ -1,39 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 2-medium
4
-
5
-#include "head.wmi" TITLE="Tor Project: OpenBSD Install Instructions" CHARSET="UTF-8"
6
-<div id="content" class="clearfix">
7
-  <div id="breadcrumbs">
8
-    <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page docs/documentation>">Documentation &raquo; </a>
10
-    <a href="<page docs/tor-doc-osx>">OpenBSD Client</a>
11
-  </div>
12
-  <div id="maincol">
13
-    <h1>Running Tor on OpenBSD</h1>
14
-    <br>
15
-
16
-    <h2>These are advanced installation instructions for running
17
-    Tor in a OpenBSD environment.
18
-    </h2>
19
-
20
-    <p>To install from OpenBSD's packages, run:</p>
21
-
22
-
23
-    <pre>pkg_add tor-browser</pre>
24
-
25
-   
26
-    <p>To install the Tor Browser port from an updated ports tree, run:</p>
27
-
28
-    <pre>cd /usr/ports/meta/tor-browser && make install</pre>
29
-
30
-  </div>
31
-  <!-- END MAINCOL -->
32
-  <div id = "sidecol">
33
-#include "side.wmi"
34
-#include "info.wmi"
35
-  </div>
36
-  <!-- END SIDECOL -->
37
-</div>
38
-<!-- END CONTENT -->
39
-#include <foot.wmi>
... ...
@@ -39,9 +39,9 @@
39 39
           {'url'  => 'docs/debian',
40 40
            'txt'  => 'Installing Tor on Debian/Ubuntu',
41 41
           },
42
-	  {'url'  => 'docs/openbsd',
43
-	   'txt'  => 'Installing Tor on OpenBSD',
44
-	  },
42
+          {'url'  => 'docs/rpms',
43
+           'txt'  => 'Installing Tor on Fedora/CentOS',
44
+          },
45 45
           {'url'  => 'docs/tor-doc-unix',
46 46
            'txt'  => 'Installing Tor Source',
47 47
           },
... ...
@@ -119,6 +119,25 @@
119 119
 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
120 120
 	</div>
121 121
       </div>
122
+<!-- START BSD -->
123
+
124
+  <div id="openbsd" class="easy bsd">
125
+    <div class="package" style="padding-top: 13px; border-top: 0px;">
126
+      <div class="desc">
127
+        <h2>Running Tor on OpenBSD</h2>
128
+	<p>These are installation instructions for running Tor Browser in a OpenBSD environment.</p>
129
+	<p>To install from OpenBSD's packages, run:</p>
130
+
131
+
132
+        <pre>pkg_add tor-browser</pre>
133
+
134
+   
135
+        <p>To install the Tor Browser port from an updated ports tree, run:</p>
136
+
137
+        <pre>cd /usr/ports/meta/tor-browser && make install</pre>
138
+      </div>
139
+    </div>
140
+  </div>
122 141
 <!-- START Orbot -->
123 142
       <div id="android" class="easy android">
124 143
     <div class="package" style="padding-top: 13px; border-top: 0px;">
... ...
@@ -268,6 +287,7 @@ are blocked.</p>
268 287
 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
269 288
 <li class="dropdown"><a href="#mac">Apple OS X</a></li>
270 289
 <li class="dropdown"><a href="#linux">Linux</a></li>
290
+<li class="dropdown"><a href="#openbsd">OpenBSD</a></li>
271 291
 <li class="dropdown"><a href="#android">Android</a></li>
272 292
 <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
273 293
 </ul>
... ...
@@ -16,7 +16,7 @@ function OScheck() {
16 16
   }else if(clientos == "Windows"){
17 17
     $('.easy.windows').css('display', 'block');
18 18
   }else if(clientos == "Mac"){
19
-    $('.easy.mac').css('display', 'block');
19
+      $('.easy.mac').css('display', 'block');
20 20
   }else if(clientos == "Android"){
21 21
     $('.easy.android').css('display', 'block');
22 22
   }else{
... ...
@@ -92,7 +92,7 @@ $(document).ready(function () {
92 92
       var url = $.param.fragment();
93 93
 
94 94
       // Toggle the '.easy' divs to off
95
-      if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'android'){
95
+      if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'openbsd'|url == 'android'){
96 96
 
97 97
 	  $('.easy').css('display', 'none');
98 98
       }
... ...
@@ -102,7 +102,9 @@ $(document).ready(function () {
102 102
       } else if(url == 'mac'){
103 103
 	$('.easy.mac').css('display', 'block');
104 104
       } else if(url == 'linux'){
105
-	$('.easy.linux').css('display', 'block');
105
+	  $('.easy.linux').css('display', 'block');
106
+      } else if(url == 'openbsd'){
107
+	$('.easy.bsd').css('display', 'block');
106 108
       } else if(url == 'android'){
107 109
   $('.easy.android').css('display', 'block');
108 110
       } else {