Author: mttp Date: 2014-01-08 18:10:05 +0000 (Wed, 08 Jan 2014) New Revision: 26526 Modified: website/trunk/docs/en/faq.wml Log: Add the example torrc link to an existing FAQ entry instead of making a new one. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-01-08 17:53:39 UTC (rev 26525) +++ website/trunk/docs/en/faq.wml 2014-01-08 18:10:05 UTC (rev 26526) @@ -101,7 +101,6 @@ <ul> <li><a href="#torrc">I'm supposed to "edit my torrc". What does that mean?</a></li> - <li><a href="#ExampleTorrc">Is there an example torrc file somewhere?</a></li> <li><a href="#Logs">How do I set up logging, or see Tor's logs?</a></li> <li><a href="#LogLevel">What log level should I use?</a></li> @@ -1528,24 +1527,15 @@ <p> For other configuration options you can use, look at the <a href="<page -docs/tor-manual>">Tor manual page</a>. Remember, all lines beginning -with # in torrc are treated as comments and have no effect on Tor's -configuration. +docs/tor-manual>">Tor manual page</a>. Look at <a +href="https://gitweb.torproject.org/tor.git/blob/HEAD:/src/config/torrc.sample.in"> +the sample torrc file</a> for hints on common configurations. Remember, all +lines beginning with # in torrc are treated as comments and have no effect +on Tor's configuration. </p> <hr> -<a id="ExampleTorrc"></a> -<h3><a class="anchor" href="#ExampleTorrc">Is there an example torrc file -somewhere?</a></h3> - -<p> -There's one included with tor. You can read it online <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/src/config/torrc.sample.in"> -here</a>. Tor does not use the lines that begin with '#'. -</p> - -<hr> - <a id="Logs"></a> <h3><a class="anchor" href="#Logs">How do I set up logging, or see Tor's logs?</a></h3>