[groff] 14/17: doc/meintro.me: Sync copyright, license w/ 4.4BSD.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit f183638eb2187b10beaed60df5ce8e9dd08f07c0
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Aug 8 05:32:24 2021 +1000

    doc/meintro.me: Sync copyright, license w/ 4.4BSD.
    
    ...and the William Hoskins advertising clause rescission.
    
    See <https://svnweb.freebsd.org/csrg/share/doc/usd/19.memacros/\
    intro.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/meintro_fr.me: Also make parallel changes to our French
      translation of this document; comment the .ne requests to adjust the
      page breaks, since they're inapplicable (the ones for English might as
      well, or might need tuning, but on a quick inspection seem okay).
---
 doc/meintro.me    | 51 +++++++++++++++++++++++++++++++++++----------------
 doc/meintro_fr.me | 51 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/doc/meintro.me b/doc/meintro.me
index 31ec94f..cf8fb66 100644
--- a/doc/meintro.me
+++ b/doc/meintro.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.
 .\"
-.\"    @(#)intro.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.
+.\"
+.\"    @(#)intro.me    8.2 (Berkeley) 06/01/94
 .\"
 .\" Modified for groff by jjc@jclark.com.
 .\"UC 7
@@ -22,8 +38,8 @@
 .ds MO @VERSION@
 .nr si 3n
 .he 'USING GROFF AND \-ME''%'
-.\"eh 'USD:22-%''Writing Papers with NROFF using \-me'
-.\"oh 'Writing Papers with NROFF using \-me''USD:22-%'
+.\"eh 'USD:19-%''Writing Papers with NROFF using \-me'
+.\"oh 'Writing Papers with NROFF using \-me''USD:19-%'
 .ds U \s-1UNIX\s0
 .ds N \s-1NROFF\s0
 .ds T \s-1TROFF\s0
@@ -895,6 +911,7 @@ more lines
 \&.)c
 \&.)b
 .)b
+.ne 1i
 to produce:
 .(b L
 .(c
@@ -1180,6 +1197,7 @@ A word specified on the same line as
 is printed in the margin,
 and the body is lined up
 at a prespecified position
+.ne 1i
 (normally five spaces).
 For example,
 the input:
@@ -2174,6 +2192,7 @@ UNIX.
 .\" is a slow mechanical operation.
 .\" On laser printers it may require loading new fonts.
 .\" Size changes
+.\" .ne 1i
 .\" should be considered carefully.
 .sh 2 "Quotes"
 .pp
diff --git a/doc/meintro_fr.me b/doc/meintro_fr.me
index cc765f0..45209c1 100644
--- a/doc/meintro_fr.me
+++ b/doc/meintro_fr.me
@@ -1,21 +1,37 @@
 .\" -*- coding: utf-8 -*- (for preconv; for Emacs, see end of file)
 .\"
-.\" 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.
 .\"
-.\" @(#)intro.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.
+.\"
+.\"    @(#)intro.me    8.2 (Berkeley) 06/01/94
 .\"
 .\" Modified for groff by jjc@jclark.com.
 .\"
@@ -26,8 +42,8 @@
 .ds MO @VERSION@
 .nr si 3n
 .he 'GROFF EN OPTION \-ME''%'
-.\"eh 'USD:22-%''Writing Papers with NROFF using \-me'
-.\"oh 'Writing Papers with NROFF using \-me''USD:22-%'
+.\"eh 'USD:19-%''Writing Papers with NROFF using \-me'
+.\"oh 'Writing Papers with NROFF using \-me''USD:19-%'
 .ds U \s-1UNIX\s0
 .ds N \s-1NROFF\s0
 .ds T \s-1TROFF\s0
@@ -833,6 +849,7 @@ première ligne d'une mise en évidence non-justifiée
 lignes suivantes
 \&.)c
 \&.)b
+.\" .ne 1i
 .)b
 ce qui produira:
 .(b L
@@ -1144,6 +1161,7 @@ Un mot spécifié sur la même ligne que
 est imprimé dans la marge,
 et le corps du paragraphe est aligné
 sur une position prédéfinie
+.\" .ne 1i
 (normalement cinq espacements).
 Par exemple,
 l'entrée:
@@ -2148,6 +2166,7 @@ ce qui est plus joli que UNIX.
 .\" Sur les imprimantes laser, il faudra peut-être recharger de
 .\" nouvelles polices.
 .\" Dès lors les changements de tailles de caractères devraient être
+.\" .ne 1i
 .\" utilisés avec prudence.
 .sh 2 "Guillemets"
 .pp