Finish repair of license file (old one still included here; now refer

to new one), and update my email and the current FTP addresses.

1 files changed, 8 insertions, 36 deletions

diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 35e9b778bf0..4d6052aa849 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: file.1,v 1.4 1997/02/09 23:58:20 millert Exp $
+.\" $OpenBSD: file.1,v 1.5 1999/03/30 01:21:22 ian Exp $
 .TH FILE 1 "Copyrighted but distributable"
 .SH NAME
 file
@@ -221,9 +221,7 @@ Geoff Collyer found several inadequacies
 and provided some magic file entries.
 The program has undergone continued evolution since.
 .SH AUTHOR
-Written by Ian F. Darwin, UUCP address {utzoo | ihnp4}!darwin!ian,
-Internet address ian@sq.com,
-postal address: P.O. Box 603, Station F, Toronto, Ontario, CANADA M4Y 2L8.
+Written by Ian F. Darwin, ian@darwinsys.com.
 .PP
 Altered by Rob McMahon, cudcv@warwick.ac.uk, 1989, to extend the `&' operator
 from simple `x&y != 0' to `x&y op z'.
@@ -250,34 +248,8 @@ the process running
 Changes by Ian Darwin and various authors including
 Christos Zoulas (christos@deshaw.com), 1990-1997.
 .SH LEGAL NOTICE
-Copyright (c) Ian F. Darwin, Toronto, Canada,
-1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993.
-.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:
-.PP 
-1. 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.
-.PP
-2. 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.
-.PP
-3. 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.
-.PP
-4. This notice may not be removed or altered.
+This program is distributed under the terms of the accompanying
+license file LEGAL.NOTICE.
 .PP
 A few support files (\fIgetopt\fP, \fIstrtok\fP)
 distributed with this package
@@ -359,7 +331,7 @@ This program is slower than some vendors' file commands.
 This manual page, and particularly this section, is too long.
 .SH AVAILABILITY
 You can obtain the original author's latest version by anonymous FTP
-on
-.B ftp.deshaw.com
-in the directory
-.I /pub/file/file-X.YY.tar.gz
+at
+.I ftp://ftp.astron.com/pub/file/
+with a name like
+.I file-X.YY.tar.gz .