--- cucipop.8.orig	Mon May 11 20:35:19 1998
+++ cucipop.8	Mon Mar 29 01:58:05 1999
@@ -48,12 +48,12 @@
 .SH NAME
 cucipop \- Cubic Circle POP3 daemon
 .SH SYNOPSIS
-.B /usr/sbin/cucipop
+.B !!PREFIX!!/libexec/cucipop
 .RB [ \-qaYdPUSDAT ]
 .RB [ "\-E \fIage\fP" ]
 .RB [ "\-p \fIport\fP" ]
 .br
-.B /usr/sbin/cucipop
+.B !!PREFIX!!/libexec/cucipop
 .B \-v
 .ad
 .SH DESCRIPTION
@@ -132,12 +132,12 @@
 .IR port .
 .SH EXAMPLES
 Typically
-.I pop-3
+.I pop3
 service is defined in
 .BR services (5)
 as follows:
 .Sx 1
-pop-3           110/tcp
+pop3           110/tcp
 .Ex
 In order to start cucipop from within
 .BR inetd (8),
@@ -145,46 +145,46 @@
 .BR inetd.conf (5)
 would be suitable:
 .Sx 1
-pop-3   stream  tcp     nowait  root    /usr/sbin/cucipop cucipop -Y
+pop3   stream  tcp     nowait  root    !!PREFIX!!/libexec/cucipop cucipop -Y
 .Ex
 If your site gets many hits from popclients, it would be preferable
 to start cucipop standalone as in:
 .Sx 1
-/usr/sbin/cucipop -Y
+!!PREFIX!!/libexec/cucipop -Y
 .Ex
 Your typical BOFH setting would be:
 .Sx 1
-/usr/sbin/cucipop -YaSE 6w
+!!PREFIX!!/libexec/cucipop -YaSE 6w
 .Ex
 .SH FILES
 .TP 2.3i
 .B /etc/passwd
 the default authentication
 .TP
-.B /etc/mail/vpop.db
+.B !!PREFIX!!/etc/vpop.db
 virtual host authentication, see the
 .BR makevpopdb (8)
 man page on how this file is created
 .TP
-.B /var/lib/cucipop/state.db
+.B /var/spool/cucipop/state.db
 AI state information and bulletin history
 .TP
-.B "/var/lib/cucipop/bulletins/\fInn\fP"
+.B "/var/spool/cucipop/bulletins/\fInn\fP"
 .B 00
 through
 .B 63
 optional bulletin files in regular mailbox format
 .TP
-.B /var/spool/mail/$LOGNAME
+.B /var/mail/$LOGNAME
 system mailbox
 .TP
-.B /var/spool/mail/virtual.dom.ain/$LOGNAME
+.B /var/mail/virtual.dom.ain/$LOGNAME
 virtual host system mailbox
 .TP
-.B /var/spool/mail/$LOGNAME.lock
+.B /var/mail/$LOGNAME.lock
 lockfile for the system mailbox
 .TP
-.B /var/spool/mail/virtual.dom.ain/$LOGNAME.lock
+.B /var/mail/virtual.dom.ain/$LOGNAME.lock
 lockfile for the virtual host system mailbox
 .TP
 .B _????`hostname`