Author: arma Date: 2014-03-24 07:02:11 +0000 (Mon, 24 Mar 2014) New Revision: 26675 Modified: website/trunk/docs/en/tor-doc-relay.wml Log: strip trailing whitespace Modified: website/trunk/docs/en/tor-doc-relay.wml =================================================================== --- website/trunk/docs/en/tor-doc-relay.wml 2014-03-24 07:00:12 UTC (rev 26674) +++ website/trunk/docs/en/tor-doc-relay.wml 2014-03-24 07:02:11 UTC (rev 26675) @@ -28,33 +28,33 @@ </p> <p> - An easy way to get started is with Vidalia, a graphical interface for - Tor. Vidalia is not included in the standard Tor Browser Bundle, although it - <a href="https://www.torproject.org/docs/faq.html.en#WhereDidVidaliaGo">once - was</a>. + An easy way to get started is with Vidalia, a graphical interface for + Tor. Vidalia is not included in the standard Tor Browser Bundle, although it + <a href="https://www.torproject.org/docs/faq.html.en#WhereDidVidaliaGo">once + was</a>. <p> - <p>The Vidalia Bridge Bundle, the Vidalia Relay Bundle - and the Vidalia Exit Bundle are available on the - <a href="https://www.torproject.org/download/download.html.en">download - page</a>. These bundles are only available for Windows. They come - preconfigured to run Tor as a bridge, a non-exit relay, or an exit relay. + <p>The Vidalia Bridge Bundle, the Vidalia Relay Bundle + and the Vidalia Exit Bundle are available on the + <a href="https://www.torproject.org/download/download.html.en">download + page</a>. These bundles are only available for Windows. They come + preconfigured to run Tor as a bridge, a non-exit relay, or an exit relay. </p> <p> - Vidalia is also available as a standalone package from <a - href="https://people.torproject.org/~erinn/vidalia-standalone-bundles/">this - directory</a>. To use the Vidalia standalone, you will first need to <a - href="https://torproject.org/projects/torbrowser.html.en">download - the Tor Browser Bundle</a> or the <a href="https://www.torproject.org/download/download.html.en">Tor Expert Bundle</a>. - Unpack the Vidalia package into your Tor Browser folder. This will allow - Vidalia to control and configure the Tor Browser Bundle's Tor client. If - you use the Expert Bundle, which contains Tor only and no browser, you'll + Vidalia is also available as a standalone package from <a + href="https://people.torproject.org/~erinn/vidalia-standalone-bundles/">this + directory</a>. To use the Vidalia standalone, you will first need to <a + href="https://torproject.org/projects/torbrowser.html.en">download + the Tor Browser Bundle</a> or the <a href="https://www.torproject.org/download/download.html.en">Tor Expert Bundle</a>. + Unpack the Vidalia package into your Tor Browser folder. This will allow + Vidalia to control and configure the Tor Browser Bundle's Tor client. If + you use the Expert Bundle, which contains Tor only and no browser, you'll need to inform Vidalia of your Tor's location. </p> <p> - Make sure your Tor works by using Tor as a client (surf with the Tor + Make sure your Tor works by using Tor as a client (surf with the Tor Browser, for example). Verify that your clock and timezone are set correctly. If possible, synchronize your clock with public <a href="http://en.wikipedia.org/wiki/Network_Time_Protocol">time @@ -106,8 +106,8 @@ <br /> <p> - You can set up a relay without using Vidalia if you wish. Tor's - configuration file is named 'torrc'. In the Tor Browser folder, it's + You can set up a relay without using Vidalia if you wish. Tor's + configuration file is named 'torrc'. In the Tor Browser folder, it's located at</p> <pre>Data\Tor\torrc</pre> <p>Open the file with a text editor and add the following lines:</p> @@ -119,17 +119,17 @@ ContactInfo human@... </pre> - <p>If you want to be a bridge, read about the BridgeRelay and - ServerTransportPlugin values <a + <p>If you want to be a bridge, read about the BridgeRelay and + ServerTransportPlugin values <a href="https://www.torproject.org/projects/obfsproxy-instructions.html.en#instructions">on this page</a>.</p> - <p>Tor will use all your bandwidth if you don't set limits for it. Some - options are described in <a href="<page docs/faq>#LimitTotalBandwidth">these</a> + <p>Tor will use all your bandwidth if you don't set limits for it. Some + options are described in <a href="<page docs/faq>#LimitTotalBandwidth">these</a> <a href="<page docs/faq>#BandwidthShaping">FAQ entries</a>.</p> - <p>See the <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/src/config/torrc.sample.in">sample - torrc file</a> and the <a + <p>See the <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/src/config/torrc.sample.in">sample + torrc file</a> and the <a href="https://www.torproject.org/docs/tor-manual.html.en">man page</a> for other Tor options you may want to set.</p> @@ -165,9 +165,9 @@ <p>When your relay has decided that it's reachable, it will upload a "server descriptor" to the directories, to let clients know what address, ports, keys, etc your relay is using. You can search <a - href="https://atlas.torproject.org/">Atlas</a> or <a - href="https://globe.torproject.org/">Globe</a> for - the nickname you configured, to make sure it's there. You may need to wait + href="https://atlas.torproject.org/">Atlas</a> or <a + href="https://globe.torproject.org/">Globe</a> for + the nickname you configured, to make sure it's there. You may need to wait up to one hour for the directories to publish the new server information.</p> <hr> @@ -179,11 +179,11 @@ href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce</a> mailing list. It is very low volume, and it will keep you informed of new stable releases.</p> - - <p>As a relay operator, you should consider subscribing to the + + <p>As a relay operator, you should consider subscribing to the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays"> tor-relays mailing list</a>. You might find <a - href="../docs/documentation.html.en#MailingLists">other higher-volume + href="../docs/documentation.html.en#MailingLists">other higher-volume Tor lists</a> of interest to you as well. </p>