[groff] 22/49: [me]: new copyright; att/bsd/shared

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 5a76e2e0e1a08138796ed9efd56eaa5e40f9beaa
Author: Keith Bostic <bostic>
AuthorDate: Wed Apr 17 15:31:46 1991 +0000

    [me]: new copyright; att/bsd/shared
    
    [Patch hand-hacked to inline the actual license.  My source for this
    change, <https://svnweb.freebsd.org/csrg/share/me/tmac.orig_me>, has
    only an SCCS file-inclusion mechanism instead, which is not appropriate
    for Git revision control.
    
      +.\" %sccs.include.redist.roff%
    
    (Don't freak re: the advertising clause; it gets retracted in 1999.)
    
    -- GBR]
---
 tmac/e.tmac-u | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/tmac/e.tmac-u b/tmac/e.tmac-u
index c1984cf..bccb496 100644
--- a/tmac/e.tmac-u
+++ b/tmac/e.tmac-u
@@ -1,19 +1,37 @@
 .\" Copyright (c) 1988 The Regents of the University of California.
 .\" All rights reserved.
 .\"
-.\" 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.
+.\" 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, 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its
+.\"    contributors may be used to endorse or promote products derived
+.\"    from this software without specific prior written permission.
 .\"
-.\"    @(#)e.tmac      2.34 (Berkeley) 06/02/90
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+.\"
+.\"    @(#)e.tmac      2.35 (Berkeley) 04/17/91
 .\"
 .\"    Modified by James Clark for use with groff.
 .\"
@@ -28,7 +46,7 @@
 .\"*           Electronics Research Laboratory                 *
 .\"*           U.C. Berkeley.                                  *
 .\"*                                                           *
-.\"*   VERSION 2.34    First Release: 11 Sept 1978             *
+.\"*   VERSION 2.35    First Release: 11 Sept 1978             *
 .\"*                                                           *
 .\"*   Documentation is available.                             *
 .\"*                                                           *