Karl Berry <k...@freefriends.org> writes: > Thanks for all your work on this.
Happy to help! :-) > Also, I used 2020 for the copyright year. Should that instead be > something like 2007-2020? > > Yes. The lone year "2020" stuff is only for the online web pages. Ah, I see. So should these copyright years be used? $ git blame doc/gendocs_template | perl -pe 's/^.*\s(\d+)-.*$/$1/' | sort -u 2006 2007 2008 2009 2011 2014 2017 2020 $ git blame doc/gendocs_template_min | perl -pe 's/^.*\s(\d+)-.*$/$1/' | sort -u 2007 2009 2011 2014 2017 2019 2020 Or is it ok to just say 2006-2020 for gendocs_template and 2007-2020 for gendocs_template_min? > Also, I think the Parent-Version: value should be incremented in > gendocs_template. I'm not sure if anyone is still using it, but at one > time there was a semi-automated way to merge changes in the template > into people's per-project index.html files using that. Ok, I've updated my patch; see below. Let me know if the copyright years are acceptable as well.
From 813ffbca35b9cf2f8fbaa2c255ccde46548dd68a Mon Sep 17 00:00:00 2001 From: Asher Gordon <asd...@posteo.net> Date: Fri, 22 May 2020 20:05:52 -0400 Subject: [PATCH] gendocs: Clarify licenses for templates. * doc/gendocs_template: Add a GNU All-Permissive license notice and bump Parent-Version. * doc/gendocs_template_min: Add a GNU All-Permissive license notice and copy the explanatory comment about the license notice at the bottom from gendocs_template. --- ChangeLog | 8 +++++--- doc/gendocs_template | 4 ++-- doc/gendocs_template_min | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 602ef42c5..a4473284c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,11 @@ 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. + * doc/gendocs_template: Add a GNU All-Permissive license notice + and bump Parent-Version. + * doc/gendocs_template_min: Add a GNU All-Permissive license + notice and copy the explanatory comment about the license notice + at the bottom from gendocs_template. 2020-05-21 Bruno Haible <br...@clisp.org> diff --git a/doc/gendocs_template b/doc/gendocs_template index 682c38110..ee26d331f 100644 --- a/doc/gendocs_template +++ b/doc/gendocs_template @@ -1,8 +1,8 @@ <!--#include virtual="/server/header.html" --> -<!-- Parent-Version: 1.77 --> +<!-- Parent-Version: 1.78 --> <!-- -Copyright (C) 2020 Free Software Foundation, Inc. +Copyright (C) 2006-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 diff --git a/doc/gendocs_template_min b/doc/gendocs_template_min index 00bdffe1c..30e476ee6 100644 --- a/doc/gendocs_template_min +++ b/doc/gendocs_template_min @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <!-- -Copyright (C) 2020 Free Software Foundation, Inc. +Copyright (C) 2007-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 -- 2.26.2
> Well, I notice you didn't send your message to licensing, > > Oops, dumb oversight. I changed the subject and then forgot :(. Ah, I see. I thought you did it on purpose. Well, I don't think it matters much. Thanks, Asher -- <knghtbrd> eek, not another one... <knghtbrd> Seems ever developer and their mother now has a random signature using irc quotes ... <knghtbrd> WHAT HAVE I STARTED HERE?? GPG fingerprint: 38F3 975C D173 4037 B397 8095 D4C9 C4FC 5460 8E68
signature.asc
Description: PGP signature