put the diagram at the top; fix a typo; get rid of the client-side log window since it didn't show anything.
Roger Dingledine

Roger Dingledine commited on 2012-01-29 14:35:00
Zeige 1 geänderte Dateien mit 8 Einfügungen und 13 Löschungen.

... ...
@@ -16,6 +16,8 @@
16 16
 
17 17
     <h1 id="instructions">Obfsproxy Instructions</h1>
18 18
 
19
+    <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="client torrc"></a>
20
+
19 21
     <h3>Step 1: Install dependencies, obfsproxy, and Tor</h3>
20 22
     <br>
21 23
 
... ...
@@ -59,7 +61,8 @@
59 61
     <br>
60 62
 
61 63
     <p>
62
-    Add the appropriate lines to your tor configuration file:
64
+    Add the appropriate lines to your <a href="<page docs/faq>#torrc">tor
65
+    configuration file</a>:
63 66
     </p>
64 67
 
65 68
     <p>
... ...
@@ -69,19 +72,10 @@
69 72
     </p>
70 73
 
71 74
     <p>
72
-    Don't forget to replace <em>192.0.2.34</em> with the IP address of
73
-    the bridge you wish to use, and <em>34545</em> with the port
74
-    obfpsroxy is listening on.
75
-    </p>
76
-
77
-    <p>
78
-    Launch Tor using this configuration file. You can do this by using
79
-    your favorite init script, or by pointing the Tor binary to the
80
-    torrc file:
75
+    Don't forget to replace <em>192.0.2.34:34545</em> with the IP address
76
+    and port that the bridge's obfsproxy is listening on.
81 77
     </p>
82 78
 
83
-    <img src="$(IMGROOT)/obfs-spawn_tor_client.png" alt="spawn tor" height="101" width="882">
84
-
85 79
     <p> <br>
86 80
     <img src="$(IMGROOT)/sidenav-arrow.png">
87 81
     <strong>Congratulations!</strong> Your traffic should now be
... ...
@@ -98,7 +92,8 @@
98 92
     <br>
99 93
 
100 94
     <p>
101
-    Add the appropriate lines to your tor configuration file:
95
+    Add the appropriate lines to your <a href="<page docs/faq>#torrc">tor
96
+    configuration file</a>:
102 97
     </p>
103 98
 
104 99
     <p>
105 100