From 0ce8770109599da0fb8f809ea653a82e5c53dcd3 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Wed, 2 Oct 2019 18:09:17 +0300
Subject: [PATCH 1/4] dns: cleanup legacy parts

---
 _includes/sections/dns.html | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 1476dcce..eb3bbf4d 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -1,34 +1,6 @@
 <h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Domain Name System (DNS)</h1>
 
-{%
-  include cardv2.html
-  title="Njalla - Domain Registration"
-  image="/assets/img/provider/Njalla.png"
-  description="Njalla only needs your email or XMPP address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service."
-  website="https://njal.la/"
-  tor="http://njalladnspotetti.onion"
-  forum="https://forum.privacytools.io/t/discussion-njalla/339"
-%}
-
-{%
-  include cardv2.html
-  title="DNSCrypt-Proxy - Tool"
-  image="/assets/img/tools/DNSCrypt-Proxy.png"
-  description="DNSCrypt-Proxy is a command-line DNS proxy with support for the encrypted DNS protocols, DNS over HTTPS and DNSCrypt. Can cache results to improve speed, and allows filtering, forwarding, and cloaking."
-  website="https://github.com/jedisct1/dnscrypt-proxy/"
-  forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
-  github="https://github.com/jedisct1/dnscrypt-proxy/"
-  windows="https://github.com/jedisct1/dnscrypt-proxy/releases"
-  linux=""
-  mac="https://github.com/jedisct1/dnscrypt-proxy/releases"
-  freebsd="https://www.freshports.org/dns/dnscrypt-proxy2/"
-  openbsd="http://openports.se/net/dnscrypt-proxy"
-  netbsd="http://pkgsrc.se/net/dnscrypt-proxy2"
-  android=""
-  ios=""
-%}
-
-<h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted ICANN DNS Providers</h1>
+<h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted DNS Providers</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But it will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here.</strong>
@@ -38,7 +10,7 @@
   <table class="table sortable-theme-bootstrap" data-sortable>
     <thead>
       <tr>
-        <th data-sorted="true" data-sorted-direction="ascending">ICANN DNS Provider</th>
+        <th data-sorted="true" data-sorted-direction="ascending">DNS Provider</th>
         <th data-sortable="true">Server Locations</th>
         <th data-sortable="false">Privacy Policy</th>
         <th data-sortable="true">Type</th>
@@ -570,7 +542,7 @@
   <li>QNAME Minimization - Run <code>dig +short txt qnamemintest.internet.nl</code> from the command-line (taken from <a href="https://nlnetlabs.nl/downloads/presentations/unbound_qnamemin_oarc24.pdf">this NLnet Labs presentation</a>). If you are on Windows 10, run <code>Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl</code> from the PowerShell. You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code></li>
 </ul>
 
-<h3 id="clients">Worth Mentioning and Additional Information</h3>
+<h3 id="clients">Software suggestions and Additional Information</h3>
 
 <ul>
   <li><strong>Encrypted DNS clients for desktop:</strong>
-- 
2.47.2


From 0d1439651a8010ef3afc42b05965544e0285fb29 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Wed, 16 Oct 2019 00:56:25 +0300
Subject: [PATCH 2/4] dns: remove icanndns anchor

---
 _includes/sections/dns.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index eb3bbf4d..d22a8f81 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -1,7 +1,5 @@
 <h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Domain Name System (DNS)</h1>
 
-<h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted DNS Providers</h1>
-
 <div class="alert alert-warning" role="alert">
   <strong>Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But it will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here.</strong>
 </div>
-- 
2.47.2


From fe32acd2d15d3cec6993a22e49c26f6672e7c0bd Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Mon, 4 Nov 2019 13:47:28 +0200
Subject: [PATCH 3/4] dns: retitle

---
 pages/providers/dns.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/providers/dns.html b/pages/providers/dns.html
index c93dfce6..cf1aa1e8 100644
--- a/pages/providers/dns.html
+++ b/pages/providers/dns.html
@@ -1,7 +1,7 @@
 ---
 layout: page
 permalink: /providers/dns/
-title: "DNS / Domain Providers"
+title: "Encrypted DNS Resolvers"
 description: "Don't let Google see all your DNS traffic. Discover privacy-centric alternatives to the traditional DNS providers."
 ---
 
-- 
2.47.2


From 087101b01a124743e23f666ca36bd15e1118fd3d Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Mon, 4 Nov 2019 13:53:16 +0200
Subject: [PATCH 4/4] dns: retitle the other file too

---
 _includes/sections/dns.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 8b7259aa..26b12213 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -1,4 +1,4 @@
-<h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Domain Name System (DNS)</h1>
+<h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Encrypted Domain Name System (DNS) Resolvers</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But it will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here.</strong>
-- 
2.47.2