[or-cvs] [tor/release-0.2.2] Describe tor-resolve defaults. Bug 2364.

[arma at torproject.org]

commit 732275bb81992c33d6b707b64e621f161b97622a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jan 9 15:40:40 2011 -0500

    Describe tor-resolve defaults. Bug 2364.
---
 changes/bug2364       |    4 ++++
 doc/tor-resolve.1.txt |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/changes/bug2364 b/changes/bug2364
new file mode 100644
index 0000000..37de6ef
--- /dev/null
+++ b/changes/bug2364
@@ -0,0 +1,4 @@
+  o Documentation
+    - Document the default socks host and port (127.0.0.1:9050) for
+      tor-resolve.
+
diff --git a/doc/tor-resolve.1.txt b/doc/tor-resolve.1.txt
index eb51966..bdc636b 100644
--- a/doc/tor-resolve.1.txt
+++ b/doc/tor-resolve.1.txt
@@ -19,6 +19,10 @@ DESCRIPTION
 **tor-resolve** is a simple script to connect to a SOCKS proxy that knows about
 the SOCKS RESOLVE command, hand it a hostname, and return an IP address.
 
+By default, **tor-resolve** uses the Tor server running on 127.0.0.1 on SOCKS
+port 9050.  If this isn't what you want, you should specify an explicit
+__sockshost__ and/or __socksport__ on the command line.
+
 OPTIONS
 -------
 **-v**::
@@ -42,4 +46,4 @@ See doc/socks-extensions.txt in the Tor package for protocol details.
 
 AUTHORS
 -------
-Roger Dingledine <arma at mit.edu>, Nick Mathewson <nickm at alum.mit.edu>.
\ No newline at end of file
+Roger Dingledine <arma at mit.edu>, Nick Mathewson <nickm at alum.mit.edu>.