diff --git a/data/FilterList.json b/data/FilterList.json index 42d8a73d1..c53e9a12e 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -2840,20 +2840,20 @@ }, { "id": 168, - "description": "It is an alternative, free way to block ads, trackers and phishing websites, and also a parental control instrument.", - "descriptionSourceUrl": null, + "description": "A filter composed from several other filters (English filter, Social media filter, Spyware filter, Mobile ads filter, EasyList and EasyPrivacy) and simplified specifically to be better compatible with DNS-level ad blocking. This filter is used by AdGuard DNS servers to block ads.", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#domains", "discontinuedDate": null, "donateUrl": null, "emailAddress": null, "forumUrl": null, - "homeUrl": "https://adguard.com/en/adguard-dns/overview.html", + "homeUrl": "https://github.com/AdguardTeam/AdguardDNS", "issuesUrl": null, - "licenseId": null, - "name": "Adguard DNS Filter", + "licenseId": 12, + "name": "Adguard Simplified Domain Names Filter", "policyUrl": null, "submissionUrl": null, "syntaxId": null, - "viewUrl": "https://adguard.com/en/filter-rules.html?id=15" + "viewUrl": "https://filters.adtidy.org/windows/filters/15.txt" }, { "id": 169, diff --git a/data/License.json b/data/License.json index d1af13833..53f72342e 100644 --- a/data/License.json +++ b/data/License.json @@ -75,5 +75,12 @@ "name": "The Unlicense", "permissiveAdaptation": true, "permissiveCommercial": true + }, + { + "id": 12, + "descriptionUrl": "https://creativecommons.org/licenses/by-sa/3.0/", + "name": "CC BY-SA 3.0", + "permissiveAdaptation": true, + "permissiveCommercial": true } ] \ No newline at end of file diff --git a/data/Merge.json b/data/Merge.json index bb84169d1..c5dd82aa4 100644 --- a/data/Merge.json +++ b/data/Merge.json @@ -158,5 +158,29 @@ { "mergeFilterListId": 309, "upstreamFilterListId": 177 + }, + { + "mergeFilterListId": 168, + "upstreamFilterListId": 166 + }, + { + "mergeFilterListId": 168, + "upstreamFilterListId": 159 + }, + { + "mergeFilterListId": 168, + "upstreamFilterListId": 157 + }, + { + "mergeFilterListId": 168, + "upstreamFilterListId": 162 + }, + { + "mergeFilterListId": 168, + "upstreamFilterListId": 301 + }, + { + "mergeFilterListId": 168, + "upstreamFilterListId": 242 } ] \ No newline at end of file