commit d9bd0de0628ff3ac9d84409315ad6df38981f019 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 10:16:03 2012 -0400

Fix some manpage typos

This is based on a pair of patches from A. Costa. I couldn't apply those directly, since they changed the generated *roff files, not the asciidoc source.

Fixes Tor bug 6500 and Debian bug 683359. --- changes/bug6500 | 2 ++ doc/tor.1.txt | 4 ++-- doc/torify.1.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changes/bug6500 b/changes/bug6500 new file mode 100644 index 0000000..cac2054 --- /dev/null +++ b/changes/bug6500 @@ -0,0 +1,2 @@ + o Minor bugfixes: + - Fix some typos in the manpages. Patch from A. Costa. Fixes bug 6500. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 78c3487..e7ba848 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -169,7 +169,7 @@ GENERAL OPTIONS duty of that proxy to properly forward the traffic to the bridge. + + In its second form, when set along with a corresponding Bridge line, the Tor - client launches the pluggable transport proxy exacutable in + client launches the pluggable transport proxy executable in __path-to-binary__ using __options__ as its command-line options, and forwards its traffic to it. It's the duty of that proxy to properly forward the traffic to the bridge. @@ -1709,7 +1709,7 @@ DIRECTORY AUTHORITY SERVER OPTIONS

**V3BandwidthsFile** __FILENAME__:: V3 authoritative directories only. Configures the location of the - bandiwdth-authority generated file storing information on relays' measured + bandwidth-authority generated file storing information on relays' measured bandwidth capacities. (Default: unset)

**V3AuthUseLegacyKey** **0**|**1**:: diff --git a/doc/torify.1.txt b/doc/torify.1.txt index ca2c385..4a4be12 100644 --- a/doc/torify.1.txt +++ b/doc/torify.1.txt @@ -21,7 +21,7 @@ DESCRIPTION wrapper available on a system. It calls torsocks or tsocks with a tor specific configuration file. +

-torsocks is an improved wrapper that explictly rejects UDP, safely resolves DNS +torsocks is an improved wrapper that explicitly rejects UDP, safely resolves DNS lookups and properly socksifies your TCP connections. +

tsocks itself is a wrapper between the tsocks library and the application that