2 files changed, 18 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4072f14ba..37cd66bd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,10 @@
    - jmc@cvs.openbsd.org 2005/12/22 10:31:40
      [ssh_config.5]
      put the description of "UsePrivilegedPort" in the correct place;
+   - jmc@cvs.openbsd.org 2005/12/22 11:23:42
+     [ssh.1]
+     expand the description of -w somewhat;
+     help/ok reyk
 
 20051220
  - (dtucker) OpenBSD CVS Sync
@@ -3531,4 +3535,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4047 2005/12/24 03:55:47 djm Exp $
+$Id: ChangeLog,v 1.4048 2005/12/24 03:56:04 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 36abe684a..c42d74eba 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.227 2005/12/21 12:53:31 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.228 2005/12/22 11:23:42 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -582,7 +582,18 @@ The maximum is 3.
 .It Fl w Ar tunnel : Ns Ar tunnel
 Requests a
 .Xr tun 4
-device on the client and server like the
+device on the client
+(first
+.Ar tunnel
+arg)
+and server
+(second
+.Ar tunnel
+arg).
+The devices may be specified by numerical ID or the keyword
+.Dq any ,
+which uses the next available tunnel device.
+See also the
 .Cm Tunnel
 directive in
 .Xr ssh_config 5 .