Update of ED report from new reffy run

Using reffy commit 19.1.7.

Author: reffy-bot

ed/algorithms/privacy-preserving-attribution.json

@@ -452,7 +452,7 @@
     {
       "name": "do attribution and fill a histogram",
       "href": "https://w3c.github.io/attribution/#do-attribution-and-fill-a-histogram",
-      "html": "To <dfn class=\"dfn-paneled has-dfn-panel\" data-dfn-type=\"dfn\" data-noexport=\"\" id=\"do-attribution-and-fill-a-histogram\" role=\"button\" aria-expanded=\"false\" tabindex=\"0\">do attribution and fill a histogram</dfn>, given\n  <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options\" id=\"ref-for-validated-conversion-options①\">validated conversion options</a> <var>options</var>,\n  <a data-link-type=\"dfn\" href=\"https://html.spec.whatwg.org/#site\" id=\"ref-for-site②⑦\">site</a> <var>topLevelSite</var>,\n  <a data-link-type=\"dfn\" href=\"https://html.spec.whatwg.org/#site\" id=\"ref-for-site②⑧\">site</a> <var>intermediarySite</var>,\n  and <a data-link-type=\"dfn\" href=\"https://www.w3.org/TR/hr-time-3/#dfn-moment\" id=\"ref-for-dfn-moment⑦\">moment</a> <var>now</var>:",
+      "html": "To <dfn class=\"dfn-paneled has-dfn-panel\" data-dfn-type=\"dfn\" data-noexport=\"\" id=\"do-attribution-and-fill-a-histogram\" role=\"button\" aria-expanded=\"false\" tabindex=\"0\">do attribution and fill a histogram</dfn>, given\n  <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options\" id=\"ref-for-validated-conversion-options①\">validated conversion options</a> <var>options</var>,\n  <a data-link-type=\"dfn\" href=\"https://html.spec.whatwg.org/#site\" id=\"ref-for-site②⑦\">site</a> <var>topLevelSite</var>,\n  <a data-link-type=\"dfn\" href=\"https://html.spec.whatwg.org/#site\" id=\"ref-for-site②⑧\">site</a> or <code>undefined</code> <var>intermediarySite</var>,\n  and <a data-link-type=\"dfn\" href=\"https://www.w3.org/TR/hr-time-3/#dfn-moment\" id=\"ref-for-dfn-moment⑦\">moment</a> <var>now</var>:",
       "rationale": ".algorithm",
       "steps": [
         {
@@ -573,24 +573,18 @@
     {
       "name": "common matching logic",
       "href": "https://w3c.github.io/attribution/#common-matching-logic",
-      "html": "To perform <dfn class=\"dfn-paneled has-dfn-panel\" data-dfn-type=\"dfn\" data-noexport=\"\" id=\"common-matching-logic\" role=\"button\" aria-expanded=\"false\" tabindex=\"0\">common matching logic</dfn>, given\n<a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options\" id=\"ref-for-validated-conversion-options②\">validated conversion options</a> <var>options</var>,\n<a data-link-type=\"dfn\" href=\"https://html.spec.whatwg.org/#site\" id=\"ref-for-site②⑨\">site</a> <var>topLevelSite</var>,\n<a data-link-type=\"dfn\" href=\"https://html.spec.whatwg.org/#site\" id=\"ref-for-site③⓪\">site</a> <var>intermediarySite</var>,\n<a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#epoch-index\" id=\"ref-for-epoch-index①①\">epoch index</a> <var>epoch</var>, and <a data-link-type=\"dfn\" href=\"https://www.w3.org/TR/hr-time-3/#dfn-moment\" id=\"ref-for-dfn-moment⑧\">moment</a> <var>now</var>:",
+      "html": "To perform <dfn class=\"dfn-paneled has-dfn-panel\" data-dfn-type=\"dfn\" data-noexport=\"\" id=\"common-matching-logic\" role=\"button\" aria-expanded=\"false\" tabindex=\"0\">common matching logic</dfn>, given\n<a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options\" id=\"ref-for-validated-conversion-options②\">validated conversion options</a> <var>options</var>,\n<a data-link-type=\"dfn\" href=\"https://html.spec.whatwg.org/#site\" id=\"ref-for-site②⑨\">site</a> <var>topLevelSite</var>,\n<a data-link-type=\"dfn\" href=\"https://html.spec.whatwg.org/#site\" id=\"ref-for-site③⓪\">site</a> or <code>undefined</code> <var>intermediarySite</var>,\n<a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#epoch-index\" id=\"ref-for-epoch-index①①\">epoch index</a> <var>epoch</var>, and <a data-link-type=\"dfn\" href=\"https://www.w3.org/TR/hr-time-3/#dfn-moment\" id=\"ref-for-dfn-moment⑧\">moment</a> <var>now</var>:",
       "rationale": ".algorithm",
       "steps": [
         {
           "html": "<p>Let <var>matching</var> be an <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-is-empty\" id=\"ref-for-list-is-empty④\">empty</a> <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#sets\" id=\"ref-for-sets①⑦\">set</a>.</p>"
         },
-        {
-          "html": "<p>Let <var>earliestEpoch</var> be the result of calling <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#get-the-current-epoch\" id=\"ref-for-get-the-current-epoch⑦\">get the current epoch</a>,\npassing <var>topLevelSite</var> and (<var>now</var> − <var>options</var>’ <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options-lookback\" id=\"ref-for-validated-conversion-options-lookback②\">lookback</a>).</p>"
-        },
-        {
-          "html": "<p>If <var>earliestEpoch</var> is greater than <var>epoch</var>, return <var>matching</var>.</p>"
-        },
         {
           "html": "<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-iterate\" id=\"ref-for-list-iterate①\">For each</a> <var>impression</var> in the <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-store\" id=\"ref-for-impression-store①④\">impression store</a>:",
           "rationale": "let",
           "steps": [
             {
-              "html": "<p>Let <var>impressionEpoch</var> be the result of calling <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#get-the-current-epoch\" id=\"ref-for-get-the-current-epoch⑧\">get the current epoch</a>,\npassing <var>topLevelSite</var> and <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-timestamp\" id=\"ref-for-impression-timestamp②\">timestamp</a>.</p>"
+              "html": "<p>Let <var>impressionEpoch</var> be the result of calling <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#get-the-current-epoch\" id=\"ref-for-get-the-current-epoch⑦\">get the current epoch</a>,\npassing <var>topLevelSite</var> and <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-timestamp\" id=\"ref-for-impression-timestamp②\">timestamp</a>.</p>"
             },
             {
               "html": "<p>If <var>impressionEpoch</var> is not equal to <var>epoch</var>, <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue③\">continue</a>.</p>"
@@ -599,16 +593,16 @@
               "html": "<p>If <var>now</var> is after <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-timestamp\" id=\"ref-for-impression-timestamp③\">timestamp</a>\nplus <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-lifetime\" id=\"ref-for-impression-lifetime②\">lifetime</a>,\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue④\">continue</a>.</p>"
             },
             {
-              "html": "<p>If <var>now</var> is after <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-timestamp\" id=\"ref-for-impression-timestamp④\">timestamp</a> plus <var>options</var>’ <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options-lookback\" id=\"ref-for-validated-conversion-options-lookback③\">lookback</a>,\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue⑤\">continue</a>.</p>"
+              "html": "<p>If <var>now</var> is after <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-timestamp\" id=\"ref-for-impression-timestamp④\">timestamp</a> plus <var>options</var>’ <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options-lookback\" id=\"ref-for-validated-conversion-options-lookback②\">lookback</a>,\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue⑤\">continue</a>.</p>"
             },
             {
               "html": "<p>If <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-conversion-sites\" id=\"ref-for-impression-conversion-sites⑦\">conversion sites</a> <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-is-empty\" id=\"ref-for-list-is-empty⑤\">is not empty</a>\nand <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-contain\" id=\"ref-for-list-contain②\">does not contain</a> <var>topLevelSite</var>,\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue⑥\">continue</a>.</p>"
             },
             {
-              "html": "<p>If <var>intermediarySite</var> is not <code>undefined</code>, let <var>caller</var> be <var>intermediarySite</var>.\nOtherwise, let <var>caller</var> be <var>topLevelSite</var>.</p>"
+              "html": "<p>Let <var>conversionCaller</var> be <var>intermediarySite</var> if it is not <code>undefined</code>,\n<var>topLevelSite</var> otherwise.</p>"
             },
             {
-              "html": "<p>If <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-conversion-callers\" id=\"ref-for-impression-conversion-callers②\">conversion callers</a> <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-is-empty\" id=\"ref-for-list-is-empty⑥\">is not empty</a>\nand <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-contain\" id=\"ref-for-list-contain③\">does not contain</a> <var>caller</var>,\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue⑦\">continue</a>.</p>"
+              "html": "<p>If <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-conversion-callers\" id=\"ref-for-impression-conversion-callers②\">conversion callers</a> <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-is-empty\" id=\"ref-for-list-is-empty⑥\">is not empty</a>\nand <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-contain\" id=\"ref-for-list-contain③\">does not contain</a> <var>conversionCaller</var>,\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue⑦\">continue</a>.</p>"
             },
             {
               "html": "<p>If <var>options</var>’ <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options-match-values\" id=\"ref-for-validated-conversion-options-match-values②\">match values</a> <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-is-empty\" id=\"ref-for-list-is-empty⑦\">is not empty</a>\nand <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-contain\" id=\"ref-for-list-contain④\">does not contain</a> <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-match-value\" id=\"ref-for-impression-match-value②\">match value</a>,\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue⑧\">continue</a>.</p>"
@@ -617,7 +611,10 @@
               "html": "<p>If <var>options</var>’ <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options-impression-sites\" id=\"ref-for-validated-conversion-options-impression-sites②\">impression sites</a>\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-is-empty\" id=\"ref-for-list-is-empty⑧\">is not empty</a> and\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-contain\" id=\"ref-for-list-contain⑤\">does not contain</a> <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-impression-site\" id=\"ref-for-impression-impression-site②\">impression site</a>,\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue⑨\">continue</a>.</p>"
             },
             {
-              "html": "<p>If <var>options</var>’ <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options-impression-callers\" id=\"ref-for-validated-conversion-options-impression-callers②\">impression callers</a> <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-is-empty\" id=\"ref-for-list-is-empty⑨\">is not empty</a>\nand <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-contain\" id=\"ref-for-list-contain⑥\">does not contain</a> <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-intermediary-site\" id=\"ref-for-impression-intermediary-site③\">intermediary site</a>\nor <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-impression-site\" id=\"ref-for-impression-impression-site③\">impression site</a>,\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue①⓪\">continue</a>.</p>"
+              "html": "<p>Let <var>impressionCaller</var> be <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-intermediary-site\" id=\"ref-for-impression-intermediary-site③\">intermediary site</a>\nif it is not <code>undefined</code>, <var>impression</var>’s <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#impression-impression-site\" id=\"ref-for-impression-impression-site③\">impression site</a> otherwise.</p>"
+            },
+            {
+              "html": "<p>If <var>options</var>’ <a data-link-type=\"dfn\" href=\"https://w3c.github.io/attribution/#validated-conversion-options-impression-callers\" id=\"ref-for-validated-conversion-options-impression-callers②\">impression callers</a> <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-is-empty\" id=\"ref-for-list-is-empty⑨\">is not empty</a>\nand <a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#list-contain\" id=\"ref-for-list-contain⑥\">does not contain</a> <var>impressionCaller</var>,\n<a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#iteration-continue\" id=\"ref-for-iteration-continue①⓪\">continue</a>.</p>"
             },
             {
               "html": "<p><a data-link-type=\"dfn\" href=\"https://infra.spec.whatwg.org/#set-append\" id=\"ref-for-set-append\">Append</a> <var>impression</var> to <var>matching</var>.</p>"