[or-cvs] r16896: {website} merge the 'getting support' and the 'getting up to speed' se (website/trunk/en)

Sat Sep 13 09:41:38 UTC 2008

Author: arma
Date: 2008-09-13 05:41:38 -0400 (Sat, 13 Sep 2008)
New Revision: 16896

Modified:
   website/trunk/en/documentation.wml
   website/trunk/en/faq.wml
Log:
merge the 'getting support' and the 'getting up to speed' sections.


Modified: website/trunk/en/documentation.wml
===================================================================

--- website/trunk/en/documentation.wml	2008-09-13 09:39:46 UTC (rev 16895)
+++ website/trunk/en/documentation.wml	2008-09-13 09:41:38 UTC (rev 16896)
@@ -24,60 +24,6 @@
 </ul>
 
 <a id="Support"></a>
-<h2><a class="anchor" href="#Support">Getting Support</a></h2>
-<ul>
-<li>The <a href="https://wiki.torproject.org/wiki/TheOnionRouter/TorFAQ">Tor
-Technical FAQ Wiki</a> should be the first place you look. The
-<a href="https://wiki.torproject.org/wiki/TheOnionRouter/TorifyHOWTO">Guide
-to Torifying various applications</a> is also popular. (While we
-monitor the Wiki page to help ensure accuracy, the Tor developers are
-not responsible for the content.)</li>
-<li>The <a href="<page faq-abuse>">Abuse FAQ</a> is a collection of
-common questions and issues discussed when running a Tor relay.</li>
-<li>The <a href="<page eff/tor-legal-faq>">Tor Legal FAQ</a> is written by
-EFF lawyers. It aims to give you an overview of some of the legal issues
-that arise from the Tor project in the US.</li>
-<li>The <a href="<page tor-manual>">manual</a>
-lists all the possible entries you can put in your <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc">torrc
-file</a>. We also provide a <a href="<page tor-manual-dev>">manual for
-the development version of Tor</a>.</li>
-<li>The <a href="https://wiki.torproject.org/noreply/TheOnionRouter">Tor
-wiki</a> provides a plethora of helpful contributions from Tor
-users. Check it out!</li>
-<li>The Tor IRC channel (for users, relay operators, and developers)
-is <a href="irc://irc.oftc.net/tor">#tor on irc.oftc.net</a>.</li>
-<li>We have a <a
-href="https://bugs.torproject.org/tor">bugtracker</a>.
-If you have a bug, especially a crash bug, read <a
-href="https://wiki.torproject.org/wiki/TheOnionRouter/TorFAQ#RelayCrashing">how
-to report a Tor bug</a> first and then tell us as much information
-about it as you can in the bugtracker. (If your bug is
-with Privoxy, your browser, or some other application, please don't put
-it in our bugtracker.)</li>
-<li>Try the or-talk mailing list <a href="#MailingLists">below</a>.
-<li>As a last resort, look through <a href="<page contact>">the Tor
-contact page</a>.</li>
-</ul>
-
-<a id="MailingLists"></a>
-<h2><a class="anchor" href="#MailingLists">Mailing List Information</a></h2>
-<ul>
-<li>The <a href="http://archives.seul.org/or/announce/">or-announce
-mailing list</a> is a low volume list for announcements of new releases
-and critical security updates. Everybody should be on this list.
-There is also an
-<a href="http://rss.gmane.org/gmane.network.onion-routing.announce">RSS
-feed</a> of or-announce at <a href="http://gmane.org">gmane.org</a>.</li>
-<li>The <a href="http://archives.seul.org/or/talk/">or-talk list</a>
-is where a lot of discussion happens, and is where we send notifications
-of prerelease versions and release candidates.</li>
-<li>The <a href="http://archives.seul.org/or/dev/">or-dev list</a>
-is for posting by developers only, and is very low traffic.</li>
-<li>A list for <a href="http://archives.seul.org/or/cvs/">svn commits</a>
-may be interesting for developers.</li>
-</ul>
-
 <a id="UpToSpeed"></a>
 <h2><a class="anchor" href="#UpToSpeed">Getting up to speed on Tor's past,
 present, and future</a></h2>
@@ -96,29 +42,54 @@
 </li>
 
 <li>
-Download and watch Roger's overview talk from What The Hack (<a
-href="http://freehaven.net/~arma/wth-anonymous-communication-58.mp4">video</a>,
-<a href="http://freehaven.net/~arma/wth1.pdf">slides</a>, <a
-href="http://wiki.whatthehack.org/index.php/Anonymous_communication_for_the_United_States_Department_of_Defense...and_you">abstract</a>).
-This talk was given in July 2005, back when we were funded by EFF and back
-when the network was quite small, but it still provides good background
-on how Tor works and what it's for.
-</li>
-
-<li>
 Our <a
 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ">FAQ</a>
 covers all sorts of topics, including questions about setting up a client
 or relay, concerns about anonymity attacks, why we didn't build Tor in
 other ways, and discussion of Tor users and abuse.
+There's a separate <a href="<page faq-abuse>">Abuse FAQ</a> to answer
+common questions from or for relay operators.
+The <a href="<page eff/tor-legal-faq>">Tor Legal FAQ</a> is written by
+EFF lawyers, and aims to give you an overview of some of the legal issues
+that arise from the Tor project in the US.
 </li>
 
+<li>The <a href="<page tor-manual>">manual</a>
+lists all the possible entries you can put in your <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc">torrc
+file</a>. We also provide a <a href="<page tor-manual-dev>">manual for
+the development version of Tor</a>.</li>
+
+<li>If you have questions, we have an IRC channel (for users, relay
+operators, and developers)
+at <a href="irc://irc.oftc.net/tor">#tor on irc.oftc.net</a>. If
+you have a bug, especially a crash bug, read <a
+href="https://wiki.torproject.org/wiki/TheOnionRouter/TorFAQ#RelayCrashing">how
+to report a Tor bug</a> first and then tell us as much information
+about it as you can in
+<a href="https://bugs.torproject.org/tor">our bugtracker</a>.
+(If your bug is
+with Privoxy, your browser, or some other application, please don't put
+it in our bugtracker.) And we have the
+or-talk mailing list (more details <a href="#MailingLists">below</a>).
+</li>
+
 <li>
 <a href="https://blog.torproject.org/">Tor has a blog now</a>.
 We try to keep it updated every week or two with the latest news.
 </li>
 
 <li>
+Download and watch Roger's overview talk from What The Hack (<a
+href="http://freehaven.net/~arma/wth-anonymous-communication-58.mp4">video</a>,
+<a href="http://freehaven.net/~arma/wth1.pdf">slides</a>, <a
+href="http://wiki.whatthehack.org/index.php/Anonymous_communication_for_the_United_States_Department_of_Defense...and_you">abstract</a>).
+This talk was given in July 2005, back when we were funded by EFF and back
+when the network was quite small, but it still provides good background
+on how Tor works and what it's for.
+</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.
@@ -187,6 +158,24 @@
 
 </ol>
 
+<a id="MailingLists"></a>
+<h2><a class="anchor" href="#MailingLists">Mailing List Information</a></h2>
+<ul>
+<li>The <a href="http://archives.seul.org/or/announce/">or-announce
+mailing list</a> is a low volume list for announcements of new releases
+and critical security updates. Everybody should be on this list.
+There is also an
+<a href="http://rss.gmane.org/gmane.network.onion-routing.announce">RSS
+feed</a> of or-announce at <a href="http://gmane.org">gmane.org</a>.</li>
+<li>The <a href="http://archives.seul.org/or/talk/">or-talk list</a>
+is where a lot of discussion happens, and is where we send notifications
+of prerelease versions and release candidates.</li>
+<li>The <a href="http://archives.seul.org/or/dev/">or-dev list</a>
+is for posting by developers only, and is very low traffic.</li>
+<li>A list for <a href="http://archives.seul.org/or/cvs/">svn commits</a>
+may be interesting for developers.</li>
+</ul>
+
 <a id="DesignDoc"></a>
 <h2><a class="anchor" href="#DesignDoc">Design Documents</a></h2>
 <ul>
@@ -264,7 +253,7 @@
 
 <a id="Developers"></a>
 <h2><a class="anchor" href="#Developers">For Developers</a></h2>
-  Browse the Tor <b>source repository</b>: (which may not necessarily work or even compile)
+  Browse the Tor <b>source repository</b>:
   <ul>
     <li><a href="<svnsandbox>">Regularly updated SVN sandbox</a></li>
     <li><a href="https://svn.torproject.org/svn/tor/trunk">Browse the repository's source tree directly</a></li>

Modified: website/trunk/en/faq.wml
===================================================================
--- website/trunk/en/faq.wml	2008-09-13 09:39:46 UTC (rev 16895)
+++ website/trunk/en/faq.wml	2008-09-13 09:41:38 UTC (rev 16896)
@@ -239,7 +239,7 @@
 </p>
 
 <p>
-If you find an answer, please stick around on the IRC channel or the
+If you find your answer, please stick around on the IRC channel or the
 mailing list and answer questions from others.
 </p>
 

