[tor-commits] [tor/master] Update the torify.1 manpage

[arma at torproject.org]

commit 5860f0a7c8ec6aa9eb542a86b828f69e20251c98
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 26 15:45:39 2017 -0400

    Update the torify.1 manpage
    
    I went into this to fix 6892 and say "we don't do anything for
    circuit isolation."  But instead I did a fair amount of text-removal
    to stop implying that torify does anything more than call torsocks.
---
 changes/torify-manpage |  3 +++
 doc/torify.1.txt       | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/changes/torify-manpage b/changes/torify-manpage
new file mode 100644
index 0000000..f8bf56c
--- /dev/null
+++ b/changes/torify-manpage
@@ -0,0 +1,3 @@
+  o Documentation:
+    - Clarify the manpage for the (deprecated) torify script. Closes
+      ticket 6892.
diff --git a/doc/torify.1.txt b/doc/torify.1.txt
index 8dca901..614e3f6 100644
--- a/doc/torify.1.txt
+++ b/doc/torify.1.txt
@@ -17,25 +17,25 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-**torify** is a simple wrapper that attempts to find the best underlying Tor
-wrapper available on a system. It calls torsocks with a tor specific
-configuration file. +
+**torify** is a simple wrapper that 
+calls torsocks with a tor-specific
+configuration file.
 
-torsocks is an improved wrapper that explicitly rejects UDP, safely resolves DNS
-lookups and properly socksifies your TCP connections. +
-
-Please note that since both method use LD_PRELOAD, torify cannot be applied to
-suid binaries.
+It is provided for backward compatibility; probably instead you should
+just use torsocks.
 
 WARNING
 -------
-When used with torsocks, torify should not leak DNS requests or UDP data. +
+When used with torsocks, torify should not leak DNS requests or UDP data.
+
+torify can leak ICMP data.
 
-Both will leak ICMP data.
+torify will not ensure that different requests are processed on
+different circuits.
 
 SEE ALSO
 --------
-**tor**(1), **tor-resolve**(1), **torsocks**(1)
+**tor**(1), **torsocks**(1)
 
 AUTHORS
 -------