Author: arma Date: 2012-01-29 13:35:00 +0000 (Sun, 29 Jan 2012) New Revision: 25359 Modified: website/trunk/projects/en/obfsproxy-instructions.wml Log: put the diagram at the top; fix a typo; get rid of the client-side log window since it didn't show anything. Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-29 13:34:15 UTC (rev 25358) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-29 13:35:00 UTC (rev 25359) @@ -16,6 +16,8 @@ <h1 id="instructions">Obfsproxy Instructions</h1> + <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="client torrc"></a> + <h3>Step 1: Install dependencies, obfsproxy, and Tor</h3> <br> @@ -59,7 +61,8 @@ <br> <p> - Add the appropriate lines to your tor configuration file: + Add the appropriate lines to your <a href="<page docs/faq>#torrc">tor + configuration file</a>: </p> <p> @@ -69,19 +72,10 @@ </p> <p> - Don't forget to replace <em>192.0.2.34</em> with the IP address of - the bridge you wish to use, and <em>34545</em> with the port - obfpsroxy is listening on. + Don't forget to replace <em>192.0.2.34:34545</em> with the IP address + and port that the bridge's obfsproxy is listening on. </p> - <p> - Launch Tor using this configuration file. You can do this by using - your favorite init script, or by pointing the Tor binary to the - torrc file: - </p> - - <img src="$(IMGROOT)/obfs-spawn_tor_client.png" alt="spawn tor" height="101" width="882"> - <p> <br> <img src="$(IMGROOT)/sidenav-arrow.png"> <strong>Congratulations!</strong> Your traffic should now be @@ -98,7 +92,8 @@ <br> <p> - Add the appropriate lines to your tor configuration file: + Add the appropriate lines to your <a href="<page docs/faq>#torrc">tor + configuration file</a>: </p> <p>