Replace TPUM license with standard BSD-style license

1 files changed, 31 insertions, 23 deletions

diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 4c0a1c607e9..b8d410a003c 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,31 +1,39 @@
-.\" $OpenBSD: magic.5,v 1.7 2003/02/15 09:44:42 jmc Exp $
+.\" $OpenBSD: magic.5,v 1.8 2003/03/11 21:26:26 ian Exp $
 .\"
 .\" @(#)$FreeBSD: src/usr.bin/file/magic.5,v 1.11 2000/03/01 12:19:39 sheldonh Exp $
 .\"
 .\" install as magic.4 on USG, magic.5 on V7 or Berkeley systems.
 .\"
-.\" Copyright (c) Ian F. Darwin, 1987.
-.\" Written by Ian F. Darwin.
-.\"
-.\" This software is not subject to any license of the American Telephone
-.\" and Telegraph Company or of the Regents of the University of California.
-.\"
-.\" 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:
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" 4. This notice may not be removed or altered.
+.\" Copyright (c) Ian F. Darwin 1986-1995.
+.\" Software written by Ian F. Darwin and others;
+.\" maintained 1995-present by Christos Zoulas and others.
+.\" 
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice immediately at the beginning of the file, without modification,
+.\"    this list of conditions, and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"    This product includes software developed by Ian F. Darwin and others.
+.\" 4. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"  
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .Dd September 3, 1994
 .Dt MAGIC 5