groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 10/17: groff_me(7): Sync copyright, license with 4.4BSD.


From: G. Branden Robinson
Subject: [groff] 10/17: groff_me(7): Sync copyright, license with 4.4BSD.
Date: Sun, 8 Aug 2021 05:58:35 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit d06c8af11631ebf7a041544a4fd4202c9c5c56e1
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Aug 8 03:19:54 2021 +1000

    groff_me(7): Sync copyright, license with 4.4BSD.
    
    ...and the William Hoskins advertising clause rescission.
    
    See <https://svnweb.freebsd.org/csrg/share/me/me.7?view=log>.
    
    Not much changed in this man page after groff forked it circa 1990.
    
    The SCCS identifier claimed version 6.4 but the typo fix in that
    revision documented at the above URL was not present.  It looks like
    what we really had was revision 6.3.  Here's the subsequent history of
    the file.
    
    6.4 Grammar fix.  I independently made the same fix (among many
        others) in commit 23b606c7, 3 Nov 2017.
    6.5 Copyright/license update.
    6.6 "[M]ake groff happy".  This looks like "sed 's/^\.ti0/.ti 0/'".
        It is inapplicable and irrelevant to our version of the macro
        reference, which uses a tbl(1) table.
    8.1 Copyright notice update, adding year 1993.
---
 tmac/groff_me.7.man | 44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/tmac/groff_me.7.man b/tmac/groff_me.7.man
index c31a77c..0a0b2ca 100644
--- a/tmac/groff_me.7.man
+++ b/tmac/groff_me.7.man
@@ -9,22 +9,38 @@ roff
 .\" Legal Terms
 .\" ====================================================================
 .\"
-.\" Copyright (C) 1980 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (C) 1980, 1993
+.\"   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 MERCHANTABILITY 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. [Deleted.  See
+.\"     ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change]
+.\" 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.
 .\"
-.\"    @(#)me.7        6.4 (Berkeley) 4/13/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.
+.\"
+.\"    @(#)me.7        8.1 (Berkeley) 06/05/93
 .\"
 .\" Modified for groff by jjc@jclark.com
 .\" Changed to use TBL and eliminate low-level troff hackery by ESR



reply via email to

[Prev in Thread] Current Thread [Next in Thread]