Merge master into i18n branch #1454

Merged
djoate merged 103 commits from i18n into i18n 2019-11-02 20:43:17 +00:00
3 changed files with 10 additions and 12 deletions
Showing only changes of commit 910c44fa85 - Show all commits

View File

@@ -6,16 +6,6 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2">
<div class="col-lg-3 col-sm-12 pt-lg-5">
<img src="/assets/img/addons/Blokada.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Blokada">
</div>
<div class="col">
<h3>Block ads with <a href="https://blokada.org/">Blokada</a></h3>
<p><strong>Blokada</strong> works across all of your apps, not only the browser. It doesn't require root, supports both wifi and mobile networks, and is perfectly safe and simple to use. Just turn it on, and it will do the job silently!
</div>
</div>
<div class="row mb-2"> <div class="row mb-2">
<div class="col-lg-3 col-sm-12 pt-lg-5"> <div class="col-lg-3 col-sm-12 pt-lg-5">
<img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard"> <img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
@@ -36,4 +26,12 @@
</div> </div>
</div> </div>
</div> </div>
<h2>See also</h2>
<ul>
<li>
<a href="/providers/dns#clients">Our DNS page</a> which also has information on encrypting DNS on Android.
</li>
</ul>

View File

@@ -533,7 +533,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> <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> </ul>
<h3>Worth Mentioning and Additional Information</h3> <h3 id="clients">Worth Mentioning and Additional Information</h3>
<ul> <ul>
<li><strong>Encrypted DNS clients for desktop:</strong> <li><strong>Encrypted DNS clients for desktop:</strong>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB