Author: arma Date: 2012-03-31 18:47:47 +0000 (Sat, 31 Mar 2012) New Revision: 25588

Modified: website/trunk/docs/en/documentation.wml Log: reorder a bit

Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2012-03-31 18:41:02 UTC (rev 25587) +++ website/trunk/docs/en/documentation.wml 2012-03-31 18:47:47 UTC (rev 25588) @@ -92,12 +92,6 @@ </li>

<li> - Look through our <a href="#DesignDoc">Design - Documents</a>. Notice that we have RFC-style specs to tell you exactly - how Tor is built. - </li> - - <li> Learn about our censorship circumvention side: watch our 28C3 talk in December 2011 on how governments have tried to block Tor (<a href="https://media.torproject.org/video/28c3-4800-en-how_governments_have_tried_to_block_tor_h264.mp4">video</a>, @@ -116,6 +110,12 @@ </li>

<li> + Look through our <a href="#DesignDoc">Design + Documents</a>. Notice that we have RFC-style specs to tell you exactly + how Tor is built. + </li> + + <li> There's a skeletal <a href="https://svn.torproject.org/svn/projects/roadmaps/2008-12-19-roadmap-full.pdf">list of items we'd like to tackle in the future</a>. Alas, many of those @@ -168,8 +168,8 @@ <li> Once you're up to speed, things will continue to change surprisingly fast. The <a href="#MailingLists">tor-dev mailing list</a> is where the complex - discussion happens, and the #tor IRC channel - is where the less complex discussion happens. + discussion happens, and the #tor and #tor-dev IRC channels + are where the rest of the discussion happens. </li>

</ol>