[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [gnu.org #1534539] Re: Licensing issues for gendocs_template_min
|
From: |
Asher Gordon |
|
Subject: |
Re: [gnu.org #1534539] Re: Licensing issues for gendocs_template_min |
|
Date: |
Fri, 22 May 2020 20:15:08 -0400 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) |
Asher Gordon <address@hidden> writes:
> Ok, I've updated my patch; see below.
Whoops, I meant to amend the commit, not create a new one. Here's the
full patch:
From d6859cd978ed2ff787b062b5094656b3c3608c91 Mon Sep 17 00:00:00 2001
From: Asher Gordon <address@hidden>
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 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 | 9 +++++++++
doc/gendocs_template | 12 +++++++++++-
doc/gendocs_template_min | 15 +++++++++++++++
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 924fb436e..a4473284c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2020-05-22 Asher Gordon <address@hidden>
+
+ 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.
+
2020-05-21 Bruno Haible <address@hidden>
group-member: Relicense under LGPLv2+.
diff --git a/doc/gendocs_template b/doc/gendocs_template
index bab2d88e4..ee26d331f 100644
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -1,5 +1,15 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.78 -->
+
+<!--
+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
+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..30e476ee6 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) 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
+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
Thanks,
Asher
--
I hate quotations.
-- Ralph Waldo Emerson
GPG fingerprint: 38F3 975C D173 4037 B397 8095 D4C9 C4FC 5460 8E68
signature.asc
Description: PGP signature