From e23666d1d68035d9c73114401e370e10c18a789a Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Fri, 28 Aug 2015 17:27:28 +0800
Subject: [PATCH] Typo in en_US/faq/1-why.append.timestamp.in.maildir.path.md.
---
.../1-why.append.timestamp.in.maildir.path.md | 18 +++++++---------
.../why.append.timestamp.in.maildir.path.html | 21 ++++++++++---------
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/en_US/faq/1-why.append.timestamp.in.maildir.path.md b/en_US/faq/1-why.append.timestamp.in.maildir.path.md
index f9dfc743..50719f54 100644
--- a/en_US/faq/1-why.append.timestamp.in.maildir.path.md
+++ b/en_US/faq/1-why.append.timestamp.in.maildir.path.md
@@ -6,8 +6,8 @@ Depends on the tools/scripts you used to create mail accounts, it's tunable
in scripts shipped within iRedMail and iRedAdmin (file `settings.py`, variable
`MAILDIR_APPEND_TIMESTAMP = True` or `False`).
-Deleting mail accounts with iRedAdmin will not remove the mailboxes on file
-system, so that you can keep user's mailbox for some time.
+> Note: Deleting mail accounts with iRedAdmin will not remove the mailboxes on
+> file system, so that you can keep user's mailbox for some time.
Think about this situation:
@@ -17,14 +17,12 @@ in maildir path, the maildir path of his mailbox looks like
* Michael left company, and your company deleted his mail account. With
iRedAdmin, it just deletes mail accounts stored in LDAP/SQL server, not delete
-his mailbox on file system (`var/vmail/vmail1/domain.ltd/mj`).
+his mailbox on file system (`/var/vmail/vmail1/domain.ltd/mj`).
-* A new talent joined in, his name is Mike Jackson, and he want to use
+* A new talent, Mike Jackson, joined your company, and he want to use
`mj@domain.ltd` since `mj@` is not used by others. And you created it for him.
Without timestamp in maildir path, the maildir path of Mike's mailbox is the
-same as Michael's `/var/vmail/vmail1/domain.ltd/mj/`.
-
-iRedAdmin doesn't remove the mailboxes on file system, so Mike will see all
-emails in Michael's mailbox if Michael didn't delete them. To avoid this, we
-append a timestamp in maildir path to make sure all users will be assigned
-a unique maildir paths.
+same as Michael's `/var/vmail/vmail1/domain.ltd/mj/`. iRedAdmin doesn't remove
+the mailboxes on file system, so Mike will see all emails in Michael's mailbox
+if Michael didn't delete them. To avoid this, we append a timestamp in maildir
+path to make sure all users will be assigned an unique maildir paths.
diff --git a/html/why.append.timestamp.in.maildir.path.html b/html/why.append.timestamp.in.maildir.path.html
index dc909913..fc5cda7a 100644
--- a/html/why.append.timestamp.in.maildir.path.html
+++ b/html/why.append.timestamp.in.maildir.path.html
@@ -15,8 +15,10 @@
Depends on the tools/scripts you used to create mail accounts, it's tunable
in scripts shipped within iRedMail and iRedAdmin (file settings.py
, variable
MAILDIR_APPEND_TIMESTAMP = True
or False
).
-Deleting mail accounts with iRedAdmin will not remove the mailboxes on file
-system, so that you can keep user's mailbox for some time.
+
+Note: Deleting mail accounts with iRedAdmin will not remove the mailboxes on
+file system, so that you can keep user's mailbox for some time.
+
Think about this situation:
-
@@ -27,19 +29,18 @@ in maildir path, the maildir path of his mailbox looks like
-
Michael left company, and your company deleted his mail account. With
iRedAdmin, it just deletes mail accounts stored in LDAP/SQL server, not delete
-his mailbox on file system (var/vmail/vmail1/domain.ltd/mj
).
+his mailbox on file system (/var/vmail/vmail1/domain.ltd/mj
).
-A new talent joined in, his name is Mike Jackson, and he want to use
+
A new talent, Mike Jackson, joined your company, and he want to use
mj@domain.ltd
since mj@
is not used by others. And you created it for him.
Without timestamp in maildir path, the maildir path of Mike's mailbox is the
-same as Michael's /var/vmail/vmail1/domain.ltd/mj/
.
+same as Michael's /var/vmail/vmail1/domain.ltd/mj/
. iRedAdmin doesn't remove
+the mailboxes on file system, so Mike will see all emails in Michael's mailbox
+if Michael didn't delete them. To avoid this, we append a timestamp in maildir
+path to make sure all users will be assigned an unique maildir paths.
-
-iRedAdmin doesn't remove the mailboxes on file system, so Mike will see all
-emails in Michael's mailbox if Michael didn't delete them. To avoid this, we
-append a timestamp in maildir path to make sure all users will be assigned
-a unique maildir paths.
Document published under a CC BY-ND 3.0 license. If you found something wrong, please do contact us to fix it.