Module Name: othersrc
Committed By: lukem
Date: Mon Jan 4 01:10:44 UTC 2010
Modified Files:
othersrc/libexec/tnftpd/src: ftpd.conf.manin tnftpd.manin
Log Message:
update from ftpd.conf.5 / ftpd.8
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/libexec/tnftpd/src/ftpd.conf.manin \
othersrc/libexec/tnftpd/src/tnftpd.manin
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/libexec/tnftpd/src/ftpd.conf.manin
diff -u othersrc/libexec/tnftpd/src/ftpd.conf.manin:1.1 othersrc/libexec/tnftpd/src/ftpd.conf.manin:1.2
--- othersrc/libexec/tnftpd/src/ftpd.conf.manin:1.1 Sun Sep 21 16:21:13 2008
+++ othersrc/libexec/tnftpd/src/ftpd.conf.manin Mon Jan 4 01:10:43 2010
@@ -1,5 +1,5 @@
-.\" $NetBSD: ftpd.conf.manin,v 1.1 2008/09/21 16:21:13 lukem Exp $
-.\" from NetBSD: ftpd.conf.5,v 1.36 2008/09/13 02:41:52 lukem Exp
+.\" $NetBSD: ftpd.conf.manin,v 1.2 2010/01/04 01:10:43 lukem Exp $
+.\" from NetBSD: ftpd.conf.5,v 1.37 2009/04/09 02:25:45 joerg Exp
.\"
.\" Copyright (c) 1997-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -210,9 +210,7 @@
to
.Ar type
(see above).
-.It Xo Sy conversion Ar class
-.Ar suffix Op Ar "type disable command"
-.Xc
+.It Sy conversion Ar class Ar suffix Op Ar "type disable command"
Define an automatic in-line file conversion.
If a file to retrieve ends in
.Ar suffix ,
@@ -345,9 +343,7 @@
and
.Sy CHROOT
users.
-.It Xo Sy limit Ar class
-.Op Ar count Op Ar file
-.Xc
+.It Sy limit Ar class Op Ar count Op Ar file
Limit the maximum number of concurrent connections for
.Ar class
to
@@ -476,9 +472,7 @@
.Sy EPSV )
connections.
Otherwise, enable them.
-.It Sy portrange Ar class Oo
-.Ar min Ar max
-.Oc
+.It Sy portrange Ar class Op Ar min Ar max
Set the range of port number which will be used for the passive data port.
.Ar max
must be greater than
Index: othersrc/libexec/tnftpd/src/tnftpd.manin
diff -u othersrc/libexec/tnftpd/src/tnftpd.manin:1.1 othersrc/libexec/tnftpd/src/tnftpd.manin:1.2
--- othersrc/libexec/tnftpd/src/tnftpd.manin:1.1 Sun Sep 21 16:21:13 2008
+++ othersrc/libexec/tnftpd/src/tnftpd.manin Mon Jan 4 01:10:43 2010
@@ -1,5 +1,5 @@
-.\" $NetBSD: tnftpd.manin,v 1.1 2008/09/21 16:21:13 lukem Exp $
-.\" from NetBSD: ftpd.8,v 1.82 2008/09/21 06:20:46 lukem Exp
+.\" $NetBSD: tnftpd.manin,v 1.2 2010/01/04 01:10:43 lukem Exp $
+.\" from NetBSD: ftpd.8,v 1.85 2009/05/01 10:53:27 wiz Exp
.\"
.\" Copyright (c) 1997-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -57,7 +57,7 @@
.\"
.\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94
.\"
-.Dd September 21, 2008
+.Dd May 1, 2009
.Dt TNFTPD 8
.Os
.Sh NAME
@@ -279,8 +279,7 @@
.Pa xferlog
file suitable for input into a third-party log analysis tool with a command
similar to:
-.Dl "grep 'xferlog: ' /var/log/xferlog | \e"
-.Dl "\ \ \ sed -e 's/^.*xferlog: //' \*[Gt] wuxferlog"
+.Dl "sed -ne 's/^.*xferlog: //p' /var/log/xferlog \*[Gt] wuxferlog"
.El
.Pp
The file
@@ -314,7 +313,7 @@
.Tn FTP
requests.
The case of the requests is ignored.
-.Bl -column "Request" -offset indent
+.Bl -column "Request" "Description" -offset indent
.It Sy Request Ta Sy Description
.It ABOR Ta "abort previous command"
.It ACCT Ta "specify account (ignored)"
@@ -368,7 +367,7 @@
.Ux
specific commands are supported by the SITE request.
.Pp
-.Bl -column Request -offset indent
+.Bl -column Request Description -offset indent
.It Sy Request Ta Sy Description
.It CHMOD Ta "change mode of a file, e.g. ``SITE CHMOD 755 filename''"
.It HELP Ta "give help information."
@@ -869,5 +868,5 @@
the current transfer
.Sy TYPE
is
-.Sq Li A
+.Sq Li A
(ASCII).
