gbranden pushed a commit to branch master
in repository groff.
commit 876a6c0967b85f4cf5b8168cbc30eff7c48321d6
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu Dec 18 12:08:41 2025 -0600
[gdiffmk]: Revise provenance and license notices.
Elsewhere we are at pains to distinguish the status of materials in
"contrib/" as "not being part of groff", so it's confusing to contradict
that inside gdiffmk's own files.
Revise and parallelize these disclosures of provenance.
Stylistically tweak comment blocks involving legal notices to make them
cohere and to distinguish commentary on other subjects.
---
contrib/gdiffmk/COPYRIGHT | 5 +++--
contrib/gdiffmk/gdiffmk.1.man | 17 +++++++++--------
contrib/gdiffmk/gdiffmk.am | 5 +++--
contrib/gdiffmk/gdiffmk.sh | 17 ++++++++---------
contrib/gdiffmk/tests/runtests.sh | 15 ++++++++-------
5 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/contrib/gdiffmk/COPYRIGHT b/contrib/gdiffmk/COPYRIGHT
index 16dcbe0cc..3aa170b3f 100644
--- a/contrib/gdiffmk/COPYRIGHT
+++ b/contrib/gdiffmk/COPYRIGHT
@@ -4,8 +4,9 @@ Copyright 2004-2015 Free Software Foundation, Inc.
Written by Mike Bianchi <[email protected]>
Changes from May 2015 onward by the groff development team
-This file is part of gdiffmk, which is part of groff, the GNU roff
-typesetting system.
+This file is part of gdiffmk.
+
+gdiffmk is distributed with groff, the GNU roff typesetting system.
groff is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
diff --git a/contrib/gdiffmk/gdiffmk.1.man b/contrib/gdiffmk/gdiffmk.1.man
index 142f0a8c5..101aee189 100644
--- a/contrib/gdiffmk/gdiffmk.1.man
+++ b/contrib/gdiffmk/gdiffmk.1.man
@@ -12,18 +12,19 @@ files
.\" Copyright 2004-2016 Free Software Foundation, Inc.
.\" 2017-2025 G. Branden Robinson
.\"
-.\" This file is part of gdiffmk, which is part of groff, the GNU roff
-.\" typesetting system.
+.\" This file is part of gdiffmk.
.\"
-.\" This program is free software: you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
+.\" gdiffmk is distributed with groff, the GNU roff typesetting system.
+.\"
+.\" groff is free software; you can redistribute it and/or modify it
+.\" under the terms of the GNU General Public License as published by
.\" the Free Software Foundation, either version 3 of the License, or
.\" (at your option) any later version.
.\"
-.\" This program 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.
+.\" groff 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.
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see
diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am
index d7dc1fdab..2ebb50f13 100644
--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
@@ -6,8 +6,9 @@
# Automake migration by Bertrand Garrigues
# Changes from May 2015 onward by the groff development team
#
-# This file is part of gdiffmk, which is part of groff, the GNU roff
-# typesetting system.
+# This file is part of gdiffmk.
+#
+# gdiffmk is distributed with groff, the GNU roff typesetting system.
#
# groff is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
index 31ad2d706..725d49e59 100644
--- a/contrib/gdiffmk/gdiffmk.sh
+++ b/contrib/gdiffmk/gdiffmk.sh
@@ -4,26 +4,25 @@
#
# Written by Mike Bianchi <[email protected]>
# Changes from May 2015 onward by the groff development team
-
-# Thanks to Peter Bray for debugging.
-
-# This file is part of gdiffmk, which is part of groff, the GNU roff
-# typesetting system.
-
+#
+# This file is part of gdiffmk.
+#
+# gdiffmk is distributed with groff, the GNU roff typesetting system.
+#
# groff is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-
+#
# groff 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.
-
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# This file is part of GNU gdiffmk.
+# Thanks to Peter Bray for debugging.
CMD=`basename $0`
diff --git a/contrib/gdiffmk/tests/runtests.sh
b/contrib/gdiffmk/tests/runtests.sh
index 45dff55a8..3c420d27c 100755
--- a/contrib/gdiffmk/tests/runtests.sh
+++ b/contrib/gdiffmk/tests/runtests.sh
@@ -1,25 +1,26 @@
#!/bin/sh
#
-# A very simple function test for gdiffmk.sh.
+# A very simple function test for gdiffmk.sh.
#
# Copyright 2004-2023 Free Software Foundation, Inc.
#
# Written by Mike Bianchi <[email protected]>
# Changes from May 2015 onward by the groff development team
-
-# This file is part of gdiffmk, which is part of groff, the GNU roff
-# typesetting system.
-
+#
+# This file is part of gdiffmk.
+#
+# gdiffmk is distributed with groff, the GNU roff typesetting system.
+#
# groff is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-
+#
# groff 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.
-
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This file is part of GNU gdiffmk.
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
