From fdf4e5fdec2ca1a0c86cb9cb0903d1ffae97ee6a Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Sat, 26 May 2018 17:06:36 +0800
Subject: [PATCH] Fix incorrect ldap attribute in dovecot ldap lookup.

---
 en_US/upgrade/0-upgrade.iredmail.0.9.8-0.9.9.md | 4 ++--
 html/upgrade.iredmail.0.9.8-0.9.9.html          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.8-0.9.9.md b/en_US/upgrade/0-upgrade.iredmail.0.9.8-0.9.9.md
index 766361c9..bfbc2604 100644
--- a/en_US/upgrade/0-upgrade.iredmail.0.9.8-0.9.9.md
+++ b/en_US/upgrade/0-upgrade.iredmail.0.9.8-0.9.9.md
@@ -146,11 +146,11 @@ line like below:
 user_attrs      = mail=master_user,mail=user,homeDirectory=home,=mail=maildir:~/Maildir/,mailQuota=quota_rule=*:bytes=%$
 ```
 
-Please replace `maildir:` by `${ldap:mailboxFormat:maildir}`. After modified,
+Please replace `maildir:` by `%{ldap:mailboxFormat:maildir}`. After modified,
 it looks like below:
 
 ```
-user_attrs      = mail=master_user,mail=user,homeDirectory=home,=mail=${ldap:mailboxFormat:maildir}:~/Maildir/,mailQuota=quota_rule=*:bytes=%$
+user_attrs      = mail=master_user,mail=user,homeDirectory=home,=mail=%{ldap:mailboxFormat:maildir}:~/Maildir/,mailQuota=quota_rule=*:bytes=%$
 ```
 
 If attribute `mailboxFormat` doesn't present in user object, Dovecot will use
diff --git a/html/upgrade.iredmail.0.9.8-0.9.9.html b/html/upgrade.iredmail.0.9.8-0.9.9.html
index cb7289c0..541df22b 100644
--- a/html/upgrade.iredmail.0.9.8-0.9.9.html
+++ b/html/upgrade.iredmail.0.9.8-0.9.9.html
@@ -181,9 +181,9 @@ line like below:</p>
 <pre><code>user_attrs      = mail=master_user,mail=user,homeDirectory=home,=mail=maildir:~/Maildir/,mailQuota=quota_rule=*:bytes=%$
 </code></pre>
 
-<p>Please replace <code>maildir:</code> by <code>${ldap:mailboxFormat:maildir}</code>. After modified,
+<p>Please replace <code>maildir:</code> by <code>%{ldap:mailboxFormat:maildir}</code>. After modified,
 it looks like below:</p>
-<pre><code>user_attrs      = mail=master_user,mail=user,homeDirectory=home,=mail=${ldap:mailboxFormat:maildir}:~/Maildir/,mailQuota=quota_rule=*:bytes=%$
+<pre><code>user_attrs      = mail=master_user,mail=user,homeDirectory=home,=mail=%{ldap:mailboxFormat:maildir}:~/Maildir/,mailQuota=quota_rule=*:bytes=%$
 </code></pre>
 
 <p>If attribute <code>mailboxFormat</code> doesn't present in user object, Dovecot will use