--- master.8	2002-05-25 21:57:48.000000000 +0200
+++ cyrusmaster.8	2002-09-29 12:50:37.000000000 +0200
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH MASTER 8 "Project Cyrus" CMU
+.TH CYRUSMASTER 8 "Project Cyrus" CMU
 .\" 
 .\" Copyright (c) 1996-2000 Carnegie Mellon University.  All rights reserved.
 .\"
@@ -41,9 +41,9 @@
 .\" 
 .\" $Id: master.8.diff,v 1.1 2002/10/11 14:51:49 raker Exp $
 .SH NAME
-master \- master Cyrus process
+cyrusmaster \- master Cyrus process
 .SH SYNOPSIS
-.B master
+.B cyrusmaster
 [
 .B \-l
 .I listen queue
@@ -52,7 +52,7 @@
 .B \-D
 ]
 .SH DESCRIPTION
-.I Master
+.I Cyrusmaster
 is the process that controls all of the Cyrus processes. This process
 is responsible for creating all imapd, pop3d, lmtpd and sieved child
 processes. This process also initializes the Berkeley DB code and
@@ -73,12 +73,12 @@
 Don't close stdin/stdout/stderr. Primiarly useful for debugging.
 .SH CONFIGURATION
 Upon execution,
-.I master
+.I cyrusmaster
 reads its configuration information out of the
 .IR cyrus.conf (5)
 file.
 .PP
-.I Master
+.I Cyrusmaster
 rereads its configuration file when it receives a hangup signal,
 SIGHUP.  Services and events may be added, deleted or modified when the
 configuration file is reread.  Any active services removed from the