Author: phobos Date: 2011-10-18 01:18:07 +0000 (Tue, 18 Oct 2011) New Revision: 25172

Modified: website/trunk/en/index.wml website/trunk/projects/en/projects.wml Log: remove torbutton as a standalone project, update torbutton project description to point at torbrowser. try to implement ticket 4177.

Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-10-17 18:56:40 UTC (rev 25171) +++ website/trunk/en/index.wml 2011-10-18 01:18:07 UTC (rev 25172) @@ -105,11 +105,12 @@ <tr> <td> <div class="project"> - <a href="<page torbutton/index>"><img - src="$(IMGROOT)/icon-TorButton.jpg" alt="Torbutton Icon"></a> - <h3><a href="<page torbutton/index>">Torbutton</a></h3> - <p>Torbutton is a 1-click way for Firefox users to enable - or disable Tor in Firefox.</p> + <a href="<page projects/torbrowser>"><img + src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> + <h3><a href="<page projects/torbrowser>">Tor + Browser</a></h3> + <p>Tor Browser contains everything you need to safely + browse the Internet.</p> </div> </td> <td> @@ -130,16 +131,6 @@ <h3><a href="<page projects/vidalia>">Vidalia</a></h3> <p>Vidalia is a graphical way to control and view Tor's connections and settings.</p> - </div> - </td> - <td> - <div class="project"> - <a href="<page projects/torbrowser>"><img - src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> - <h3><a href="<page projects/torbrowser>">Tor - Browser</a></h3> - <p>Tor Browser contains everything you need to safely - browse the Internet. </p> </div> </td> </tr>

Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2011-10-17 18:56:40 UTC (rev 25171) +++ website/trunk/projects/en/projects.wml 2011-10-18 01:18:07 UTC (rev 25172) @@ -16,9 +16,9 @@ <tr> <td> <div class="name"><a href="<page torbutton/index>">Torbutton</a></div> -<p>Torbutton is a 1-click way for Firefox users to enable or disable -Tor in Firefox. To keep you safe, Torbutton disables many types -of active content.</p> +<p>Torbutton is integrated into <a href="<page projects/torbrowser>">Tor +Browser</a>. Torbutton disables many types of active content and threats +to your privacy when using a web browser.</p> </td> <td> <div class="name"><a href="<page projects/torbrowser>">Tor Browser Bundle</a></div>