add Berkeley copyright, -f flag

SCCS-vsn: usr.bin/from/from.1 6.3

diff --git a/usr/src/usr.bin/from/from.1 b/usr/src/usr.bin/from/from.1
index cd9108d..9e6b9ac 100644 (file)
--- a/usr/src/usr.bin/from/from.1
+++ b/usr/src/usr.bin/from/from.1
@@ -1,32 +1,44 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1980 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.\"    @(#)from.1      6.2 (Berkeley) %G%
+.\" Redistribution and use in source and binary forms are permitted
+.\" provided that the above copyright notice and this paragraph are
+.\" duplicated in all such forms and that any documentation,
+.\" advertising materials, and other materials related to such
+.\" distribution and use acknowledge that the software was developed
+.\" by the University of California, Berkeley.  The name of the
+.\" University may not be used to endorse or promote products derived
+.\" from this software without specific prior written permission.
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+.\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\"
+.\"    @(#)from.1      6.3 (Berkeley) %G%

 .\"
 .TH FROM 1 ""
 .UC 4
 .SH NAME
 .\"
 .TH FROM 1 ""
 .UC 4
 .SH NAME

-from \- who is my mail from?
+from \- who is mail from?

 .SH SYNOPSIS
 .B from
 [
 .B \-s
 sender
 .SH SYNOPSIS
 .B from
 [
 .B \-s
 sender

-]
-[
-user
-]
+][
+.B \-f
+file ] [ user ]

 .SH DESCRIPTION
 .I From
 .SH DESCRIPTION
 .I From

-prints out the mail header lines in your mailbox file
-to show you who your mail is from.
-If
+prints out the mail header lines from your mailbox.
+If either
+.I file
+or

 .I user
 .I user

-is specified, then \fIuser\fP's mailbox is examined instead of your own.
-If the -s option is given, then only headers for mail sent by
-.I sender
-are printed.
+is specified, then the supplied file, or \fIuser\fP's mailbox, is
+examined instead of your mailbox.
+.PP
+If the -s option is given, then only mail from addresses containing
+the supplied string are printed.

 .SH FILES
 /usr/spool/mail/*
 .SH "SEE ALSO"
 .SH FILES
 /usr/spool/mail/*
 .SH "SEE ALSO"