diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2000-10-01 02:03:50 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2000-10-01 02:03:50 +0000 |
commit | 1bbf49b55a2601a4b47f84ef0db64d5bbc97608f (patch) | |
tree | 8243eef774bd2693d62f2204f2be075a5b646c32 /contrib/sendmail/mail.local/mail.local.8 | |
parent | 0cc8aac437ca5de8f94291323499241c949261f9 (diff) | |
download | FreeBSD-src-1bbf49b55a2601a4b47f84ef0db64d5bbc97608f.zip FreeBSD-src-1bbf49b55a2601a4b47f84ef0db64d5bbc97608f.tar.gz |
Fix conflicts from merge of sendmail 8.11.1
Diffstat (limited to 'contrib/sendmail/mail.local/mail.local.8')
-rw-r--r-- | contrib/sendmail/mail.local/mail.local.8 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/contrib/sendmail/mail.local/mail.local.8 b/contrib/sendmail/mail.local/mail.local.8 index 246a952..2c21239 100644 --- a/contrib/sendmail/mail.local/mail.local.8 +++ b/contrib/sendmail/mail.local/mail.local.8 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +.\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. .\" All rights reserved. .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -8,17 +8,17 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: mail.local.8,v 8.14 1999/08/26 15:49:20 ca Exp $ +.\" $Id: mail.local.8,v 8.14.14.3 2000/09/17 17:04:25 gshapiro Exp $ .\" .\" $FreeBSD$ .\" -.TH MAIL.LOCAL 8 "$Date: 1999/08/26 15:49:20 $" +.TH MAIL.LOCAL 8 "$Date: 2000/09/17 17:04:25 $" .SH NAME .B mail.local \- store mail in a mailbox .SH SYNOPSIS .B mail.local -.RB [ \-7 "] [" \-B "] [" \-d "] [" \-l "] [" \-s "] [" \-f +.RB [ \-7 "] [" \-B "] [" \-b "] [" \-d "] [" \-l "] [" \-s "] [" \-f .IR from "] " "user ..." .SH DESCRIPTION .B Mail.local @@ -109,6 +109,12 @@ flock(2), getservbyname(3), comsat(8), sendmail(8) +.SH WARNING +.B mail.local +escapes only "^From " lines that follow an empty line. +If all lines starting with "From " should be escaped, +use the 'E' flag for the local mailer in the +sendmail.cf file. .SH HISTORY A superset of .B mail.local |