Browse code

Merge branch 'master' of git-rw.torproject.org:project/web/webwml into add-tor-security-list-info-to-contact

hiromipaw authored on22/01/2018 21:50:09
Showing7 changed files
... ...
@@ -75,9 +75,9 @@ I run
75 75
 <option value="stretch" selected="selected">Debian stable (stretch)</option>
76 76
 <option value="testing">Debian testing (buster)</option>
77 77
 <option value="sid">Debian unstable (sid)</option>
78
-<option value="precise">Ubuntu Precise Pangolin</option>
79 78
 <option value="trusty">Ubuntu Trusty Tahr</option>
80 79
 <option value="xenial">Ubuntu Xenial Xerus</option>
80
+<option value="zesty">Ubuntu Zesty Zapus</option>
81 81
 </select>
82 82
 and want
83 83
 <select id="package"></select>
84 84
new file mode 100644
... ...
@@ -0,0 +1,39 @@
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,6 +39,9 @@
39 39
           {'url'  => 'docs/rpms',
40 40
            'txt'  => 'Installing Tor on Fedora/CentOS',
41 41
           },
42
+	  {'url'  => 'docs/openbsd',
43
+	   'txt'  => 'Installing Tor on OpenBSD',
44
+	  },
42 45
           {'url'  => 'docs/tor-doc-unix',
43 46
            'txt'  => 'Installing Tor Source',
44 47
           },
... ...
@@ -2,15 +2,15 @@
2 2
 # Revision: $Revision$
3 3
 # Translation-Priority: 3-low
4 4
 
5
-#include "head.wmi" TITLE="Tor: Linux/BSD/Unix Install Instructions" CHARSET="UTF-8"
5
+#include "head.wmi" TITLE="Tor: Linux Install Instructions" CHARSET="UTF-8"
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9 9
     <a href="<page docs/documentation>">Documentation &raquo; </a>
10
-    <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix Client</a>
10
+    <a href="<page docs/tor-doc-unix>">Linux Client</a>
11 11
   </div> 
12 12
   <div id="maincol"> 
13
-    <h1>Running the <a href="<page index>">Tor</a> client on Linux/BSD/Unix</h1>
13
+    <h1>Running the <a href="<page index>">Tor</a> client on Linux</h1>
14 14
     <br>
15 15
     
16 16
     <h2>Note that these are the installation instructions for running a
... ...
@@ -31,7 +31,7 @@ form#makeDonation {
31 31
    <div class="hundred toptwenty">
32 32
     <div class="dbox donate">
33 33
     <h3>Donate Bitcoin</h3>
34
-<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipprbot">@tipprbot</a> on Twitter!)</p>
34
+<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 5 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipprbot">@tipprbot</a> on Twitter!)</p>
35 35
   <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));">
36 36
         <input name="action" type="hidden" value="checkout">
37 37
         <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;">
... ...
@@ -42,7 +42,7 @@ form#makeDonation {
42 42
             </li>
43 43
             <li id="price" class="control-group">
44 44
                 <label class="control-label" style="width: 80px">Amount:</label>
45
-                <input name="price" type="number" class="noscroll" value="100.00" placeholder="Amount" maxlength="10" min="100" step="0.01" />
45
+                <input name="price" type="number" class="noscroll" value="20" placeholder="Amount" maxlength="10" min="1" step="0.01" />
46 46
                 <select name="currency" value="" >
47 47
                   <option value="USD" selected="selected">USD</option>
48 48
                   <option value="BTC">BTC</option>
... ...
@@ -14,7 +14,7 @@
14 14
     <hr>
15 15
 
16 16
     <p>You can get one of these fine Tor T-shirts for contributing to the
17
-    Tor project. There are three primary ways of contributing:</p>
17
+    Tor project. There are two primary ways of contributing:</p>
18 18
 
19 19
     <ol>
20 20
     <li>Operate a fast <a href="<page docs/tor-doc-relay>">Tor relay</a>
... ...
@@ -50,6 +50,18 @@ some of the significant Tor-related stories that have popped up.</p>
50 50
 </tr>
51 51
 </thead>
52 52
 
53
+<tr style="background-color: #e5e5e5;">
54
+<td>2017 Dec 10</td>
55
+<td>BoingBoing</td>
56
+<td><a href="https://boingboing.net/2017/12/10/charitable-giving-guide-2017.html">Charitable Giving Guide 2017</a></td>
57
+</tr>
58
+
59
+<tr style="">
60
+<td>2017 Dec 9</td>
61
+<td>WIRED</td>
62
+<td><a href="https://www.wired.com/story/the-grand-tor">The Grand Tor: How to Go Anonymous Online</a></td>
63
+</tr>
64
+
53 65
 <tr style="background-color: #e5e5e5;">
54 66
 <td>2017 Nov 20</td>
55 67
 <td>Bleeping Computer</td>