@@ -1,3 +1,7 @@

+Wed Dec 13 16:54:38 GMT 2006 (njh)

+----------------------------------

+  * clamav-milter:	Clarified the meaning of the --postmaster-only option

+

 Wed Dec 13 13:51:32 GMT 2006 (njh)

 ----------------------------------

   * libclamav/blob.c:	Fix a performance issue raised by Steve Basford,

@@ -24,7 +24,7 @@

  *

  * For installation instructions see the file INSTALL that came with this file

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.303 2006/12/11 09:36:02 njh Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.304 2006/12/13 16:54:21 njh Exp $";

 #define	CM_VERSION	"devel-111206"

@@ -567,7 +567,7 @@ help(void)

 	puts(_("\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers."));

 	puts(_("\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."));

 	puts(_("\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."));

-	puts(_("\t--postmaster-only\t-P\tSend warnings only to the postmaster."));

+	puts(_("\t--postmaster-only\t-P\tSend notifications only to the postmaster."));

 	puts(_("\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions."));

 	puts(_("\t--quarantine=USER\t-Q EMAIL\tQuarantine e-mail account."));

 	puts(_("\t--report-phish=EMAIL\t-r EMAIL\tReport phish to this email address."));

@@ -162,17 +162,19 @@ if the User option is set in

 then that user must have the rights to create the file.

 .TP

 \fB-p, \-\-postmaster=EMAILADDRESS\fR

-Sets the e-mail address to send notifications to when the \-\-quiet option

-is not given.

+Sets the e-mail address that receives notifications of viruses caught,

+when the \-\-quiet option is not given.

 .TP

 \fB-P, \-\-postmaster-only\fR

 When the \-\-quiet option is not given, send a notification to the postmaster.

-Setting this flag will include the ID of the message which can ease searching

-through system logs if the administrator believes it is a locally sourced

-virus.

+Setting this flag will include the ID of the message in the email's body

+which can ease searching through system logs if the administrator believes it

+is a locally sourced virus.

+Without this option, the intended recipient of the email will also receive a

+copy of the notification of the interception.

 .TP

 \fB-q, \-\-quiet\fR

-Don't send any warning messages when a virus or worm or is detected.

+Don't send any notification messages when a virus or worm is detected.

 This option overrides the \-\-bounce and \-\-postmaster-only options, and is

 the way to turn off notification to the postmaster.

 .TP