[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 11/17: doc/meref.me: Sync copyright, license with 4.4BSD.
From: |
G. Branden Robinson |
Subject: |
[groff] 11/17: doc/meref.me: 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 d2141b0e36a595110938180f57576b17f1ed571f
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Aug 8 04:28:59 2021 +1000
doc/meref.me: Sync copyright, license with 4.4BSD.
...and the William Hoskins advertising clause rescission.
See <https://svnweb.freebsd.org/csrg/share/doc/usd/20.meref/\
ref.me?view=log>.
Not much changed in this document after groff forked it circa 1990, when
it bore an SCCS revision of 6.4.
Here's the subsequent history of the file.
6.5 Copyright/license update.
6.6 Author's address update. Inapplicable; removed in the groff
version in commit ba109479a, 25 Jul 2020.
6.7 Document numbering changes for 4.4BSD. Present but commented
out in groff version.
8.1 Copyright/license update.
8.2 Page breaks for the 4.4BSD manuals.
---
doc/meref.me | 50 ++++++++++++++++++++++++++++++++++----------------
1 file changed, 34 insertions(+), 16 deletions(-)
diff --git a/doc/meref.me b/doc/meref.me
index dc622b9..7e7f7af 100644
--- a/doc/meref.me
+++ b/doc/meref.me
@@ -1,19 +1,35 @@
-.\" Copyright (c) 1986 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1986, 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.
.\"
-.\" @(#)ref.me 6.4 (Berkeley) 7/17/89
+.\" 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.
+.\"
+.\" @(#)ref.me 8.2 (Berkeley) 06/01/94
.\"
.\" Modified by jjc@jclark.com for groff.
.\"UC 7
@@ -57,8 +73,8 @@
.b "\e*\\$1" "\\$2"
..
.\"sc
-.\"eh 'USD:23-%''\-me Reference Manual'
-.\"oh '\-me Reference Manual''USD:23-%'
+.\"eh 'USD:20-%''\-me Reference Manual'
+.\"oh '\-me Reference Manual''USD:20-%'
.+c
.ce 20
.sz 14
@@ -917,7 +933,9 @@ inside keeps.
.b .)c
.DE
End centered block.
+.sp .5
.sh 1 Annotations
+.sp .5
.TL
.b .(d
.DE
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 11/17: doc/meref.me: Sync copyright, license with 4.4BSD.,
G. Branden Robinson <=