Skip to content

Commit

Permalink
update copyright URLs
Browse files Browse the repository at this point in the history
  • Loading branch information
@deniak
deniak committed Oct 31, 2023
1 parent fe6723d commit 7b1112a
Show file tree
Hide file tree
Showing 26 changed files with 86 additions and 88 deletions.
8 changes: 4 additions & 4 deletions lib/copyright-exceptions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
"epubcfi",
"epubcfi-11"
],
"copyright": "<a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#Copyright\">Copyright</a> © 1999-@YEAR <a href=\"https://www.idpf.org\">International Digital Publishing Forum</a> and <a href=\"https://www.w3.org/\">World Wide Web Consortium</a>. <abbr title=\"World Wide Web Consortium\">W3C</abbr><sup>®</sup> <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer\">liability</a>, <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks\">trademark</a> and <a rel=\"license\" href=\"https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document\" title=\"W3C Software and Document Notice and License\">permissive document license</a> rules apply."
"copyright": "<a href=\"https://www.w3.org/policies/#copyright\">Copyright</a> © 1999-@YEAR <a href=\"https://www.idpf.org\">International Digital Publishing Forum</a> and <a href=\"https://www.w3.org/\">World Wide Web Consortium</a>. <abbr title=\"World Wide Web Consortium\">W3C</abbr><sup>®</sup> <a href=\"https://www.w3.org/policies/#Legal_Disclaimer\">liability</a>, <a href=\"https://www.w3.org/policies/#W3C_Trademarks\">trademark</a> and <a rel=\"license\" href=\"https://www.w3.org/copyright/software-license-2023/\" title=\"W3C Software and Document Notice and License\">permissive document license</a> rules apply."
},
{
"specShortnames": ["webrtc"],
"copyright": "Initial Author of this Specification was Ian Hickson, Google Inc., with the following copyright statement:<br> © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and Opera Software ASA. You are granted a license to use, reproduce and create derivative works of this document. All subsequent changes since 26 July 2011 done by the W3C WebRTC Working Group are under the following <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#Copyright\">Copyright</a>:<br> <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#Copyright\">Copyright</a> © 2011-@YEAR <a href=\"https://www.w3.org/\">World Wide Web Consortium</a>. <abbr title=\"World Wide Web Consortium\">W3C</abbr><sup>®</sup> <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer\">liability</a>, <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks\">trademark</a> and <a href=\"https://www.w3.org/Consortium/Legal/copyright-documents\">document use</a> rules apply."
"copyright": "Initial Author of this Specification was Ian Hickson, Google Inc., with the following copyright statement:<br> © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and Opera Software ASA. You are granted a license to use, reproduce and create derivative works of this document. All subsequent changes since 26 July 2011 done by the W3C WebRTC Working Group are under the following <a href=\"https://www.w3.org/policies/#copyright\">Copyright</a>:<br> <a href=\"https://www.w3.org/policies/#copyright\">Copyright</a> © 2011-@YEAR <a href=\"https://www.w3.org/\">World Wide Web Consortium</a>. <abbr title=\"World Wide Web Consortium\">W3C</abbr><sup>®</sup> <a href=\"https://www.w3.org/policies/#Legal_Disclaimer\">liability</a>, <a href=\"https://www.w3.org/policies/#W3C_Trademarks\">trademark</a> and <a href=\"https://www.w3.org/copyright/document-license/\">document use</a> rules apply."
},
{
"specShortnames": ["security-privacy-questionnaire"],
"copyright": "<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\" rel=\"license\"><img alt=\"CC0\" src=\"cc0-80x15.png\" title=\"CC0\"></a> To the extent possible under law, the editors have waived all copyright and related or neighboring rights to this work. This document is also made available under the <a href=\"https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document\" rel=\"license\">W3C Software and Document License</a>."
"copyright": "<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\" rel=\"license\"><img alt=\"CC0\" src=\"cc0-80x15.png\" title=\"CC0\"></a> To the extent possible under law, the editors have waived all copyright and related or neighboring rights to this work. This document is also made available under the <a href=\"https://www.w3.org/copyright/software-license-2023/\" rel=\"license\">W3C Software and Document License</a>."
},
{
"specShortnames": ["mediacapture-streams"],
"copyright": "Initial Author of this Specification was Ian Hickson, Google Inc., with the following copyright statement:<br> © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and Opera Software ASA. You are granted a license to use, reproduce and create derivative works of this document."
},
{
"specShortnames": ["sdw-bp"],
"copyright": "Copyright © @YEAR <a href=\"https://www.ogc.org/\">OGC</a> &amp; <a href=\"https://www.w3.org/\">World Wide Web Consortium</a>. <abbr title=\"World Wide Web Consortium\">W3C</abbr><sup>®</sup> <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer\">liability</a>, <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks\">trademark</a>, <a href=\"https://www.w3.org/Consortium/Legal/copyright-documents\">W3C</a> and <a href=\"https://www.ogc.org/ogc/document\">OGC</a> document use rules apply."
"copyright": "Copyright © @YEAR <a href=\"https://www.ogc.org/\">OGC</a> &amp; <a href=\"https://www.w3.org/\">World Wide Web Consortium</a>. <abbr title=\"World Wide Web Consortium\">W3C</abbr><sup>®</sup> <a href=\"https://www.w3.org/policies/#Legal_Disclaimer\">liability</a>, <a href=\"https://www.w3.org/policies/#W3C_Trademarks\">trademark</a>, <a href=\"https://www.w3.org/copyright/document-license/\">W3C</a> and <a href=\"https://www.ogc.org/ogc/document\">OGC</a> document use rules apply."
}
]
2 changes: 1 addition & 1 deletion lib/l10n-en_GB.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export const messages = {
'headers.copyright.exception-no-html':
'The copyright used in this document <blockquote class="boilerplate">${copyright}</blockquote> does not match the requirements. The expected copyright is <blockquote class="boilerplate">${expected}</blockquote>',
'headers.memsub-copyright.not-found':
'Missing link to the W3C document notice (https://www.w3.org/Consortium/Legal/copyright-documents).',
'Missing link to the W3C document notice (https://www.w3.org/copyright/document-license/).',
// headers/github-repo
'headers.github-repo.no-feedback':
'Cannot find the "Feedback" &lt;dt&gt; in the headers of the document.',
Expand Down
4 changes: 2 additions & 2 deletions lib/rules.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"docIDDate": true,
"editorSection": true,
"altRepresentations": ["SUBM"],
"copyright": "<b>Copyright</b>: The document <span class=\"rfc2119\">must</span> include a link to the W3C document notice (https://www.w3.org/Consortium/Legal/copyright-documents). The copyright may be held by the Submitters.",
"copyright": "<b>Copyright</b>: The document <span class=\"rfc2119\">must</span> include a link to the W3C document notice (https://www.w3.org/copyright/document-license/). The copyright may be held by the Submitters.",
"hrAfterCopyright": true
}
},
Expand Down Expand Up @@ -1587,7 +1587,7 @@
"editorSection": "The editors'/authors' names <span class=\"rfc2119\">must</span> be listed, with attribute <code>data-editor-id=\"@@\"</code>. Affiliations and email addresses are <span class=\"rfc2119\">optional</span>; email addresses are <span class=\"rfc2119\">not recommended</span>. If an editor/author is acknowledged in an earlier version of this document and the individual's affiliation has since changed, list the individual using the notation \"&lt;name&gt;, &lt;affiliation&gt; (until DD Month YYYY)\". If the list of authors is very long (e.g., the entire Working Group), identify the authors in the acknowledgments section, linked from the head of the document. Distinguish any contributors from authors in the acknowledgments section.",
"altRepresentations": "Authors <span class=\"rfc2119\">may</span> provide links to alternative (non-normative) representations or packages for the document. For instance: <p> <code> <small>&lt;p&gt;This document is also available in these non-normative formats: &lt;a href=\"@{param1}-shortname-20180101.html\"&gt;single HTML file&lt;/a&gt;, &lt;a href=\"@{param1}-shortname-20180101.tgz\"&gt;gzipped tar file of HTML&lt;/a&gt;.&lt;/p&gt; </small> </code> </p>",
"implReport": "It <span class=\"rfc2119\">must</span> include either: <ul> <li>a link to an interoperability or implementation report if the Director used such a report as part of the decision to advance the specification, or</li> <li>a statement that the Director's decision did not involve such a report.</li> </ul>",
"copyright": "Starting from 01 February 2023, the copyright <span class=\"rfc2119\">must</span> follow the following markup (fill in with the appropriate year, years, or year range). The type of license the document is using can be found in the group's charter. <ol> <li>For documents using W3C Document License: <blockquote class=\"copyright\"><a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#Copyright\">Copyright</a> © @{year} <a href=\"https://www.w3.org/\">World Wide Web Consortium</a>. <abbr title=\"World Wide Web Consortium\">W3C</abbr><sup>®</sup> <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer\">liability</a>, <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks\">trademark</a> and <a href=\"https://www.w3.org/Consortium/Legal/copyright-documents\">document use</a> rules apply.</blockquote><div class=\"source\"> <span style=\"font-style: italic\">Include this source code</span>:<br><code>&lt;p class=&quot;copyright&quot;&gt;&lt;a href=&quot;https://www.w3.org/Consortium/Legal/ipr-notice#Copyright&quot;&gt;Copyright&lt;/a&gt; © @{year} &lt;a href=&quot;https://www.w3.org/&quot;&gt;World Wide Web Consortium&lt;/a&gt;. &lt;abbr title=&quot;World Wide Web Consortium&quot;&gt;W3C&lt;/abbr&gt;&lt;sup&gt;®&lt;/sup&gt; &lt;a href=&quot;https://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer&quot;&gt;liability&lt;/a&gt;, &lt;a href=&quot;https://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks&quot;&gt;trademark&lt;/a&gt; and &lt;a href=\"https://www.w3.org/Consortium/Legal/copyright-documents\"&gt;document use&lt;/a&gt; rules apply.&lt;/p&gt;</code> </div></li><li>For documents using W3C Software and Document License: <blockquote class=\"copyright\"><a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#Copyright\">Copyright</a> © @{year} <a href=\"https://www.w3.org/\">World Wide Web Consortium</a>. <abbr title=\"World Wide Web Consortium\">W3C</abbr><sup>®</sup> <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer\">liability</a>, <a href=\"https://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks\">trademark</a> and <a href=\"https://www.w3.org/Consortium/Legal/copyright-software\">permissive document license</a> rules apply.</blockquote><div class=\"source\"> <span style=\"font-style: italic\">Include this source code</span>:<br><code>&lt;p class=&quot;copyright&quot;&gt;&lt;a href=&quot;https://www.w3.org/Consortium/Legal/ipr-notice#Copyright&quot;&gt;Copyright&lt;/a&gt; © @{year} &lt;a href=&quot;https://www.w3.org/&quot;&gt;World Wide Web Consortium&lt;/a&gt;. &lt;abbr title=&quot;World Wide Web Consortium&quot;&gt;W3C&lt;/abbr&gt;&lt;sup&gt;®&lt;/sup&gt; &lt;a href=&quot;https://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer&quot;&gt;liability&lt;/a&gt;, &lt;a href=&quot;https://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks&quot;&gt;trademark&lt;/a&gt; and &lt;a href=&quot;https://www.w3.org/Consortium/Legal/copyright-software&quot;&gt;permissive document license&lt;/a&gt; rules apply.&lt;/p&gt;</code> </div></li></ol><p>Note: Exceptions are listed in this <a href=\"https://github.com/w3c/specberus/blob/main/lib/copyright-exceptions.json\">json file</a>.",
"copyright": "Starting from 01 February 2023, the copyright <span class=\"rfc2119\">must</span> follow the following markup (fill in with the appropriate year, years, or year range). The type of license the document is using can be found in the group's charter. <ol> <li>For documents using W3C Document License: <blockquote class=\"copyright\"><a href=\"https://www.w3.org/policies/#copyright\">Copyright</a> © @{year} <a href=\"https://www.w3.org/\">World Wide Web Consortium</a>. <abbr title=\"World Wide Web Consortium\">W3C</abbr><sup>®</sup> <a href=\"https://www.w3.org/policies/#Legal_Disclaimer\">liability</a>, <a href=\"https://www.w3.org/policies/#W3C_Trademarks\">trademark</a> and <a href=\"https://www.w3.org/copyright/document-license/\">document use</a> rules apply.</blockquote><div class=\"source\"> <span style=\"font-style: italic\">Include this source code</span>:<br><code>&lt;p class=&quot;copyright&quot;&gt;&lt;a href=&quot;https://www.w3.org/policies/#copyright&quot;&gt;Copyright&lt;/a&gt; © @{year} &lt;a href=&quot;https://www.w3.org/&quot;&gt;World Wide Web Consortium&lt;/a&gt;. &lt;abbr title=&quot;World Wide Web Consortium&quot;&gt;W3C&lt;/abbr&gt;&lt;sup&gt;®&lt;/sup&gt; &lt;a href=&quot;https://www.w3.org/policies/#Legal_Disclaimer&quot;&gt;liability&lt;/a&gt;, &lt;a href=&quot;https://www.w3.org/policies/#W3C_Trademarks&quot;&gt;trademark&lt;/a&gt; and &lt;a href=\"https://www.w3.org/copyright/document-license/\"&gt;document use&lt;/a&gt; rules apply.&lt;/p&gt;</code> </div></li><li>For documents using W3C Software and Document License: <blockquote class=\"copyright\"><a href=\"https://www.w3.org/policies/#copyright\">Copyright</a> © @{year} <a href=\"https://www.w3.org/\">World Wide Web Consortium</a>. <abbr title=\"World Wide Web Consortium\">W3C</abbr><sup>®</sup> <a href=\"https://www.w3.org/policies/#Legal_Disclaimer\">liability</a>, <a href=\"https://www.w3.org/policies/#W3C_Trademarks\">trademark</a> and <a href=\"https://www.w3.org/copyright/software-license/\">permissive document license</a> rules apply.</blockquote><div class=\"source\"> <span style=\"font-style: italic\">Include this source code</span>:<br><code>&lt;p class=&quot;copyright&quot;&gt;&lt;a href=&quot;https://www.w3.org/policies/#copyright&quot;&gt;Copyright&lt;/a&gt; © @{year} &lt;a href=&quot;https://www.w3.org/&quot;&gt;World Wide Web Consortium&lt;/a&gt;. &lt;abbr title=&quot;World Wide Web Consortium&quot;&gt;W3C&lt;/abbr&gt;&lt;sup&gt;®&lt;/sup&gt; &lt;a href=&quot;https://www.w3.org/policies/#Legal_Disclaimer&quot;&gt;liability&lt;/a&gt;, &lt;a href=&quot;https://www.w3.org/policies/#W3C_Trademarks&quot;&gt;trademark&lt;/a&gt; and &lt;a href=&quot;https://www.w3.org/copyright/software-license/&quot;&gt;permissive document license&lt;/a&gt; rules apply.&lt;/p&gt;</code> </div></li></ol><p>Note: Exceptions are listed in this <a href=\"https://github.com/w3c/specberus/blob/main/lib/copyright-exceptions.json\">json file</a>.",
"hrAfterCopyright": "A horizontal rule (<code>hr</code>) <span class=\"rfc2119\">must</span> follow the copyright."
}
},
Expand Down
20 changes: 9 additions & 11 deletions lib/rules/headers/copyright.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* 1. Get type of license(s) the group is using from the API.
* 2. There're 2 types of license(s): copyright-documents and copyright-software. A group would choose either one or both in the Charter. If they choose both, they can mention either one in the document.
* 3. For joint-publications, the license should be adopted by both groups.
* 4. For "copyright-software", the url is https://www.w3.org/Consortium/Legal/copyright-software, the dated url is https://www.w3.org/Consortium/Legal/2023/software-license, they are both allowed. The name in the API is "W3C Software and Document License", but the document would use text "permissive document license".
* 5. For "copyright-documents", the url is https://www.w3.org/Consortium/Legal/copyright-documents, the dated url is https://www.w3.org/Consortium/Legal/2023/doc-license. The name in the API is "W3C Document License", but the document would use text "document use".
* 4. For "copyright-software", the url is https://www.w3.org/copyright/software-license/, the dated url is https://www.w3.org/copyright/software-license-2023/, they are both allowed. The name in the API is "W3C Software and Document License", but the document would use text "permissive document license".
* 5. For "copyright-documents", the url is https://www.w3.org/document/document-license/, the dated url is https://www.w3.org/copyright/document-license-2023/. The name in the API is "W3C Document License", but the document would use text "document use".
*/
import { AB, TAG, importJSON } from '../../util.js';

Expand All @@ -17,15 +17,14 @@ const self = {

// W3C Software and Document License
const LICENSE_CS_TEXT = 'permissive document license';
const LICENSE_CS_URL = 'https://www.w3.org/Consortium/Legal/copyright-software';
const LICENSE_CS_URL = 'https://www.w3.org/copyright/software-license/';
const LICENSE_CS_DATED_URL =
'https://www.w3.org/Consortium/Legal/2023/software-license';
'https://www.w3.org/copyright/software-license-2023/';
// W3C Document License
const LICENSE_CD_TEXT = 'document use';
const LICENSE_CD_URL =
'https://www.w3.org/Consortium/Legal/copyright-documents';
const LICENSE_CD_URL = 'https://www.w3.org/copyright/document-license/';
const LICENSE_CD_DATED_URL =
'https://www.w3.org/Consortium/Legal/2023/doc-license';
'https://www.w3.org/copyright/document-license-2023/';

const LICENSE_URL_TEXT_MAP = {
[LICENSE_CD_URL]: LICENSE_CD_TEXT,
Expand All @@ -38,11 +37,10 @@ const LICENSE_TEXT_LINKS_MAP = {
};

const latestBaseLinks = {
Copyright: 'https://www.w3.org/Consortium/Legal/ipr-notice#Copyright',
Copyright: 'https://www.w3.org/policies/#copyright',
'World Wide Web Consortium': 'https://www.w3.org/',
liability:
'https://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer',
trademark: 'https://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks',
liability: 'https://www.w3.org/policies/#Legal_Disclaimer',
trademark: 'https://www.w3.org/policies/#W3C_Trademarks',
};

const copyrightExceptions = importJSON(
Expand Down
4 changes: 2 additions & 2 deletions lib/rules/headers/memsub-copyright.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ export const { name } = self;
export function check(sr, done) {
const copyright = sr.jsDocument.querySelector('body div.head p.copyright');
if (copyright) {
// , "https://www.w3.org/Consortium/Legal/copyright-documents": "document use"
// , "https://www.w3.org/copyright/document-license/": "document use"
const seen = Array.prototype.some.call(
copyright.querySelectorAll('a[href]'),
a =>
a
.getAttribute('href')
.indexOf(
'https://www.w3.org/Consortium/Legal/copyright-documents'
'https://www.w3.org/copyright/document-license/'
) === 0
);
if (!seen) sr.error(self, 'not-found');
Expand Down
2 changes: 1 addition & 1 deletion test/doc-views/SUBM/MEM-SUBM.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default {
copyright: {
...good.copyright,
licenseHTML:
'W3C <a href="https://fake-url#Legal_Disclaimer">liability</a>, <a href="https://fake-url#W3C_Trademarks">trademark</a> and <a rel="license" href="https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document">permissive document license</a> rules apply.',
'W3C <a href="https://fake-url#Legal_Disclaimer">liability</a>, <a href="https://fake-url#W3C_Trademarks">trademark</a> and <a rel="license" href="https://www.w3.org/copyright/software-license-2023/">permissive document license</a> rules apply.',
},
},
},
Expand Down
Loading

0 comments on commit 7b1112a

Please sign in to comment.