pidfile should be an argument not a configuration option

3 files changed, 7 insertions, 8 deletions

diff --git a/doc/clamsmtpd.8 b/doc/clamsmtpd.8
index 8ee3d80..2317b59 100644
--- a/doc/clamsmtpd.8
+++ b/doc/clamsmtpd.8
@@ -44,6 +44,7 @@
 .Nm
 .Op Fl d Ar level
 .Op Fl f Ar configfile
+.Op Fl p Ar pidfile
 .Nm 
 .Fl v
 .Sh DESCRIPTION
@@ -79,6 +80,12 @@ specifies an alternate location for the
 configuration file. See 
 .Xr clamsmtpd.conf 5
 for more details on where the configuration file is located by default.
+.It Fl p
+.Ar pidfile
+specifies a location for the a process id file to be written to. This file 
+contains the process id of 
+.Nm 
+and can be used to stop the daemon.
 .It Fl v
 Prints the clamsmtp version number and exits.
 .El
diff --git a/doc/clamsmtpd.conf b/doc/clamsmtpd.conf
index 979103c..18ff33a 100644
--- a/doc/clamsmtpd.conf
+++ b/doc/clamsmtpd.conf
@@ -35,6 +35,4 @@ OutAddress: 10026
 # Whether or not to keep virus files
 #Quarantine: off
 
-# The location for a pid file for stopping clamsmtpd
-#PidFile: (none)
 
diff --git a/doc/clamsmtpd.conf.5 b/doc/clamsmtpd.conf.5
index 5a7e521..1a6cd99 100644
--- a/doc/clamsmtpd.conf.5
+++ b/doc/clamsmtpd.conf.5
@@ -96,12 +96,6 @@ character or number):
 .It Ar MaxConnections
 Specifies the maximum number of connections to accept at once. 
 [ Default: 64 ]
-.It Ar PidFile
-This option causes 
-.Xr clamsmtpd 8
-to write a file with the daemon's process id, which can be used to stop the 
-daemon.
-[ Optional ]
 .It Ar ScanHeader
 A header to add to scanned messages. Put an empty value to supress adding
 a header.