Author: arma Date: 2014-09-28 03:58:08 +0000 (Sun, 28 Sep 2014) New Revision: 26959 Modified: website/trunk/projects/en/torbrowser-details.wml website/trunk/projects/en/torbrowser.wml Log: wipe out the torbrowser-details page. resolves ticket 10502. Modified: website/trunk/projects/en/torbrowser-details.wml =================================================================== --- website/trunk/projects/en/torbrowser-details.wml 2014-09-27 02:56:58 UTC (rev 26958) +++ website/trunk/projects/en/torbrowser-details.wml 2014-09-28 03:58:08 UTC (rev 26959) @@ -2,54 +2,7 @@ # Revision: $Revision$ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor Browser Bundle: Details" CHARSET="UTF-8" +#include "head.wmi" TITLE="Redirecting" REDIRECT="projects/torbrowser.html#feedback" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page projects/projects>">Projects » </a> - <a href="<page projects/torbrowser>">TorBrowser</a> - </div> - <div id="maincol"> +#include <foot.wmi> - <!-- PUT CONTENT AFTER THIS TAG --> - - <h2>Tor Browser Bundle: Details</h2> - <hr> - - <h3 id="contents">Stable Bundle contents</h3> - - <ul> - <li><a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/refs/tags/tbb-3.6.3-build1:/Bundle-Data/Docs/ChangeLog.txt">ChangeLog</a>.</li> - </ul> - - <h3 id="alphacontents">Alpha Bundle contents</h3> - - <ul> - <li><a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/Bundle-Data/Docs/ChangeLog.txt">ChangeLog</a>.</li> - </ul> - - <h3 id="build">Building the bundle</h3> - - <p>We use <a -href="https://blog.torproject.org/blog/deterministic-builds-part-two-technical-details">Gitian</a> -to ensure that byte-for-byte reproducible packages can be built from our -source repository by anyone. To re-build the bundle, check out the <a -href="https://gitweb.torproject.org/builders/tor-browser-bundle.git">Tor -Browser builder repository</a> and see the <a -href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gitian/README.build">README.build</a> -for instructions. You may also find the <a -href="https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking">Tor -Browser Hacking</a> intro document useful for learning about the build system -and our development processes. - - </div> - <!-- END MAINCOL --> - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> - <!-- END SIDECOL --> -</div> -<!-- END CONTENT --> -#include <foot.wmi> Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-09-27 02:56:58 UTC (rev 26958) +++ website/trunk/projects/en/torbrowser.wml 2014-09-28 03:58:08 UTC (rev 26959) @@ -604,7 +604,7 @@ email the <a href="<page about/contact>">help desk</a>.</p> <br><br> <h3>Comments and suggestions</h3> - <p>The Tor Browser is under development and not yet complete. + <p>The Tor Browser is under development. To discuss improvements and submit comments, please use the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a> mailing list.</p> @@ -613,16 +613,32 @@ <p><strong><em>What is Tor and why do I need it?</em></strong> <br>To learn more about Tor, visit the <a href="<page index>">Tor Project website</a>.</p> <p><strong><em>What is in the Tor Browser?</em></strong> - <br>It contains Tor, a modified Firefox ESR, Torbutton, TorLauncher, - NoScript, and HTTPS-Everywhere. - (<a href="https://www.torproject.org/projects/torbrowser/design/">design</a>) (<a - href="<page projects/torbrowser-details>#contents">version details</a>).</p> - <p><strong><em>How can I make my own bundle?</em></strong> - <br>To download the source code and learn how to build the bundle yourself, read - the <a href="<page projects/torbrowser-details>#build">build instructions</a>.</p> - <p>Tor Browser is partially based on <a - href="https://www.mozilla.org/en-US/firefox/organizations/">Mozilla - Firefox ESR</a>.</p> + <br>It contains Tor, a modified <a + href="https://www.mozilla.org/en-US/firefox/organizations/">Firefox + ESR</a>, Torbutton, TorLauncher, + NoScript, and HTTPS-Everywhere. Read the + <a + href="https://www.torproject.org/projects/torbrowser/design/">design + document</a>, the <a + href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/refs/heads/maint-3.6:/Bundle-Data/Docs/ChangeLog.txt">ChangeLog + for the 3.6 branch</a>, and the <a + href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/Bundle-Data/Docs/ChangeLog.txt">ChangeLog + for the alpha branch</a>. + </p> + <p><strong><em>How can I make my own bundle?</em></strong> +<br>We use <a +href="https://blog.torproject.org/blog/deterministic-builds-part-two-technical-details">Gitian</a> +to ensure that byte-for-byte reproducible packages can be built from our +source repository by anyone. To rebuild the bundle, check out the <a +href="https://gitweb.torproject.org/builders/tor-browser-bundle.git">Tor +Browser builder repository</a> and see the <a +href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gitian/README.build">README.build</a> +for instructions. You may also find the <a +href="https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking">Tor +Browser Hacking</a> intro document useful for learning about the build system +and our development processes. +</p> + </div> </div> </div>