Merge branch 'master' into dev

FAQ.md

@@ -411,7 +411,8 @@ Anything on this list is in random order and *might* be added in the near future
 * [(198) Can you add spell checking?](#faq198)
 * [(199) Can you add proxy support?](#faq199)
 * [(200) How can I use Adguard to remove tracking parameters?](#faq200)
-* [(201) What is certificate transparency](#faq201)
+* [(201) What is certificate transparency?](#faq201)
+* [(202) What is DANE?](#faq202)
 
 [I have another question.](#get-support)
 
@@ -5670,6 +5671,19 @@ FairEmail uses [this library](https://github.com/appmattus/certificatetransparen
 
 <br>
 
+<a name="faq202"></a>
+**(202) What is DANE?**
+
+Please see [this Wikipedia article](https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities) about what DANE is.
+
+You can use [this tool](https://ssl-tools.net/tlsa-generator) to generate TSLA DNS records.
+
+You can enable enforcing DANA in the (advanced) account and identity settings (since version 1.2148).
+
+Note that only some email servers support DANE and that only a limited number of DNS servers support DNSSEC, which is required for DANE.
+
+<br>
+
 <h2><a name="get-support"></a>Get support</h2>
 
 &#x1F30E; [Google Translate](https://translate.google.com/translate?sl=en&u=https%3A%2F%2Fm66b.github.io%2FFairEmail%2F%23get-support)

index.html

@@ -364,7 +364,8 @@
 <li><a href="#faq198">(198) Can you add spell checking?</a></li>
 <li><a href="#faq199">(199) Can you add proxy support?</a></li>
 <li><a href="#faq200">(200) How can I use Adguard to remove tracking parameters?</a></li>
-<li><a href="#faq201">(201) What is certificate transparency</a></li>
+<li><a href="#faq201">(201) What is certificate transparency?</a></li>
+<li><a href="#faq202">(202) What is DANE?</a></li>
 </ul>
 <p><a href="#get-support">I have another question.</a></p>
 <p><a name="faq1"></a> <strong>(1) Which permissions are needed and why?</strong></p>
@@ -2773,6 +2774,12 @@ adb install /path/to/FairEmail-xxx.apk</code></pre>
 <p>When certificate transparency is enabled in the connection-settings tab page of the app, the <a href="https://github.com/GoogleChrome/CertificateTransparency/blob/master/ct_policy.md">Chrome Certificate Transparency Policy</a> will be applied.</p>
 <p>FairEmail uses <a href="https://github.com/appmattus/certificatetransparency">this library</a> to implement certificate transparency via a custom trust manager.</p>
 <p><br></p>
+<p><a name="faq202"></a> <strong>(202) What is DANE?</strong></p>
+<p>Please see <a href="https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">this Wikipedia article</a> about what DANE is.</p>
+<p>You can use <a href="https://ssl-tools.net/tlsa-generator">this tool</a> to generate TSLA DNS records.</p>
+<p>You can enable enforcing DANA in the (advanced) account and identity settings (since version 1.2148).</p>
+<p>Note that only some email servers support DANE and that only a limited number of DNS servers support DNSSEC, which is required for DANE.</p>
+<p><br></p>
 <h2>
 <a name="get-support"></a>Get support
 </h2>