From dba248f0b9fd673148c98eb6d93dae6608306398 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Tue, 15 Dec 2015 09:58:19 +0800
Subject: [PATCH] Add both rewrite rules for '/.well-known/' in Nginx config
 file.

---
 en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md | 10 +++-------
 html/upgrade.iredmail.0.9.2-0.9.3.html          |  8 +++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md b/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md
index 45547aee..23f1cccd 100644
--- a/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md
+++ b/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md
@@ -385,13 +385,9 @@ file, then restart or reload Nginx service.
 
 <h5>2: Redirect /.well-known/carddav access to SOGo</h5>
 
-Find below line in `default.conf`:
-
-```
-rewrite ^/.well-known/caldav    /SOGo/dav permanent;
-```
-
-Add a new line right after above line:
+iRedMail doesn't have `/.well-known` redirection in Nginx by default, so
+please add lines below in the `server { listen 443; ...}` block,
+in file `default.conf`:
 
 ```
 rewrite ^/.well-known/caldav    /SOGo/dav permanent;
diff --git a/html/upgrade.iredmail.0.9.2-0.9.3.html b/html/upgrade.iredmail.0.9.2-0.9.3.html
index ad55f1ef..c457b7da 100644
--- a/html/upgrade.iredmail.0.9.2-0.9.3.html
+++ b/html/upgrade.iredmail.0.9.2-0.9.3.html
@@ -405,11 +405,9 @@ file, then restart or reload Nginx service.</p>
 
 <h5>2: Redirect /.well-known/carddav access to SOGo</h5>
 
-<p>Find below line in <code>default.conf</code>:</p>
-<pre><code>rewrite ^/.well-known/caldav    /SOGo/dav permanent;
-</code></pre>
-
-<p>Add a new line right after above line:</p>
+<p>iRedMail doesn't have <code>/.well-known</code> redirection in Nginx by default, so
+please add lines below in the <code>server { listen 443; ...}</code> block,
+in file <code>default.conf</code>:</p>
 <pre><code>rewrite ^/.well-known/caldav    /SOGo/dav permanent;
 rewrite ^/.well-known/carddav   /SOGo/dav permanent;
 </code></pre>