[tor-commits] [obfsproxy/master] Documentation updates.

[nickm at torproject.org]

commit 835464e0d6bd025faa74ff429610e970bec25933
Author: George Kadianakis <desnacked at gmail.com>
Date:   Thu Jun 9 17:27:56 2011 +0200

    Documentation updates.
    
    * Tweaked tor-obfs-howto.txt for the new cli.
    * Fixed a comment in main.c
---
 doc/tor-obfs-howto.txt |    6 +++---
 src/main.c             |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/tor-obfs-howto.txt b/doc/tor-obfs-howto.txt
index 36ad7a3..ed8ba72 100644
--- a/doc/tor-obfs-howto.txt
+++ b/doc/tor-obfs-howto.txt
@@ -50,11 +50,11 @@ Our port setup will be like this:
 
 This command will setup an obfsproxy socks client listening to the
 obfs2 protocol on localhost:1050:
-./obfsproxy socks obfs2 127.0.0.1:1050
+./obfsproxy obfs2 socks 127.0.0.1:1050
 
 This command will setup an obfsproxy server listening to the
-obfs2 protocol on localhost:5001:
-./obfsproxy server obfs2 127.0.0.1:1051 127.0.0.1:5001
+obfs2 protocol on localhost:1051:
+./obfsproxy obfs2 --dest 127.0.0.1:5001 server 127.0.0.1:1051
 
         Setting up Tor:
 
diff --git a/src/main.c b/src/main.c
index e7680d5..8617bb3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -112,8 +112,8 @@ main(int argc, const char **argv)
   /* This is an integer! It contains the number of protocols that we
      managed to recognize, by their protocol name.  Of course it's not
      the *actual* actual_protocols since some of them could have wrong
-     options or arguments, but this will be resolved by
-     set_up_protocol() and listener_new(). */
+     options or arguments, but this will be resolved per-protocol by
+     set_up_protocol(). */
   int actual_protocols=0;
 
   int start;