Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/usr.bin/ftp/ftp.1,v
rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/ftp/ftp.1,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.123.4.1
retrieving revision 1.124
diff -u -p -r1.123.4.1 -r1.124
--- src/usr.bin/ftp/ftp.1	2008/05/18 12:36:05	1.123.4.1
+++ src/usr.bin/ftp/ftp.1	2008/05/02 18:11:06	1.124
@@ -1,4 +1,4 @@
-.\" 	$NetBSD: ftp.1,v 1.123.4.1 2008/05/18 12:36:05 yamt Exp $
+.\" 	$NetBSD: ftp.1,v 1.124 2008/05/02 18:11:06 martin Exp $
 .\"
 .\" Copyright (c) 1996-2007 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -57,7 +57,7 @@
 .\"
 .\"	@(#)ftp.1	8.3 (Berkeley) 10/9/94
 .\"
-.Dd May 10, 2008
+.Dd August 6, 2007
 .Dt FTP 1
 .Os
 .Sh NAME
@@ -488,12 +488,12 @@ Toggle command line editing, and context
 completion.
 This is automatically enabled if input is from a terminal, and
 disabled otherwise.
-.It Ic epsv epsv4 epsv6
+.It Ic epsv4
 Toggle the use of the extended
 .Dv EPSV
 and
 .Dv EPRT
-commands on all IP, IPv4, and IPv6 connections respectively.  First try
+commands on IPv4 connections; first try
 .Dv EPSV /
 .Dv EPRT ,
 and then
@@ -502,10 +502,7 @@ and then
 This is enabled by default.
 If an extended command fails then this option will be temporarily
 disabled for the duration of the current connection, or until
-.Ic epsv ,
-.Ic epsv4 ,
-or
-.Ic epsv6
+.Ic epsv4
 is executed again.
 .It Ic exit
 A synonym for