Skip to content

Commit 452a140

Browse files
deniakdeniak
committed
remove dated and old patent policy links
1 parent 8cdb07d commit 452a140

File tree

6 files changed

+15
-22
lines changed

6 files changed

+15
-22
lines changed

‎lib/rules/sotd/pp.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ const self = {
66
rule: 'patPolReq',
77
};
88

9-
const ppLink = 'https://www.w3.org/Consortium/Patent-Policy/';
10-
const ppLinkNew = 'https://www.w3.org/policies/patent-policy/';
11-
const pp2020 = 'https://www.w3.org/Consortium/Patent-Policy-20200915/';
12-
const pp2020New = 'https://www.w3.org/policies/patent-policy/20200915/';
9+
const ppLink = 'https://www.w3.org/policies/patent-policy/';
1310
const pp2017 = 'https://www.w3.org/Consortium/Patent-Policy-20170801/';
1411

1512
/**
@@ -122,13 +119,13 @@ export async function check(sr, done) {
122119
const isPP2020 = sr.config.patentPolicy === 'pp2020';
123120
let possiblePP = [];
124121
if (isPP2020) {
125-
possiblePP = [ppLink, ppLinkNew, pp2020, pp2020New];
122+
possiblePP = [ppLink];
126123
} else if (isPP2017) {
127124
possiblePP = [pp2017];
128125
}
129126
// If is joint publication and no pp is set, use latest pp
130127
if (!publishedByWgOnly && patentPolicies.every(pp => pp === undefined)) {
131-
possiblePP = [ppLinkNew, ppLink, pp2020New, pp2020];
128+
possiblePP = [ppLink];
132129
}
133130
// Make sure the pp version is consistent between the UI or the one defined in the charter.
134131
if (

‎lib/rules/sotd/stability.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,12 @@ export async function check(sr, done) {
123123
const links = sotd.querySelectorAll('a');
124124
const licensingText = 'royalty-free licensing';
125125
const licensingLink =
126-
'https://www.w3.org/Consortium/Patent-Policy/#sec-Requirements';
127-
const licensingLinkNew =
128126
'https://www.w3.org/policies/patent-policy/#sec-Requirements';
129127
const licensingFound = Array.prototype.some.call(
130128
links,
131129
link =>
132130
sr.norm(link.textContent) === licensingText &&
133-
[licensingLink, licensingLinkNew].includes(link.href)
131+
link.href === licensingLink
134132
);
135133
if (!licensingFound)
136134
sr.error(self, 'no-licensing-link', {

‎lib/rules/sotd/submission.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ export function check(sr, done) {
5656
const w3cProcessNew = 'https://www.w3.org/policies/process/';
5757
const w3cMembership =
5858
'https://www.w3.org/Consortium/Prospectus/Joining';
59-
const w3cPPOld =
60-
'https://www.w3.org/Consortium/Patent-Policy/#sec-submissions';
61-
const w3cPPNew =
59+
const w3cPP =
6260
'https://www.w3.org/policies/patent-policy/#sec-submissions';
6361
const w3cSubm = 'https://www.w3.org/submissions/';
6462
let foundW3CProcess = false;
@@ -82,7 +80,7 @@ export function check(sr, done) {
8280
return;
8381
}
8482
if (
85-
[w3cPPNew, w3cPPOld].includes(href) &&
83+
href === w3cPP &&
8684
text === 'section 3.3 of the W3C Patent Policy'
8785
) {
8886
foundPP = true;

‎test/doc-views/specBase.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export const data = {
165165
ppLink: 'https://www.w3.org/policies/patent-policy/',
166166
ppHTML: '<abbr title="World Wide Web Consortium">W3C</abbr> Patent Policy</a>',
167167
noPPText: 'licensing requirements or commitments',
168-
ppLink1: 'https://www.w3.org/policies/patent-policy/20200915/',
168+
ppLink1: 'https://www.w3.org/policies/patent-policy/',
169169
ppDate: '15 September 2020',
170170

171171
iprLink: 'https://www.w3.org/groups/wg/i18n-core/ipr',

‎test/docs/2021-rec.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ <h2 class="no-num no-toc" id=status>Status of This Document</h2>
122122
<p>W3C recommends the wide deployment of this specification as a standard for the Web.</p>
123123

124124
<p>This document was produced by a group operating under the <a
125-
href="https://www.w3.org/policies/patent-policy/20200915/">W3C Patent Policy</a>. W3C maintains a <a
125+
href="https://www.w3.org/policies/patent-policy/">W3C Patent Policy</a>. W3C maintains a <a
126126
href="https://www.w3.org/groups/wg/css/ipr"
127127
rel=disclosure>public list of any patent disclosures</a> made in
128128
connection with the deliverables of the group; that page also includes

‎test/samples.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const samples = [
99
informative: false,
1010
process: 'https://www.w3.org/policies/process/20231103/',
1111
delivererIDs: [45211],
12-
patentPolicy: 'https://www.w3.org/policies/patent-policy/20200915/',
12+
patentPolicy: 'https://www.w3.org/policies/patent-policy/',
1313
charters: ['https://www.w3.org/2021/02/webperf.html'],
1414
thisVersion: 'https://www.w3.org/TR/2021/WD-hr-foo-time-2-20211104/',
1515
latestVersion: 'https://www.w3.org/TR/hr-foo-time-2/',
@@ -35,7 +35,7 @@ export const samples = [
3535
editorsDraft: 'https://w3c.github.io/hr-time/',
3636
updated: false,
3737
charters: ['https://www.w3.org/2021/02/webperf.html'],
38-
patentPolicy: 'https://www.w3.org/policies/patent-policy/20200915/',
38+
patentPolicy: 'https://www.w3.org/policies/patent-policy/',
3939
},
4040
{
4141
file: '2021-wd-shortname-change',
@@ -54,7 +54,7 @@ export const samples = [
5454
editorsDraft: 'https://w3c.github.io/foo-time/',
5555
sameWorkAs: 'https://www.w3.org/TR/hr-time-3/',
5656
updated: false,
57-
patentPolicy: 'https://www.w3.org/policies/patent-policy/20200915/',
57+
patentPolicy: 'https://www.w3.org/policies/patent-policy/',
5858
charters: ['https://www.w3.org/2021/02/webperf.html'],
5959
},
6060
{
@@ -69,7 +69,7 @@ export const samples = [
6969
informative: false,
7070
process: 'https://www.w3.org/policies/process/20231103/',
7171
delivererIDs: [45211],
72-
patentPolicy: 'https://www.w3.org/policies/patent-policy/20200915/',
72+
patentPolicy: 'https://www.w3.org/policies/patent-policy/',
7373
charters: ['https://www.w3.org/2021/02/webperf.html'],
7474
thisVersion: 'https://www.w3.org/TR/2021/CR-hr-time-2-20211104/',
7575
latestVersion: 'https://www.w3.org/TR/hr-time-2/',
@@ -90,7 +90,7 @@ export const samples = [
9090
process: 'https://www.w3.org/policies/process/20231103/',
9191
delivererIDs: [45211],
9292
charters: ['https://www.w3.org/2021/02/webperf.html'],
93-
patentPolicy: 'https://www.w3.org/policies/patent-policy/20200915/',
93+
patentPolicy: 'https://www.w3.org/policies/patent-policy/',
9494
thisVersion: 'https://www.w3.org/TR/2021/CRD-hr-time-2-20211104/',
9595
latestVersion: 'https://www.w3.org/TR/hr-time-2/',
9696
history: 'https://www.w3.org/standards/history/hr-time-2',
@@ -111,7 +111,7 @@ export const samples = [
111111
process: 'https://www.w3.org/policies/process/20231103/',
112112
delivererIDs: [45211],
113113
charters: ['https://www.w3.org/2021/02/webperf.html'],
114-
patentPolicy: 'https://www.w3.org/policies/patent-policy/20200915/',
114+
patentPolicy: 'https://www.w3.org/policies/patent-policy/',
115115
thisVersion: 'https://www.w3.org/TR/2021/PR-hr-time-2-20211104/',
116116
latestVersion: 'https://www.w3.org/TR/hr-time-2/',
117117
history: 'https://www.w3.org/standards/history/hr-time-2',
@@ -134,7 +134,7 @@ export const samples = [
134134
process: 'https://www.w3.org/policies/process/20231103/',
135135
delivererIDs: [32061],
136136
charters: ['https://www.w3.org/2020/12/css-wg-charter.html'],
137-
patentPolicy: 'https://www.w3.org/policies/patent-policy/20200915/',
137+
patentPolicy: 'https://www.w3.org/policies/patent-policy/',
138138
thisVersion: 'https://www.w3.org/TR/2022/REC-css-color-3-20220118/',
139139
latestVersion: 'https://www.w3.org/TR/css-color-3/',
140140
history: 'https://www.w3.org/standards/history/css-color-3',

0 commit comments

Comments
 (0)