Hi Karl, Karl Berry <k...@freefriends.org> writes:
> Asher and all - the CC-BY-ND (or, previously, "verbatim copying is
> allowed") is intended to refer to the web page as posted publicly
> (that's why it's visible text), not the gendocs_* template files
> themselves.
Ah, I see. I guess I didn't look very carefully at the previous license
text, so I assumed it was the All-Permissive. :-P So, if I use the
template, should I change the license notice to my own copyright and
license?
Also, I see now that there is an explanatory comment above the copyright
block in gendocs_template. However, this is not in gendocs_template_min,
so I didn't see it. Perhaps it should be added there as well.
> I suppose there should be commented-out text stating the license of the
> template text, which should be "all permissive" or "public domain". I
> doubt those tiny template files are copyrightable anyway.
According to (maintain) Copyright Notices:
You should maintain a proper copyright notice and a license notice
in each nontrivial file in the package. (Any file more than ten
lines long is nontrivial for this purpose.)
And, as you can see:
$ wc -l gendocs_template{,_min}
91 gendocs_template
93 gendocs_template_min
184 total
> This discrepancy has always existed but no one has brought it up
> before. Anyone can feel free to fix it in gnulib as far as I'm
> concerned.
How's this:
From a78e5e6c1b51da9a8669b14f21cf4e55a71fd924 Mon Sep 17 00:00:00 2001
From: Asher Gordon <asd...@posteo.net>
Date: Fri, 22 May 2020 13:39:01 -0400
Subject: [PATCH] gendocs: Clarify licenses for templates.
* doc/gendocs_template: Add a GNU All-Permissive license notice.
* doc/gendocs_template_min: Likewise, and also copy the explanatory
comment about the license notice at the bottom.
---
ChangeLog | 7 +++++++
doc/gendocs_template | 10 ++++++++++
doc/gendocs_template_min | 15 +++++++++++++++
3 files changed, 32 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 924fb436e..602ef42c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-05-22 Asher Gordon <asd...@posteo.net>
+
+ gendocs: Clarify licenses for templates.
+ * doc/gendocs_template: Add a GNU All-Permissive license notice.
+ * doc/gendocs_template_min: Likewise, and also copy the
+ explanatory comment about the license notice at the bottom.
+
2020-05-21 Bruno Haible <br...@clisp.org>
group-member: Relicense under LGPLv2+.
diff --git a/doc/gendocs_template b/doc/gendocs_template
index bab2d88e4..682c38110 100644
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -1,5 +1,15 @@
<!--#include virtual="/server/header.html" -->
<!-- Parent-Version: 1.77 -->
+
+<!--
+Copyright (C) 2020 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without any warranty.
+-->
+
<title>%%TITLE%% - GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
<h2>%%TITLE%%</h2>
diff --git a/doc/gendocs_template_min b/doc/gendocs_template_min
index 7b7318af4..00bdffe1c 100644
--- a/doc/gendocs_template_min
+++ b/doc/gendocs_template_min
@@ -3,6 +3,15 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en">
+<!--
+Copyright (C) 2020 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without any warranty.
+-->
+
<head>
<title>%%TITLE%% - GNU Project - Free Software Foundation</title>
<meta http-equiv="content-type" content='text/html; charset=utf-8' />
@@ -71,6 +80,12 @@
<p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%%
script</a>.)</p>
+<!-- If needed, change the copyright block at the bottom. In general,
+ all pages on the GNU web server should have the section about
+ verbatim copying. Please do NOT remove this without talking
+ with the webmasters first.
+ Please make sure the copyright date is consistent with the document
+ and that it is like this: "2001, 2002", not this: "2001-2002". -->
<div id="footer" class="copyright">
<p>Please send general FSF & GNU inquiries to
--
2.26.2
Also, I used 2020 for the copyright year. Should that instead be something like 2007-2020? > You don't need to resend mail to licensing. They can merge multiple > messages into one ticket if they so choose. It happens all the time. > It's a deficiency in RT. Perhaps it would be better to look at the In-Reply-To header instead... Well, I notice you didn't send your message to licensing, but I'll just send this one so that they know the issue is (pretty much) resolved. licens...@fsf.org: As you can see, I believe we have the situation under control. So you can now close the issue. Sorry for the noise, and I hope I didn't cause too much trouble! Thanks, Asher -- If at first you don't succeed, redefine success. GPG fingerprint: 38F3 975C D173 4037 B397 8095 D4C9 C4FC 5460 8E68
signature.asc
Description: PGP signature
