diff --git a/src/w3c/headers.js b/src/w3c/headers.js index c1d71981aa..852f6cb789 100644 --- a/src/w3c/headers.js +++ b/src/w3c/headers.js @@ -81,7 +81,7 @@ // intended to be pushed to the WHATWG. // - "w3c-software", a permissive and attributions license (but GPL-compatible). // - "w3c-software-doc", (default) the W3C Software and Document License -// https://www.w3.org/Consortium/Legal/2023/software-license +// https://www.w3.org/copyright/software-license-2023/ import { ISODate, codedJoinAnd, @@ -223,7 +223,7 @@ export const licenses = new Map([ { name: "W3C Software Notice and License", short: "W3C Software", - url: "https://www.w3.org/Consortium/Legal/2002/copyright-software-20021231", + url: "https://www.w3.org/copyright/software-license-2002/", }, ], [ @@ -231,7 +231,7 @@ export const licenses = new Map([ { name: "W3C Software and Document Notice and License", short: "permissive document license", - url: "https://www.w3.org/Consortium/Legal/2023/software-license", + url: "https://www.w3.org/copyright/software-license-2023/", }, ], [ @@ -247,7 +247,7 @@ export const licenses = new Map([ { name: "W3C Document License", short: "document use", - url: "https://www.w3.org/Consortium/Legal/copyright-documents", + url: "https://www.w3.org/copyright/document-license/", }, ], [ diff --git a/src/w3c/templates/cgbg-headers.js b/src/w3c/templates/cgbg-headers.js index d4d6416648..03a2585587 100644 --- a/src/w3c/templates/cgbg-headers.js +++ b/src/w3c/templates/cgbg-headers.js @@ -124,9 +124,7 @@ export default (conf, options) => { ${existingCopyright ? existingCopyright : html`
- Copyright + Copyright © ${conf.copyrightStart ? `${conf.copyrightStart}-` diff --git a/src/w3c/templates/headers.js b/src/w3c/templates/headers.js index 980417faea..1aa69f04bc 100755 --- a/src/w3c/templates/headers.js +++ b/src/w3c/templates/headers.js @@ -439,9 +439,7 @@ function renderCopyright(conf) { function renderOfficialCopyright(conf) { return html`
- Copyright + Copyright © ${conf.copyrightStart ? `${conf.copyrightStart}-` : ""}${conf.publishYear} ${conf.additionalCopyrightHolders @@ -449,11 +447,8 @@ function renderOfficialCopyright(conf) { : ""} World Wide Web Consortium. W3C® - liability, - trademarkliability, + trademark${linkLicense(conf.licenseInfo)}
`; } diff --git a/tests/spec/w3c/seo-spec.js b/tests/spec/w3c/seo-spec.js index 3b33146616..8ee17118b9 100644 --- a/tests/spec/w3c/seo-spec.js +++ b/tests/spec/w3c/seo-spec.js @@ -178,7 +178,7 @@ describe("W3C - SEO", () => { "https://www.w3.org/TR/2012/REC-some-spec-20120607/" ); expect(jsonld.license).toBe( - "https://www.w3.org/Consortium/Legal/2023/software-license" + "https://www.w3.org/copyright/software-license-2023/" ); expect(jsonld.name).toBe("Basic Title"); expect(jsonld.copyrightHolder).toEqual({