===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/file/file.1,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- src/usr.bin/file/file.1	2000/03/23 21:10:16	1.9
+++ src/usr.bin/file/file.1	2000/07/26 16:55:05	1.10
@@ -1,4 +1,4 @@
-.\" $OpenBSD: file.1,v 1.9 2000/03/23 21:10:16 aaron Exp $
+.\" $OpenBSD: file.1,v 1.10 2000/07/26 16:55:05 ian Exp $
 .\" $FreeBSD: src/usr.bin/file/file.1,v 1.16 2000/03/01 12:19:39 sheldonh Exp $
 .Dd July 30, 1997
 .Dt FILE 1
@@ -233,9 +233,8 @@
 the external list of magic number types.
 This slowed the program down slightly but made it a lot more flexible.
 .Pp
-This program, based on the System V version,
-was written by
-.An Ian Darwin
+This program, based on the System V version, was written by
+.An Ian F. Darwin Aq ian@darwinisys.com
 without looking at anybody else's source code.
 .Pp
 .An John Gilmore
@@ -244,12 +243,6 @@
 .An Geoff Collyer
 found several inadequacies
 and provided some magic file entries.
-The program has undergone continued evolution since.
-.Sh AUTHORS
-Written by
-.An Ian F. Darwin Aq ian@sq.com ,
-UUCP address {utzoo | ihnp4}!darwin!ian,
-postal address: P.O. Box 603, Station F, Toronto, Ontario, CANADA M4Y 2L8.
 .Pp
 Altered by
 .An Rob McMahon Aq cudcv@warwick.ac.uk ,
@@ -297,58 +290,13 @@
 .Nm file .
 .El
 .Pp
-Changes by
-.An Ian Darwin
-and various authors including
-.An Christos Zoulas Aq christos@deshaw.com ,
-1990-1992.
+Currently maintained by
+.An Christos Zoulas Aq christos@zoulas.com .
 .Sh LEGAL NOTICE
-Copyright (c) Ian F. Darwin, Toronto, Canada,
-1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993.
+Copyright (c) Ian F. Darwin, Toronto, Canada, 1986-1999.
+Covered by the standard Berkeley Software Distribution copyright; see the file
+LEGAL.NOTICE in the distribution.
 .Pp
-This software is not subject to and may not be made subject to any
-license of the American Telephone and Telegraph Company, Sun
-Microsystems Inc., Digital Equipment Inc., Lotus Development Inc., the
-Regents of the University of California, The X Consortium or MIT, or
-The Free Software Foundation.
-.Pp
-This software is not subject to any export provision of the United States
-Department of Commerce, and may be exported to any country or planet.
-.Pp
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it freely, subject
-to the following restrictions:
-.Bl -enum -offset indent
-.It
-The author is not responsible for the consequences of use of this
-software, no matter how awful, even if they arise from flaws in it;
-.It
-The origin of this software must not be misrepresented, either by
-explicit claim or by omission.
-Since few users ever read sources,
-credits must appear in the documentation;
-.It
-Altered versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-Since few users ever read sources, credits must appear in the documentation;
-.It
-This notice may not be removed or altered.
-.El
-.Pp
-A few support files
-.Pf ( Fn getopt ,
-.Fn strtok )
-distributed with this package
-are by
-.An Henry Spencer
-and are subject to the same terms as above.
-.Pp
-A few simple support files
-.Pf ( Fn strtol ,
-.Fn strchr )
-distributed with this package
-are in the public domain; they are so marked.
-.Pp
 The files
 .Pa tar.h
 and
@@ -357,7 +305,7 @@
 .An John Gilmore
 from his public-domain
 .Nm tar
-program, and are not covered by the above restrictions.
+program.
 .Sh BUGS
 There must be a better way to automate the construction of the Magic
 file from all the glop in Magdir.