From e5c6339e78dd8f8c3008015308be2bc19cac8bb5 Mon Sep 17 00:00:00 2001
From: schwarze <schwarze@openbsd.org>
Date: Mon, 19 Oct 2015 19:08:44 +0000
Subject: [PATCH] Delete the empty example file "ftpchroot"; no example is
 needed. Move the one useful bit of information contained in the file ("one
 user name per line") to the ftpd(8) manual page where it belongs. OK deraadt@
 sthen@

---
 etc/Makefile           | 4 ++--
 etc/examples/ftpchroot | 4 ----
 libexec/ftpd/ftpd.8    | 5 +++--
 3 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 etc/examples/ftpchroot

diff --git a/etc/Makefile b/etc/Makefile
index f4d74dfa672..691116a7d42 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.410 2015/10/16 15:54:55 schwarze Exp $
+#	$OpenBSD: Makefile,v 1.411 2015/10/19 19:08:44 schwarze Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -37,7 +37,7 @@ MUTABLE=changelist csh.cshrc csh.login csh.logout daily \
 	pf.os protocols rc rc.conf rpc services shells syslog.conf weekly
 
 # -rw-r--r--
-EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports ftpchroot \
+EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports \
 	httpd.conf ifstated.conf inetd.conf \
 	man.conf mixerctl.conf mrouted.conf \
 	ntpd.conf printcap rbootd.conf remote sensorsd.conf
diff --git a/etc/examples/ftpchroot b/etc/examples/ftpchroot
deleted file mode 100644
index fb918794de1..00000000000
--- a/etc/examples/ftpchroot
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$OpenBSD: ftpchroot,v 1.1 2014/07/12 03:52:39 deraadt Exp $
-#
-# list of users (one per line) given ftp access to a chrooted area.
-# read by ftpd(8).
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index b01405af838..6ef51587906 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftpd.8,v 1.73 2015/01/15 19:06:32 schwarze Exp $
+.\"	$OpenBSD: ftpd.8,v 1.74 2015/10/19 19:08:44 schwarze Exp $
 .\"	$NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1988, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: January 15 2015 $
+.Dd $Mdocdate: October 19 2015 $
 .Dt FTPD 8
 .Os
 .Sh NAME
@@ -315,6 +315,7 @@ The user must have a standard shell as described by
 .It
 If the user name appears in the file
 .Pa /etc/ftpchroot ,
+which is a text file containing one user name per line,
 the session's root will be changed to the user's login directory by
 .Xr chroot 2
 as for an
-- 
2.20.1