We distribute less under a 2-term BSD-style license. Update COPYRIGHT

section based on less's LICENSE file.

1 files changed, 44 insertions, 36 deletions

diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index a9c9ff70604..2583cac6fc9 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,26 +1,27 @@
-.\"	$OpenBSD: less.1,v 1.4 2003/07/14 09:11:26 jmc Exp $
+.\"	$OpenBSD: less.1,v 1.5 2003/08/18 17:19:38 millert Exp $
 .\"
 .\" Copyright (C) 2002  Mark Nudelman
 .\"
-.\" less is part of the GNU project and is free software.
-.\" You can redistribute it and/or modify it
-.\" under the terms of either
-.\" (1) the GNU General Public License as published by
-.\" the Free Software Foundation; or (2) the Less License.
-.\" See the file README in the less distribution for more details
-.\" regarding redistribution.
-.\" You should have received a copy of the GNU General Public License
-.\" along with the source for less; see the file COPYING.
-.\" If not, write to the Free Software Foundation, 59 Temple Place,
-.\" Suite 330, Boston, MA  02111-1307, USA.
-.\" You should also have received a copy of the Less License;
-.\" see the file LICENSE.
-.\"
-.\" less is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-.\" or FITNESS FOR A PARTICULAR PURPOSE.
-.\" See the GNU General Public License for more details.
+.\" 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, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice in the documentation and/or other materials provided with 
+.\"    the distribution.
 .\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 January 17, 2003
 .Dt LESS 1
@@ -1698,24 +1699,31 @@ for the latest list of known bugs in this version of
 .Sh COPYRIGHT
 Copyright (C) 2002  Mark Nudelman
 .Pp
-less is part of the GNU project and is free software.
-You can redistribute it and/or modify it
-under the terms of either
-(1) the GNU General Public License as published by
-the Free Software Foundation; or (2) the Less License.
-See the file README in the less distribution for more details
-regarding redistribution.
-You should have received a copy of the GNU General Public License
-along with the source for less; see the file COPYING.
-If not, write to the Free Software Foundation, 59 Temple Place,
-Suite 330, Boston, MA  02111-1307, USA.
-You should also have received a copy of the Less License;
-see the file LICENSE.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+.Bl -enum -compact
+.It
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+.It
+Redistributions in binary form must reproduce the above copyright
+notice in the documentation and/or other materials provided with 
+the distribution.
+.El
 .Pp
-less is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License for more details.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR
+.Dq 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 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.
 .Sh AUTHORS
 .An Mark Nudelman Aq markn@greenwoodsoftware.com
 .br