diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-03-27 18:10:39 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-03-27 18:10:39 +0000 |
commit | 0383b042ec78518838e9c7faf713ed09c8414734 (patch) | |
tree | afe168af1232ce7b57df3ebc6f76f7ca70dc9db1 | |
parent | 5648db306239bd78ec668cf7a73ca3435a06b9c6 (diff) |
From David Krause:
o ftpd.8: alphabetically sort FILES and add login.conf & motd
o midi.4 and pckbd.4: there is no pcppi(4) man page
o passwd.5: s/passwd.conf/login.conf
-rw-r--r-- | libexec/ftpd/ftpd.8 | 18 | ||||
-rw-r--r-- | share/man/man4/midi.4 | 3 | ||||
-rw-r--r-- | share/man/man4/pckbd.4 | 6 | ||||
-rw-r--r-- | share/man/man5/passwd.5 | 6 |
4 files changed, 17 insertions, 16 deletions
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index 19810f60c18..58679d0c7f3 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ftpd.8,v 1.49 2002/03/16 19:15:12 millert Exp $ +.\" $OpenBSD: ftpd.8,v 1.50 2002/03/27 18:10:37 millert Exp $ .\" $NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $ .\" .\" Copyright (c) 1985, 1988, 1991, 1993 @@ -499,20 +499,24 @@ is used. .El .Sh FILES .Bl -tag -width /var/run/ftpd.pid -compact -.It Pa /etc/ftpusers -list of unwelcome/restricted users .It Pa /etc/ftpchroot list of normal users who should be chrooted +.It Pa /etc/ftpusers +list of unwelcome/restricted users .It Pa /etc/ftpwelcome welcome notice +.It Pa /etc/login.conf +authentication styles +.It Pa /etc/motd +printed after a successful login .It Pa /etc/nologin displayed and access refused -.It Pa /var/run/utmp -list of users on the system -.It Pa /var/run/ftpd.pid -process ID if running in daemon mode .It Pa /var/log/ftpd log file for anonymous downloads +.It Pa /var/run/ftpd.pid +process ID if running in daemon mode +.It Pa /var/run/utmp +list of users on the system .El .Sh SEE ALSO .Xr ftp 1 , diff --git a/share/man/man4/midi.4 b/share/man/man4/midi.4 index 41a6335b315..d7aaf592e4b 100644 --- a/share/man/man4/midi.4 +++ b/share/man/man4/midi.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: midi.4,v 1.9 2001/11/26 16:51:48 mickey Exp $ +.\" $OpenBSD: midi.4,v 1.10 2002/03/27 18:10:38 millert Exp $ .\" $NetBSD: midi.4,v 1.4 1998/08/22 14:45:35 augustss Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -106,7 +106,6 @@ interface. .Xr audio 4 , .Xr autri 4 , .Xr opl 4 , -.Xr pcppi 4 , .Xr sb 4 , .Xr wss 4 .Sh HISTORY diff --git a/share/man/man4/pckbd.4 b/share/man/man4/pckbd.4 index 7f043dd7b8c..00eb4e22f3d 100644 --- a/share/man/man4/pckbd.4 +++ b/share/man/man4/pckbd.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pckbd.4,v 1.11 2002/02/18 18:13:32 jason Exp $ +.\" $OpenBSD: pckbd.4,v 1.12 2002/03/27 18:10:38 millert Exp $ .\" $NetBSD: pckbd.4,v 1.3 1999/12/21 11:31:07 drochner Exp $ .\" .Dd March 20, 1999 @@ -132,8 +132,7 @@ with the ALT modifier are prefixed by an ESC character. Because PC keyboard hardware doesn't contain a beeper, requests for .Dq keyboard beeps cannot be handled directly. -On alpha and i386 a helper device attached to the -.Xr pcppi 4 +On alpha and i386 a helper device attached to the pcppi driver allows to use the standard ISA speaker for this purpose. .Sh EXAMPLES To set a german keyboard layout without @@ -147,7 +146,6 @@ to the kernel configuration file. .Sh SEE ALSO .Xr isa 4 , .Xr pckbc 4 , -.Xr pcppi 4 , .Xr wskbd 4 , .Xr wsconsctl 8 .Sh BUGS diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5 index 86a42d918c6..447d40b82fa 100644 --- a/share/man/man5/passwd.5 +++ b/share/man/man5/passwd.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: passwd.5,v 1.22 2002/01/24 21:25:18 mickey Exp $ +.\" $OpenBSD: passwd.5,v 1.23 2002/03/27 18:10:38 millert Exp $ .\" $NetBSD: passwd.5,v 1.4 1995/07/28 06:46:05 phil Exp $ .\" .\" Copyright (c) 1988, 1991, 1993 @@ -124,7 +124,7 @@ without appropriate privileges. .Pp Which type of cipher is used to encrypt the password information depends on the configuration in -.Xr passwd.conf 5 . +.Xr login.conf 5 . It can be different for local and YP passwords. .Pp The @@ -261,8 +261,8 @@ containing: .Xr login 1 , .Xr passwd 1 , .Xr getpwent 3 , +.Xr login.conf 5 , .Xr netgroup 5 , -.Xr passwd.conf 5 , .Xr adduser 8 , .Xr pwd_mkdb 8 , .Xr vipw 8 , |