2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f95f561f8..ab4173e56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20060315
+ - (djm) OpenBSD CVS Sync:
+   - msf@cvs.openbsd.org 2006/02/06 15:54:07
+     [ssh.1]
+     - typo fix
+     ok jmc@
+
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
    since not all platforms support it.  Instead, use internal equivalent while
@@ -3898,4 +3905,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.4139 2006/03/13 08:06:51 dtucker Exp $
+$Id: ChangeLog,v 1.4140 2006/03/15 00:05:35 djm Exp $
diff --git a/ssh.1 b/ssh.1
index f4c677628..895008139 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.253 2006/01/30 13:37:49 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.254 2006/02/06 15:54:07 msf Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -1087,7 +1087,7 @@ is set to
 .Dq forced-commands-only :
 .Bd -literal -offset 2n
 tunnel="1",command="sh /etc/netstart tun1" ssh-rsa ... jane
-tunnel="2",command="sh /etc/netstart tun1" ssh-rsa ... john
+tunnel="2",command="sh /etc/netstart tun2" ssh-rsa ... john
 .Ed
 .Pp
 Since a SSH-based setup entails a fair amount of overhead,