move the manual config above vidalia for users coming from the unix directions.
Andrew Lewman

Andrew Lewman commited on 2010-12-07 22:33:08
Zeige 1 geänderte Dateien mit 10 Einfügungen und 12 Löschungen.

... ...
@@ -57,6 +57,16 @@
57 57
     servers</a>.
58 58
     </li>
59 59
 
60
+    <strong>Manual Configuration</strong>:
61
+    <ul>
62
+    <li>Edit the bottom part of <a href="<wikifaq>#torrc">your torrc file</a>. If you want to be a public relay (recommended),
63
+    make sure to define ORPort and <a href="<wikifaq>#ExitPolicies">look at ExitPolicy</a>; otherwise
64
+    if you want to be a <a href="<wikifaq>#RelayOrBridge">bridge</a>
65
+    for users in countries that censor their Internet,
66
+    just use <a href="<page docs/bridges>#RunningABridge">these lines</a>.
67
+    </li>
68
+    </ul>
69
+
60 70
     <li><strong>Configuring Tor with the Vidalia Graphical Interface</strong>:
61 71
     <ol>
62 72
 
... ...
@@ -96,18 +106,6 @@ href="<wikifaq>#RelayOrBridge">bridge</a> for users in countries that censor the
96 106
     that the relay is working correctly.</li>
97 107
     </ol>
98 108
 
99
-    <br>
100
-    <strong>Manual Configuration</strong>:
101
-    <ul>
102
-    <li>Edit the bottom part of <a href="<wikifaq>#torrc">your torrc file</a>. If you want to be a public relay (recommended),
103
-    make sure to define ORPort and <a href="<wikifaq>#ExitPolicies">look at ExitPolicy</a>; otherwise
104
-    if you want to be a <a href="<wikifaq>#RelayOrBridge">bridge</a>
105
-    for users in countries that censor their Internet,
106
-    just use <a href="<page docs/bridges>#RunningABridge">these lines</a>.
107
-    </li>
108
-    
109
-    </ul></li>
110
-    
111 109
     <li>If you are using a firewall, open a hole in your firewall
112 110
     so incoming connections can reach the ports you configured
113 111
     (ORPort, plus DirPort if you enabled it). If you have a
114 112