remove torbutton as a standalone project, update torbutton project description to point at torbrowser. try to implement ticket 4177.
Andrew Lewman commited on 2011-10-18 03:18:07
Zeige 2 geänderte Dateien mit 9 Einfügungen und 18 Löschungen.
- en/index.wml 96e22b3e2..1ec10c344
- projects/en/projects.wml 583c79ec3..4fb0185b8
| ... | ... |
@@ -105,11 +105,12 @@ |
| 105 | 105 |
<tr> |
| 106 | 106 |
<td> |
| 107 | 107 |
<div class="project"> |
| 108 |
- <a href="<page torbutton/index>"><img |
|
| 109 |
- src="$(IMGROOT)/icon-TorButton.jpg" alt="Torbutton Icon"></a> |
|
| 110 |
- <h3><a href="<page torbutton/index>">Torbutton</a></h3> |
|
| 111 |
- <p>Torbutton is a 1-click way for Firefox users to enable |
|
| 112 |
- or disable Tor in Firefox.</p> |
|
| 108 |
+ <a href="<page projects/torbrowser>"><img |
|
| 109 |
+ src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> |
|
| 110 |
+ <h3><a href="<page projects/torbrowser>">Tor |
|
| 111 |
+ Browser</a></h3> |
|
| 112 |
+ <p>Tor Browser contains everything you need to safely |
|
| 113 |
+ browse the Internet.</p> |
|
| 113 | 114 |
</div> |
| 114 | 115 |
</td> |
| 115 | 116 |
<td> |
| ... | ... |
@@ -132,16 +133,6 @@ |
| 132 | 133 |
connections and settings.</p> |
| 133 | 134 |
</div> |
| 134 | 135 |
</td> |
| 135 |
- <td> |
|
| 136 |
- <div class="project"> |
|
| 137 |
- <a href="<page projects/torbrowser>"><img |
|
| 138 |
- src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> |
|
| 139 |
- <h3><a href="<page projects/torbrowser>">Tor |
|
| 140 |
- Browser</a></h3> |
|
| 141 |
- <p>Tor Browser contains everything you need to safely |
|
| 142 |
- browse the Internet. </p> |
|
| 143 |
- </div> |
|
| 144 |
- </td> |
|
| 145 | 136 |
</tr> |
| 146 | 137 |
</table> |
| 147 | 138 |
</div> |
| ... | ... |
@@ -16,9 +16,9 @@ in order to make your experience safer, better, and more anonymous.</p> |
| 16 | 16 |
<tr> |
| 17 | 17 |
<td> |
| 18 | 18 |
<div class="name"><a href="<page torbutton/index>">Torbutton</a></div> |
| 19 |
-<p>Torbutton is a 1-click way for Firefox users to enable or disable |
|
| 20 |
-Tor in Firefox. To keep you safe, Torbutton disables many types |
|
| 21 |
-of active content.</p> |
|
| 19 |
+<p>Torbutton is integrated into <a href="<page projects/torbrowser>">Tor |
|
| 20 |
+Browser</a>. Torbutton disables many types of active content and threats |
|
| 21 |
+to your privacy when using a web browser.</p> |
|
| 22 | 22 |
</td> |
| 23 | 23 |
<td> |
| 24 | 24 |
<div class="name"><a href="<page projects/torbrowser>">Tor Browser Bundle</a></div> |
| 25 | 25 |