From a70ada36554964c20c6fd46356f591bf7f4c2ccd Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <zhb@iredmail.org>
Date: Mon, 12 Jul 2021 12:07:22 +0800
Subject: [PATCH] Small typo and sync HTML files. Thanks for @modir's
 contributions. :)

---
 en_US/installation/0-setup.dns.md    |  5 ++---
 en_US/mua/2-configure.thunderbird.md |  4 +++-
 html/activesync.bb10.html            |  2 --
 html/configure.thunderbird.html      |  5 +++++
 html/dovecot.imapsieve.html          |  2 +-
 html/iredadmin-pro.restful.api.html  |  4 ++--
 html/setup.dns.html                  | 25 ++++++++++++++++++++++++-
 html/thunderbird.sogo.html           | 13 +++----------
 8 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/en_US/installation/0-setup.dns.md b/en_US/installation/0-setup.dns.md
index fe05bf19..29322edb 100644
--- a/en_US/installation/0-setup.dns.md
+++ b/en_US/installation/0-setup.dns.md
@@ -127,7 +127,8 @@ autoconfig/autodiscover.company.com records allow mail clients to fetch automati
 client configuration of a mailbox. If the mailbox to configure is user@company.com then
 it will automatically check autodiscover.company.com for the correct configuration.
 
-More information is available here: https://docs.iredmail.org/iredmail-easy.autoconfig.autodiscover.html
+More information is available here:
+[Setup DNS records for autoconfig and autodiscover](https://docs.iredmail.org/iredmail-easy.autoconfig.autodiscover.html).
 
 ### How to setup the autoconfig/autodiscover record
 
@@ -144,8 +145,6 @@ autodiscover.mydomain.com.   10          mx      mail.mydomain.com.
 autoconfig.mydomain.com.   10          mx      mail.mydomain.com.
 ```
 
-
-
 ## SPF record for the mail domain name {: id="spf" }
 
 ### What is a SPF record
diff --git a/en_US/mua/2-configure.thunderbird.md b/en_US/mua/2-configure.thunderbird.md
index f5d46e16..ae701f1a 100644
--- a/en_US/mua/2-configure.thunderbird.md
+++ b/en_US/mua/2-configure.thunderbird.md
@@ -18,7 +18,9 @@ Note:
 
 * Login username must be full email address. You may want to click `Edit` to ensure it is correct.
 * If you want to use POP3 instead of IMAP, click "Edit" and change it to POP3 in this screen with port `110`, `STARTTLS`.
-* The automatic detection only works properly if the autoconfig/autodiscover DNS records have been created properly. More information about them can be found here https://docs.iredmail.org/iredmail-easy.autoconfig.autodiscover.html or here https://docs.iredmail.org/setup.dns.html
+* The automatic detection only works properly if the autoconfig/autodiscover DNS records have been created properly. More information about them can be found in tutroials:
+    * [Setup DNS records for autoconfig and autodiscover](https://docs.iredmail.org/iredmail-easy.autoconfig.autodiscover.html)
+    * [Setup DNS records for your iRedMail server](https://docs.iredmail.org/setup.dns.html)
 
 ![](./images/thunderbird/new.mail.account.setup.png)
 
diff --git a/html/activesync.bb10.html b/html/activesync.bb10.html
index 6a7825d1..87279ecf 100644
--- a/html/activesync.bb10.html
+++ b/html/activesync.bb10.html
@@ -27,8 +27,6 @@
 <li>Apple Mail.app, and Outlook for Mac support EWS. But not EAS.</li>
 <li>Outlook 2010 for Windows supports MAPI.</li>
 </ul>
-<p>iRedMail doesn't integrate <a href="http://www.openchange.org">OpenChange</a> and
-<a href="http://www.samba.org">Samba4</a> for native MAPI support.</p>
 </div>
 <h2 id="requirements">Requirements</h2>
 <ul>
diff --git a/html/configure.thunderbird.html b/html/configure.thunderbird.html
index 0968fff8..723f300a 100644
--- a/html/configure.thunderbird.html
+++ b/html/configure.thunderbird.html
@@ -38,6 +38,11 @@
 <ul>
 <li>Login username must be full email address. You may want to click <code>Edit</code> to ensure it is correct.</li>
 <li>If you want to use POP3 instead of IMAP, click "Edit" and change it to POP3 in this screen with port <code>110</code>, <code>STARTTLS</code>.</li>
+<li>The automatic detection only works properly if the autoconfig/autodiscover DNS records have been created properly. More information about them can be found in tutroials:<ul>
+<li><a href="https://docs.iredmail.org/iredmail-easy.autoconfig.autodiscover.html">Setup DNS records for autoconfig and autodiscover</a></li>
+<li><a href="https://docs.iredmail.org/setup.dns.html">Setup DNS records for your iRedMail server</a></li>
+</ul>
+</li>
 </ul>
 <p><img alt="" src="./images/thunderbird/new.mail.account.setup.png" /></p>
 <h2 id="configure-thunderbird-as-pop3-client">Configure Thunderbird as POP3 client</h2>
diff --git a/html/dovecot.imapsieve.html b/html/dovecot.imapsieve.html
index abf188d0..ae750035 100644
--- a/html/dovecot.imapsieve.html
+++ b/html/dovecot.imapsieve.html
@@ -282,7 +282,7 @@ done
 
 # If there're a lot files, direct `mv` command may fail with error like
 # `argument list too long`, so we need `find` in this case.
-if [[ X&quot;${KERNEL_NAME}&quot; == X'OPENBSD' ]]; then
+if [[ X&quot;${KERNEL_NAME}&quot; == X'OPENBSD' ]] || [[ X&quot;${KERNEL_NAME}&quot; == X'FREEBSD' ]]; then
     [[ -d ${SPOOL_SPAM_DIR} ]] &amp;&amp; find ${SPOOL_SPAM_DIR} -name '*.eml' -exec mv {} ${SPOOL_LEARN_SPAM_DIR}/ \;
     [[ -d ${SPOOL_HAM_DIR} ]]  &amp;&amp; find ${SPOOL_HAM_DIR}  -name '*.eml' -exec mv {} ${SPOOL_LEARN_HAM_DIR}/  \;
 else
diff --git a/html/iredadmin-pro.restful.api.html b/html/iredadmin-pro.restful.api.html
index 79fb726d..d1d1f496 100644
--- a/html/iredadmin-pro.restful.api.html
+++ b/html/iredadmin-pro.restful.api.html
@@ -621,7 +621,7 @@ to be a domain admin.</p>
 <p class="admonition-title"><code class="get">GET</code> <code class="url">/api/admin/&lt;mail&gt;</code> <code class="comment">Get profile of an existing domain admin</code> <code class="has_params">Parameters</code></p>
 <p><div class="params params_user">
 Encrypted account password is not exposed in API request by default, if you
-want to it for some reason, please add a new line in iRedAdmin-Pro config
+want to expose it for some reason, please add a new line in iRedAdmin-Pro config
 file <code>/opt/www/iredadmin/settings.py</code> like below, then restart <code>iredadmin</code>
 service:</p>
 <p><code>API_HIDDEN_ADMIN_PROFILES = []</code></p>
@@ -853,7 +853,7 @@ service:</p>
 <p class="admonition-title"><code class="get">GET</code> <code class="url">/api/user/&lt;mail&gt;</code> <code class="comment">Get profile of an existing mail user</code> <code class="has_params">Parameters</code></p>
 <p><div class="params params_user">
 Encrypted account password is not exposed in API request by default, if you
-want to it for some reason, please add a new line in iRedAdmin-Pro config
+want to expose it for some reason, please add a new line in iRedAdmin-Pro config
 file <code>/opt/www/iredadmin/settings.py</code> like below, then restart <code>iredadmin</code>
 service:</p>
 <p><code>API_HIDDEN_USER_PROFILES = []</code></p>
diff --git a/html/setup.dns.html b/html/setup.dns.html
index cadb1358..fdf1c7b7 100644
--- a/html/setup.dns.html
+++ b/html/setup.dns.html
@@ -35,6 +35,11 @@
 <li><a href="#how-to-setup-the-mx-record">How to setup the MX record</a></li>
 </ul>
 </li>
+<li><a href="#autodiscover-for-your-domain">autodiscover for your domain</a><ul>
+<li><a href="#what-is-an-autoconfigautodiscover-record">What is an autoconfig/autodiscover record</a></li>
+<li><a href="#how-to-setup-the-autoconfigautodiscover-record">How to setup the autoconfig/autodiscover record</a></li>
+</ul>
+</li>
 <li><a href="#spf">SPF record for the mail domain name</a><ul>
 <li><a href="#what-is-a-spf-record">What is a SPF record</a></li>
 <li><a href="#how-to-setup-the-spf-record">How to setup the SPF record</a></li>
@@ -148,11 +153,29 @@ you need to create the MX records in your DNS zone yourself.</p>
 <p>Sample MX record:</p>
 <pre><code>NAME            PRIORITY    TYPE    DATA
 
-mydomain.com.   10          mx      mail.mydomain.com
+mydomain.com.   10          mx      mail.mydomain.com.
 </code></pre>
 
 <p>The end result of this record is, emails sent to <code>[user]@mydomain.com</code> will
 be delivered to server <code>mail.mydomain.com</code>.</p>
+<h2 id="autodiscover-for-your-domain">autodiscover for your domain</h2>
+<h3 id="what-is-an-autoconfigautodiscover-record">What is an autoconfig/autodiscover record</h3>
+<p>autoconfig/autodiscover.company.com records allow mail clients to fetch automatically the mail
+client configuration of a mailbox. If the mailbox to configure is user@company.com then
+it will automatically check autodiscover.company.com for the correct configuration.</p>
+<p>More information is available here:
+<a href="https://docs.iredmail.org/iredmail-easy.autoconfig.autodiscover.html">Setup DNS records for autoconfig and autodiscover</a>.</p>
+<h3 id="how-to-setup-the-autoconfigautodiscover-record">How to setup the autoconfig/autodiscover record</h3>
+<p>If your ISP or domain name registrar is providing the DNS service, you can
+request them to set one up for you. If you manage your own DNS servers then
+you need to create the autoconfig/autodiscover records in your DNS zone yourself.</p>
+<p>Sample autoconfig/autodiscover record:</p>
+<pre><code>NAME            PRIORITY    TYPE    DATA
+
+autodiscover.mydomain.com.   10          mx      mail.mydomain.com.
+autoconfig.mydomain.com.   10          mx      mail.mydomain.com.
+</code></pre>
+
 <h2 id="spf">SPF record for the mail domain name</h2>
 <h3 id="what-is-a-spf-record">What is a SPF record</h3>
 <p>SPF is a spam and phishing scam fighting method which uses DNS SPF-records to
diff --git a/html/thunderbird.sogo.html b/html/thunderbird.sogo.html
index f2cfc8ec..c8d6f7af 100644
--- a/html/thunderbird.sogo.html
+++ b/html/thunderbird.sogo.html
@@ -19,8 +19,7 @@
 <div class="toc">
 <ul>
 <li><a href="#setup-thunderbird-sogo-address-book-and-calendar-synchronization-with-carddav-and-caldav">Setup Thunderbird: SOGo Address Book and Calendar synchronization with CardDAV and CalDAV</a><ul>
-<li><a href="#calendar-caldav-with-thunderbird-add-on-lightning">Calendar (CalDAV) with Thunderbird add-on 'Lightning'</a><ul>
-<li><a href="#install-thunderbird-lightning">Install Thunderbird Lightning</a></li>
+<li><a href="#calendar-caldav-with-thunderbird">Calendar (CalDAV) with Thunderbird</a><ul>
 <li><a href="#configure-remote-calendar">Configure Remote Calendar</a></li>
 </ul>
 </li>
@@ -33,14 +32,8 @@
 </li>
 </ul>
 </div>
-<p>SOGo Connector extention provides integration of Mozilla Thunderbird with the SOGo groupware solution. It does this by adding support for remote DAV address books and by adding features to be used along with the Lightning calendar extension.</p>
-<h2 id="calendar-caldav-with-thunderbird-add-on-lightning">Calendar (CalDAV) with Thunderbird add-on 'Lightning'</h2>
-<h3 id="install-thunderbird-lightning">Install Thunderbird Lightning</h3>
-<p>Lightning is a calendar add-on for Thunderbird.</p>
-<p>Launch Thunderbird, click menu: <code>Tools</code> -&gt; <code>Add-ons</code>, Search "Lightning" and
-install it.</p>
-<p><img alt="" src="./images/thunderbird/sogo_lightning_addon_install.png" /></p>
-<p>Restart Thunderbird after installation.</p>
+<p>SOGo Connector extention provides integration of Mozilla Thunderbird with the SOGo groupware solution. It does this by adding support for remote DAV address books and by adding features to the calendar.</p>
+<h2 id="calendar-caldav-with-thunderbird">Calendar (CalDAV) with Thunderbird</h2>
 <h3 id="configure-remote-calendar">Configure Remote Calendar</h3>
 <p>To use SOGo calendar, we need to get the link of SOGo Calendar first.</p>
 <ul>