Browse code

move manpages to docs, move torbutton to docs, update rewrite rules for new paths.

Andrew Lewman authored on 24/04/2014 16:39:20
Showing 1 changed files
1 1
deleted file mode 100644
... ...
@@ -1,129 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 3-low
4
-
5
-#include "head.wmi" TITLE="Tor Project: Torbutton" 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 torbutton/index>">Torbutton</a>
10
-  </div>
11
-	<div id="maincol"> 
12
-    <!-- PUT CONTENT AFTER THIS TAG -->
13
-    
14
-    <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>
15
-    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/>
16
-    <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>
17
-    <script type="text/javascript">
18
-    
19
-    function addSearchProvider(prov) {
20
-    
21
-    try {
22
-    window.external.AddSearchProvider(prov);
23
-    }
24
-    
25
-    catch (e) {
26
-    alert("Search plugins require Firefox 2");
27
-    return;
28
-    }
29
-    }
30
-    
31
-    function addEngine(name,ext,cat,pid)
32
-    {
33
-      if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) {
34
-        window.sidebar.addSearchEngine(
35
-          "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + ".src",
36
-          "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + "."+ ext, name, cat );
37
-      } else {
38
-        alert("You will need a browser which supports Sherlock to install this plugin.");
39
-      }
40
-    }
41
-    
42
-    function addOpenSearch(name,ext,cat,pid,meth)
43
-    {
44
-      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
45
-        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
46
-          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
47
-        } else {
48
-          window.external.AddSearchProvider(
49
-            "http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml");
50
-        }
51
-      } else {
52
-        alert("You will need a browser which supports OpenSearch to install this plugin.");
53
-      }
54
-    }
55
-    
56
-    function addOpenSearch2(name,ext,cat,pid,meth)
57
-    {
58
-      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
59
-        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
60
-          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
61
-        } else {
62
-          window.external.AddSearchProvider(
63
-            "http://torbutton.torproject.org/dev/search/" + name + ".xml");
64
-        }
65
-      } else {
66
-        alert("You will need a browser which supports OpenSearch to install this plugin.");
67
-      }
68
-    }
69
-    
70
-    function install (aEvent)
71
-    {
72
-      var params = {
73
-        "Torbutton": { URL: aEvent.target.href,
74
-                 Hash: aEvent.target.getAttribute("hash"),
75
-                 toString: function () { return this.URL; }
76
-        }
77
-      };
78
-      InstallTrigger.install(params);
79
-    
80
-      return false;
81
-    }
82
-    
83
-    
84
-    </script>
85
-    
86
-    <h2>Torbutton</h2>
87
-    <hr>
88
-
89
-    <p>
90
-    Torbutton is the component in <a href="<page projects/torbrowser>">Tor
91
-    Browser Bundle</a> that takes care of application-level
92
-    security and privacy concerns in Firefox.  To keep you safe,
93
-    Torbutton disables many types of active content.
94
-    </p>
95
-
96
-    <p>
97
-    Now that the <a href="<page projects/torbrowser>">Tor Browser
98
-    Bundle</a> includes a patched version of Firefox, and because we don't
99
-    have enough developer resources to keep up with the accelerated
100
-    Firefox release schedule, the toggle model of Torbutton is <a
101
-    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
102
-    longer supported</a>. <b>Users should be using Tor Browser Bundle,
103
-    not installing Torbutton themselves.</b>
104
-    </p>
105
-
106
-    <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
107
-
108
-    <strong>Source:</strong> You can <a
109
-    href="https://gitweb.torproject.org/torbutton.git">browse the
110
-    repository</a> or simply unzip the xpi.
111
-    <br/>
112
-    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>
113
-    <strong>Documents:</strong> 
114
-    <b>[</b> 
115
-    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> <b>|</b>
116
-    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> <b>|</b>
117
-    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b>
118
-    
119
-  </div>
120
-  <!-- END MAINCOL -->
121
-  <div id = "sidecol">
122
-#include "side.wmi"
123
-#include "info.wmi"
124
-  </div>
125
-  <!-- END SIDECOL -->
126
-</div>
127
-<!-- END CONTENT -->
128
-#include <foot.wmi>
129
-
Browse code

removed torbutton pages, moved 2 questions to general FAQ (#6567)

Moritz Bartl authored on 26/03/2013 05:38:32
Showing 1 changed files
... ...
@@ -99,37 +99,10 @@
99 99
     have enough developer resources to keep up with the accelerated
100 100
     Firefox release schedule, the toggle model of Torbutton is <a
101 101
     href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
102
-    longer recommended</a>. <b>Users should be using Tor Browser Bundle,
102
+    longer supported</a>. <b>Users should be using Tor Browser Bundle,
103 103
     not installing Torbutton themselves.</b>
104 104
     </p>
105 105
 
106
-    <br/><br/>
107
-    <strong>Current stable version:</strong><version-torbutton><br/>
108
-    <strong>Current alpha version:</strong><version-torbutton-alpha><br/>
109
-    <br/>
110
-    <strong>Maintainer:</strong> Mike Perry<br/>
111
-    <br/>
112
-    <strong>Expert Install (Stable):</strong> Click to <a
113
-    href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"
114
-    hash="<version-hash-torbutton>" onclick="return
115
-    install(event);">install from this website</a>. Verify the <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi.asc">signature</a>.<br/>
116
-<!--
117
-    <strong>Expert Install (Alpha):</strong> Click to 
118
-    <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"
119
-      hash="<version-hash-torbutton-alpha>"
120
-      onclick="return install(event);">install from this website</a>
121
-    <br/>
122
-  -->
123
-<!--
124
-   <strong>English Google Search:</strong> 
125
-    Google search plugins for
126
-    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
127
-     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 
128
-    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
129
-     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
130
-    <br/>
131
-  -->
132
-    <strong>Past Releases:</strong> <a href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor Archive</a><br/>
133 106
     <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
134 107
 
135 108
     <strong>Source:</strong> You can <a
... ...
@@ -137,8 +110,8 @@
137 110
     repository</a> or simply unzip the xpi.
138 111
     <br/>
139 112
     <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>
140
-    <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>
141
-    <a href="<page torbutton/torbutton-options>">Torbutton options</a> <b>|</b>
113
+    <strong>Documents:</strong> 
114
+    <b>[</b> 
142 115
     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> <b>|</b>
143 116
     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> <b>|</b>
144 117
     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b>
Browse code

Remove the ANNOUNCE_RSS hack as per ticket 4951

Sebastian Hahn authored on 25/01/2012 00:54:07
Showing 1 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 # Revision: $Revision$
3 3
 # Translation-Priority: 3-low
4 4
 
5
-#include "head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
5
+#include "head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8"
6 6
 <div id="content" class="clearfix">
7 7
 	<div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
Browse code

make it much more obvious that the torbutton page isn't for users

Roger Dingledine authored on 12/11/2011 23:39:58
Showing 1 changed files
... ...
@@ -85,23 +85,42 @@
85 85
     
86 86
     <h2>Torbutton</h2>
87 87
     <hr>
88
-    
88
+
89
+    <p>
90
+    Torbutton is the component in <a href="<page projects/torbrowser>">Tor
91
+    Browser Bundle</a> that takes care of application-level
92
+    security and privacy concerns in Firefox.  To keep you safe,
93
+    Torbutton disables many types of active content.
94
+    </p>
95
+
96
+    <p>
97
+    Now that the <a href="<page projects/torbrowser>">Tor Browser
98
+    Bundle</a> includes a patched version of Firefox, and because we don't
99
+    have enough developer resources to keep up with the accelerated
100
+    Firefox release schedule, the toggle model of Torbutton is <a
101
+    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
102
+    longer recommended</a>. <b>Users should be using Tor Browser Bundle,
103
+    not installing Torbutton themselves.</b>
104
+    </p>
105
+
106
+    <br/><br/>
89 107
     <strong>Current stable version:</strong><version-torbutton><br/>
90 108
     <strong>Current alpha version:</strong><version-torbutton-alpha><br/>
91 109
     <br/>
92 110
     <strong>Maintainer:</strong> Mike Perry<br/>
93 111
     <br/>
94
-    <strong>Install Stable:</strong> Click to <a
112
+    <strong>Expert Install (Stable):</strong> Click to <a
95 113
     href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"
96 114
     hash="<version-hash-torbutton>" onclick="return
97 115
     install(event);">install from this website</a>. Verify the <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi.asc">signature</a>.<br/>
98 116
 <!--
99
-    <strong>Install Alpha:</strong> Click to 
117
+    <strong>Expert Install (Alpha):</strong> Click to 
100 118
     <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"
101 119
       hash="<version-hash-torbutton-alpha>"
102 120
       onclick="return install(event);">install from this website</a>
103 121
     <br/>
104 122
   -->
123
+<!--
105 124
    <strong>English Google Search:</strong> 
106 125
     Google search plugins for
107 126
     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
... ...
@@ -109,8 +128,8 @@
109 128
     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
110 129
      onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
111 130
     <br/>
131
+  -->
112 132
     <strong>Past Releases:</strong> <a href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor Archive</a><br/>
113
-    <br/>
114 133
     <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
115 134
 
116 135
     <strong>Source:</strong> You can <a
... ...
@@ -119,47 +138,11 @@
119 138
     <br/>
120 139
     <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>
121 140
     <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>
141
+    <a href="<page torbutton/torbutton-options>">Torbutton options</a> <b>|</b>
122 142
     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> <b>|</b>
123 143
     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> <b>|</b>
124
-    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b><br/>
144
+    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b>
125 145
     
126
-    <br/>
127
-    
128
-    <p>
129
-    Torbutton is the component in <a href="<page projects/torbrowser>">Tor
130
-    Browser Bundle</a> that takes care of application-level security
131
-    and privacy concerns in Firefox.  To keep you safe, Torbutton
132
-    disables many types of active content. You can learn more from
133
-    the <a href="en/design/index.html.en">Design Document</a>, the <a
134
-    href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>, or read more
135
-    details in the <a href="<page torbutton/torbutton-options>">Torbutton
136
-    options</a> list.
137
-    </p>
138
-
139
-    <p>
140
-    Some users may prefer a toolbar button instead of a statusbar panel.
141
-    Torbutton lets you add a toolbar button by right-clicking
142
-    on the desired toolbar, selecting "Customize...", and then dragging the
143
-    Torbutton icon onto the toolbar.  There is an option in the preferences
144
-    to hide the statusbar panel (Tools-&gt;Extensions, select Torbutton,
145
-    and click on Preferences).
146
-    </p>
147
-
148
-    <p>
149
-    Originally Torbutton was a 1-click way for Firefox users to enable or disable
150
-    the browser's use of <a href="<page index>">Tor</a>.
151
-    (It adds a panel to the statusbar that says "Tor Enabled" (in green) or
152
-    "Tor Disabled" (in red).  The user may click on the panel to toggle
153
-    the status.  If the user (or some other extension) changes the proxy
154
-    settings, the change is automatically reflected in the statusbar.) But
155
-    now that the <a href="<page projects/torbrowser>">Tor Browser
156
-    Bundle</a> includes a patched version of Firefox, and because we don't
157
-    have enough developer resources to keep up with the accelerated
158
-    Firefox release schedule, the toggle model of Torbutton is <a
159
-    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
160
-    longer recommended</a>.
161
-    </p>
162
-
163 146
   </div>
164 147
   <!-- END MAINCOL -->
165 148
   <div id = "sidecol">
Browse code

make the 'no longer recommended' part a bit more obvious

Roger Dingledine authored on 12/11/2011 22:56:42
Showing 1 changed files
... ...
@@ -136,6 +136,15 @@
136 136
     options</a> list.
137 137
     </p>
138 138
 
139
+    <p>
140
+    Some users may prefer a toolbar button instead of a statusbar panel.
141
+    Torbutton lets you add a toolbar button by right-clicking
142
+    on the desired toolbar, selecting "Customize...", and then dragging the
143
+    Torbutton icon onto the toolbar.  There is an option in the preferences
144
+    to hide the statusbar panel (Tools-&gt;Extensions, select Torbutton,
145
+    and click on Preferences).
146
+    </p>
147
+
139 148
     <p>
140 149
     Originally Torbutton was a 1-click way for Firefox users to enable or disable
141 150
     the browser's use of <a href="<page index>">Tor</a>.
... ...
@@ -151,14 +160,6 @@
151 160
     longer recommended</a>.
152 161
     </p>
153 162
 
154
-    <p>
155
-    Some users may prefer a toolbar button instead of a statusbar panel.
156
-    Torbutton lets you add a toolbar button by right-clicking
157
-    on the desired toolbar, selecting "Customize...", and then dragging the
158
-    Torbutton icon onto the toolbar.  There is an option in the preferences
159
-    to hide the statusbar panel (Tools-&gt;Extensions, select Torbutton,
160
-    and click on Preferences).
161
-    </p>
162 163
   </div>
163 164
   <!-- END MAINCOL -->
164 165
   <div id = "sidecol">
Browse code

tell people that the torbutton toggle model is no longer recommended

Roger Dingledine authored on 12/11/2011 22:50:30
Showing 1 changed files
... ...
@@ -126,21 +126,31 @@
126 126
     <br/>
127 127
     
128 128
     <p>
129
-    Torbutton is a 1-click way for Firefox users to enable or disable
129
+    Torbutton is the component in <a href="<page projects/torbrowser>">Tor
130
+    Browser Bundle</a> that takes care of application-level security
131
+    and privacy concerns in Firefox.  To keep you safe, Torbutton
132
+    disables many types of active content. You can learn more from
133
+    the <a href="en/design/index.html.en">Design Document</a>, the <a
134
+    href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>, or read more
135
+    details in the <a href="<page torbutton/torbutton-options>">Torbutton
136
+    options</a> list.
137
+    </p>
138
+
139
+    <p>
140
+    Originally Torbutton was a 1-click way for Firefox users to enable or disable
130 141
     the browser's use of <a href="<page index>">Tor</a>.
131
-    It adds a panel to the statusbar that says "Tor Enabled" (in green) or
142
+    (It adds a panel to the statusbar that says "Tor Enabled" (in green) or
132 143
     "Tor Disabled" (in red).  The user may click on the panel to toggle
133 144
     the status.  If the user (or some other extension) changes the proxy
134
-    settings, the change is automatically reflected in the statusbar.
145
+    settings, the change is automatically reflected in the statusbar.) But
146
+    now that the <a href="<page projects/torbrowser>">Tor Browser
147
+    Bundle</a> includes a patched version of Firefox, and because we don't
148
+    have enough developer resources to keep up with the accelerated
149
+    Firefox release schedule, the toggle model of Torbutton is <a
150
+    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
151
+    longer recommended</a>.
135 152
     </p>
136
-    
137
-    <p>
138
-    To keep you safe, Torbutton disables many types of active content. You
139
-    can learn more from the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>,
140
-    or read more details in the <a href="<page torbutton/torbutton-options>">Torbutton
141
-    options</a> list.
142
-    </p>
143
-    
153
+
144 154
     <p>
145 155
     Some users may prefer a toolbar button instead of a statusbar panel.
146 156
     Torbutton lets you add a toolbar button by right-clicking
... ...
@@ -158,4 +168,5 @@
158 168
   <!-- END SIDECOL -->
159 169
 </div>
160 170
 <!-- END CONTENT -->
161
-#include <foot.wmi>      
171
+#include <foot.wmi>
172
+
Browse code

add the torbutton signature link.

Andrew Lewman authored on 06/10/2011 03:38:19
Showing 1 changed files
... ...
@@ -94,7 +94,7 @@
94 94
     <strong>Install Stable:</strong> Click to <a
95 95
     href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"
96 96
     hash="<version-hash-torbutton>" onclick="return
97
-    install(event);">install from this website</a>.<br/>
97
+    install(event);">install from this website</a>. Verify the <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi.asc">signature</a>.<br/>
98 98
 <!--
99 99
     <strong>Install Alpha:</strong> Click to 
100 100
     <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"
Browse code

Update torbutton version to 1.4.1.

Mike Perry authored on 28/08/2011 10:36:42
Showing 1 changed files
... ...
@@ -89,17 +89,19 @@
89 89
     <strong>Current stable version:</strong><version-torbutton><br/>
90 90
     <strong>Current alpha version:</strong><version-torbutton-alpha><br/>
91 91
     <br/>
92
-    <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>
92
+    <strong>Maintainer:</strong> Mike Perry<br/>
93 93
     <br/>
94 94
     <strong>Install Stable:</strong> Click to <a
95 95
     href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"
96 96
     hash="<version-hash-torbutton>" onclick="return
97 97
     install(event);">install from this website</a>.<br/>
98
+<!--
98 99
     <strong>Install Alpha:</strong> Click to 
99 100
     <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"
100 101
       hash="<version-hash-torbutton-alpha>"
101 102
       onclick="return install(event);">install from this website</a>
102 103
     <br/>
104
+  -->
103 105
    <strong>English Google Search:</strong> 
104 106
     Google search plugins for
105 107
     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
Browse code

link to our version, not amo.

Andrew Lewman authored on 31/05/2011 22:56:11
Showing 1 changed files
... ...
@@ -94,9 +94,7 @@
94 94
     <strong>Install Stable:</strong> Click to <a
95 95
     href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"
96 96
     hash="<version-hash-torbutton>" onclick="return
97
-    install(event);">install from this website</a> or <a
98
-    href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install
99
-    from Mozilla's Add-On site</a><br/>
97
+    install(event);">install from this website</a>.<br/>
100 98
     <strong>Install Alpha:</strong> Click to 
101 99
     <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"
102 100
       hash="<version-hash-torbutton-alpha>"
Browse code

local doesn't exist, it's on archive.

Andrew Lewman authored on 31/05/2011 22:55:12
Showing 1 changed files
... ...
@@ -109,7 +109,7 @@
109 109
     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
110 110
      onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
111 111
     <br/>
112
-    <strong>Past Releases:</strong> <a href="../dist/torbutton/">Local</a><br/>
112
+    <strong>Past Releases:</strong> <a href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor Archive</a><br/>
113 113
     <br/>
114 114
     <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
115 115
 
Browse code

closed a link tag

Runa A. Sandvik authored on 14/11/2010 01:22:06
Showing 1 changed files
... ...
@@ -12,7 +12,7 @@
12 12
     <!-- PUT CONTENT AFTER THIS TAG -->
13 13
     
14 14
     <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>
15
-    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml">
15
+    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/>
16 16
     <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>
17 17
     <script type="text/javascript">
18 18
     
Browse code

fix the urls to torbutton changelog, credits, and license.

Andrew Lewman authored on 28/10/2010 16:39:36
Showing 1 changed files
... ...
@@ -119,9 +119,9 @@
119 119
     <br/>
120 120
     <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>
121 121
     <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>
122
-    <a href="https://git.torproject.org/checkout/torbutton/master/src/CHANGELOG">changelog</a> <b>|</b>
123
-    <a href="https://git.torproject.org/checkout/torbutton/master/src/LICENSE">license</a> <b>|</b>
124
-    <a href="https://git.torproject.org/checkout/torbutton/master/src/CREDITS">credits</a> <b>]</b><br/>
122
+    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> <b>|</b>
123
+    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> <b>|</b>
124
+    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b><br/>
125 125
     
126 126
     <br/>
127 127
     
Browse code

fix page titles per ticket 2126.

Andrew Lewman authored on 28/10/2010 16:35:10
Showing 1 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 # Revision: $Revision$
3 3
 # Translation-Priority: 3-low
4 4
 
5
-#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
5
+#include "head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
6 6
 <div id="content" class="clearfix">
7 7
 	<div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
Browse code

looks like we never set the keywords either

Roger Dingledine authored on 27/10/2010 12:31:57
Showing 1 changed files
... ...
@@ -1,5 +1,5 @@
1 1
 ## translation metadata
2
-# Revision: $Revision: 0 $
2
+# Revision: $Revision$
3 3
 # Translation-Priority: 3-low
4 4
 
5 5
 #include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
Browse code

Fix all the download links on mirrors

Sebastian Hahn authored on 24/10/2010 15:54:58
Showing 1 changed files
... ...
@@ -109,7 +109,7 @@
109 109
     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
110 110
      onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
111 111
     <br/>
112
-    <strong>Past Releases:</strong> <a href="/dist/torbutton/">Local</a><br/>
112
+    <strong>Past Releases:</strong> <a href="../dist/torbutton/">Local</a><br/>
113 113
     <br/>
114 114
     <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
115 115
 
Browse code

On second thought, lets just make the google search plugins more clear as to what they are.

Mike Perry authored on 15/10/2010 22:29:16
Showing 1 changed files
... ...
@@ -102,18 +102,17 @@
102 102
       hash="<version-hash-torbutton-alpha>"
103 103
       onclick="return install(event);">install from this website</a>
104 104
     <br/>
105
+   <strong>English Google Search:</strong> 
106
+    Google search plugins for
107
+    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
108
+     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 
109
+    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
110
+     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
111
+    <br/>
105 112
     <strong>Past Releases:</strong> <a href="/dist/torbutton/">Local</a><br/>
106 113
     <br/>
107 114
     <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
108 115
 
109
-#   <strong>Extras:</strong> 
110
-#    Google search plugins for
111
-#    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
112
-#     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 
113
-#    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
114
-#     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
115
-#    <br/>
116
-
117 116
     <strong>Source:</strong> You can <a
118 117
     href="https://gitweb.torproject.org/torbutton.git">browse the
119 118
     repository</a> or simply unzip the xpi.
Browse code

Fix broken links (bug 2076) and remove search plugins.

Mike Perry authored on 15/10/2010 22:26:38
Showing 1 changed files
... ...
@@ -103,18 +103,17 @@
103 103
       onclick="return install(event);">install from this website</a>
104 104
     <br/>
105 105
     <strong>Past Releases:</strong> <a href="/dist/torbutton/">Local</a><br/>
106
-    <strong>Developer Documentation:</strong> <a href="design/index.html.en">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
107
-
108
-   <strong>Extras:</strong> 
109
-    
110
-    Google search plugins for
111
-    
112
-    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
113
-     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 
114
-    
115
-    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
116
-     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
117 106
     <br/>
107
+    <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
108
+
109
+#   <strong>Extras:</strong> 
110
+#    Google search plugins for
111
+#    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
112
+#     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 
113
+#    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
114
+#     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
115
+#    <br/>
116
+
118 117
     <strong>Source:</strong> You can <a
119 118
     href="https://gitweb.torproject.org/torbutton.git">browse the
120 119
     repository</a> or simply unzip the xpi.
Browse code

fix the other bad path

Andrew Lewman authored on 15/10/2010 08:05:02
Showing 1 changed files
... ...
@@ -102,7 +102,7 @@
102 102
       hash="<version-hash-torbutton-alpha>"
103 103
       onclick="return install(event);">install from this website</a>
104 104
     <br/>
105
-    <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>
105
+    <strong>Past Releases:</strong> <a href="/dist/torbutton/">Local</a><br/>
106 106
     <strong>Developer Documentation:</strong> <a href="design/index.html.en">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
107 107
 
108 108
    <strong>Extras:</strong> 
Browse code

fix the path to torbutton binaries.

Andrew Lewman authored on 15/10/2010 08:04:26
Showing 1 changed files
... ...
@@ -91,13 +91,14 @@
91 91
     <br/>
92 92
     <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>
93 93
     <br/>
94
-    <strong>Install Stable:</strong> Click to 
95
-    <a href="http://www.torproject.org/torbutton/torbutton-current.xpi"
96
-      hash="<version-hash-torbutton>"
97
-      onclick="return install(event);">install from this website</a> or 
98
-    <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>
94
+    <strong>Install Stable:</strong> Click to <a
95
+    href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"
96
+    hash="<version-hash-torbutton>" onclick="return
97
+    install(event);">install from this website</a> or <a
98
+    href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install
99
+    from Mozilla's Add-On site</a><br/>
99 100
     <strong>Install Alpha:</strong> Click to 
100
-    <a href="http://www.torproject.org/torbutton/torbutton-current-alpha.xpi"
101
+    <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"
101 102
       hash="<version-hash-torbutton-alpha>"
102 103
       onclick="return install(event);">install from this website</a>
103 104
     <br/>
Browse code

Bring back Torbutton alpha.

Mike Perry authored on 15/10/2010 00:12:28
Showing 1 changed files
... ...
@@ -86,15 +86,21 @@
86 86
     <h2>Torbutton</h2>
87 87
     <hr>
88 88
     
89
-    <strong>Current version:</strong><version-torbutton><br/>
89
+    <strong>Current stable version:</strong><version-torbutton><br/>
90
+    <strong>Current alpha version:</strong><version-torbutton-alpha><br/>
90 91
     <br/>
91 92
     <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>
92 93
     <br/>
93
-    <strong>Install:</strong> Click to 
94
-    <a href="https://www.torproject.org/torbutton/torbutton-current.xpi"
94
+    <strong>Install Stable:</strong> Click to 
95
+    <a href="http://www.torproject.org/torbutton/torbutton-current.xpi"
95 96
       hash="<version-hash-torbutton>"
96 97
       onclick="return install(event);">install from this website</a> or 
97 98
     <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>
99
+    <strong>Install Alpha:</strong> Click to 
100
+    <a href="http://www.torproject.org/torbutton/torbutton-current-alpha.xpi"
101
+      hash="<version-hash-torbutton-alpha>"
102
+      onclick="return install(event);">install from this website</a>
103
+    <br/>
98 104
     <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>
99 105
     <strong>Developer Documentation:</strong> <a href="design/index.html.en">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
100 106
 
Browse code

Fix link to torbutton design document. Thanks qbi

Sebastian Hahn authored on 13/10/2010 00:36:02
Showing 1 changed files
... ...
@@ -96,7 +96,7 @@
96 96
       onclick="return install(event);">install from this website</a> or 
97 97
     <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>
98 98
     <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>
99
-    <strong>Developer Documentation:</strong> <a href="design/index.html.en>">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
99
+    <strong>Developer Documentation:</strong> <a href="design/index.html.en">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
100 100
 
101 101
    <strong>Extras:</strong> 
102 102
     
Browse code

fix links to design html since mikeperry does something crazy like parse semi-html with xslt transformer.

Andrew Lewman authored on 11/10/2010 19:04:01
Showing 1 changed files
... ...
@@ -96,8 +96,9 @@
96 96
       onclick="return install(event);">install from this website</a> or 
97 97
     <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>
98 98
     <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>
99
-    <strong>Developer Documentation:</strong> <a href="design/">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
100
-    <strong>Extras:</strong> 
99
+    <strong>Developer Documentation:</strong> <a href="design/index.html.en>">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
100
+
101
+   <strong>Extras:</strong> 
101 102
     
102 103
     Google search plugins for
103 104
     
Browse code

fix bug 2009.

Andrew Lewman authored on 10/10/2010 14:53:44
Showing 1 changed files
... ...
@@ -91,7 +91,7 @@
91 91
     <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>
92 92
     <br/>
93 93
     <strong>Install:</strong> Click to 
94
-    <a href="http://www.torproject.org/torbutton/torbutton-current.xpi"
94
+    <a href="https://www.torproject.org/torbutton/torbutton-current.xpi"
95 95
       hash="<version-hash-torbutton>"
96 96
       onclick="return install(event);">install from this website</a> or 
97 97
     <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>
Browse code

We decided to go with HTML in favor of XHTML.

Sebastian Hahn authored on 10/10/2010 03:34:47
Showing 1 changed files
... ...
@@ -12,7 +12,7 @@
12 12
     <!-- PUT CONTENT AFTER THIS TAG -->
13 13
     
14 14
     <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>
15
-    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml" />
15
+    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml">
16 16
     <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>
17 17
     <script type="text/javascript">
18 18
     
... ...
@@ -84,7 +84,7 @@
84 84
     </script>
85 85
     
86 86
     <h2>Torbutton</h2>
87
-    <hr />
87
+    <hr>
88 88
     
89 89
     <strong>Current version:</strong><version-torbutton><br/>
90 90
     <br/>
Browse code

fix links to torbutton section.

Andrew Lewman authored on 07/10/2010 22:37:20
Showing 1 changed files
... ...
@@ -6,7 +6,7 @@
6 6
 <div id="content" class="clearfix">
7 7
 	<div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page torbutton>">TorButton</a>
9
+    <a href="<page torbutton/index>">Torbutton</a>
10 10
   </div>
11 11
 	<div id="maincol"> 
12 12
     <!-- PUT CONTENT AFTER THIS TAG -->
Browse code

fix links to trac, and the nav headers.

Andrew Lewman authored on 18/08/2010 14:14:15
Showing 1 changed files
... ...
@@ -111,7 +111,7 @@
111 111
     href="https://gitweb.torproject.org/torbutton.git">browse the
112 112
     repository</a> or simply unzip the xpi.
113 113
     <br/>
114
-    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/">Torproject Bug Tracker</a><br/>
114
+    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>
115 115
     <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>
116 116
     <a href="https://git.torproject.org/checkout/torbutton/master/src/CHANGELOG">changelog</a> <b>|</b>
117 117
     <a href="https://git.torproject.org/checkout/torbutton/master/src/LICENSE">license</a> <b>|</b>
Browse code

move torbutton back to a main path rather than buried in projects, update versions.wmi to be current, update the mirrors table, need a better blurb in info.wmi.

Andrew Lewman authored on 18/08/2010 14:06:31
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,155 @@
1
+## translation metadata
2
+# Revision: $Revision: 0 $
3
+# Translation-Priority: 3-low
4
+
5
+#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
6
+<div id="content" class="clearfix">
7
+	<div id="breadcrumbs">
8
+    <a href="<page index>">Home &raquo; </a>
9
+    <a href="<page torbutton>">TorButton</a>
10
+  </div>
11
+	<div id="maincol"> 
12
+    <!-- PUT CONTENT AFTER THIS TAG -->
13
+    
14
+    <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>
15
+    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml" />
16
+    <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>
17
+    <script type="text/javascript">
18
+    
19
+    function addSearchProvider(prov) {
20
+    
21
+    try {
22
+    window.external.AddSearchProvider(prov);
23
+    }
24
+    
25
+    catch (e) {
26
+    alert("Search plugins require Firefox 2");
27
+    return;
28
+    }
29
+    }
30
+    
31
+    function addEngine(name,ext,cat,pid)
32
+    {
33
+      if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) {
34
+        window.sidebar.addSearchEngine(
35
+          "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + ".src",
36
+          "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + "."+ ext, name, cat );
37
+      } else {
38
+        alert("You will need a browser which supports Sherlock to install this plugin.");
39
+      }
40
+    }
41
+    
42
+    function addOpenSearch(name,ext,cat,pid,meth)
43
+    {
44
+      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
45
+        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
46
+          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
47
+        } else {
48
+          window.external.AddSearchProvider(
49
+            "http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml");
50
+        }
51
+      } else {
52
+        alert("You will need a browser which supports OpenSearch to install this plugin.");
53
+      }
54
+    }
55
+    
56
+    function addOpenSearch2(name,ext,cat,pid,meth)
57
+    {
58
+      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
59
+        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
60
+          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
61
+        } else {
62
+          window.external.AddSearchProvider(
63
+            "http://torbutton.torproject.org/dev/search/" + name + ".xml");
64
+        }
65
+      } else {
66
+        alert("You will need a browser which supports OpenSearch to install this plugin.");
67
+      }
68
+    }
69
+    
70
+    function install (aEvent)
71
+    {
72
+      var params = {
73
+        "Torbutton": { URL: aEvent.target.href,
74
+                 Hash: aEvent.target.getAttribute("hash"),
75
+                 toString: function () { return this.URL; }
76
+        }
77
+      };
78
+      InstallTrigger.install(params);
79
+    
80
+      return false;
81
+    }
82
+    
83
+    
84
+    </script>
85
+    
86
+    <h2>Torbutton</h2>
87
+    <hr />
88
+    
89
+    <strong>Current version:</strong><version-torbutton><br/>
90
+    <br/>
91
+    <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>
92
+    <br/>
93
+    <strong>Install:</strong> Click to 
94
+    <a href="http://www.torproject.org/torbutton/torbutton-current.xpi"
95
+      hash="<version-hash-torbutton>"
96
+      onclick="return install(event);">install from this website</a> or 
97
+    <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>
98
+    <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>
99
+    <strong>Developer Documentation:</strong> <a href="design/">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
100
+    <strong>Extras:</strong> 
101
+    
102
+    Google search plugins for
103
+    
104
+    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
105
+     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 
106
+    
107
+    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
108
+     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
109
+    <br/>
110
+    <strong>Source:</strong> You can <a
111
+    href="https://gitweb.torproject.org/torbutton.git">browse the
112
+    repository</a> or simply unzip the xpi.
113
+    <br/>
114
+    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/">Torproject Bug Tracker</a><br/>
115
+    <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>
116
+    <a href="https://git.torproject.org/checkout/torbutton/master/src/CHANGELOG">changelog</a> <b>|</b>
117
+    <a href="https://git.torproject.org/checkout/torbutton/master/src/LICENSE">license</a> <b>|</b>
118
+    <a href="https://git.torproject.org/checkout/torbutton/master/src/CREDITS">credits</a> <b>]</b><br/>
119
+    
120
+    <br/>
121
+    
122
+    <p>
123
+    Torbutton is a 1-click way for Firefox users to enable or disable
124
+    the browser's use of <a href="<page index>">Tor</a>.
125
+    It adds a panel to the statusbar that says "Tor Enabled" (in green) or
126
+    "Tor Disabled" (in red).  The user may click on the panel to toggle
127
+    the status.  If the user (or some other extension) changes the proxy
128
+    settings, the change is automatically reflected in the statusbar.
129
+    </p>
130
+    
131
+    <p>
132
+    To keep you safe, Torbutton disables many types of active content. You
133
+    can learn more from the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>,
134
+    or read more details in the <a href="<page torbutton/torbutton-options>">Torbutton
135
+    options</a> list.
136
+    </p>
137
+    
138
+    <p>
139
+    Some users may prefer a toolbar button instead of a statusbar panel.
140
+    Torbutton lets you add a toolbar button by right-clicking
141
+    on the desired toolbar, selecting "Customize...", and then dragging the
142
+    Torbutton icon onto the toolbar.  There is an option in the preferences
143
+    to hide the statusbar panel (Tools-&gt;Extensions, select Torbutton,
144
+    and click on Preferences).
145
+    </p>
146
+  </div>
147
+  <!-- END MAINCOL -->
148
+  <div id = "sidecol">
149
+#include "side.wmi"
150
+#include "info.wmi"
151
+  </div>
152
+  <!-- END SIDECOL -->
153
+</div>
154
+<!-- END CONTENT -->
155
+#include <foot.wmi>