Mercurial > dovecot > original-hg > dovecot-1.2

changeset 4702:11f080e5eff4 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the name "mail root directory" to describe where the non-INBOX mbox mailboxes are and describe what it is in the config file.
author Timo Sirainen <tss@iki.fi>
date Tue, 17 Oct 2006 14:03:30 +0300
parents 190a66df2f82
children 7c7faac6d801
files dovecot-example.conf src/lib-storage/index/mbox/mbox-storage.c
diffstat 2 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/dovecot-example.conf	Tue Oct 17 13:55:56 2006 +0300
+++ b/dovecot-example.conf	Tue Oct 17 14:03:30 2006 +0300
@@ -184,9 +184,10 @@
 # mailboxes automatically. This won't work if the user doesn't have any mail
 # yet, so you should explicitly tell Dovecot the full location.
 #
-# If you're using mbox, giving a path to INBOX file (eg. /var/mail/%u) isn't
-# enough. You'll also need to tell Dovecot where the other mailboxes are and
-# where Dovecot can place its index files.
+# If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u)
+# isn't enough. You'll also need to tell Dovecot where the other mailboxes are
+# and where Dovecot can place its index files. This is called the "root mail
+# directory", and it must be the first path given in the mail_location setting.
 #
 # There are a few special variables you can use, eg.:
 #
@@ -197,9 +198,9 @@
 #
 # See doc/variables.txt for full list. Some examples:
 #
-#   mail_location = maildir:/var/mail/%1u/%u/Maildir
-#   mail_location = mbox:~/mail/:INBOX=/var/mail/%u
-#   mail_location = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
+#   mail_location = maildir:~/Maildir
+#   mail_location = mbox:~/mail:INBOX=/var/mail/%u
+#   mail_location = mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%n
 #
 # http://wiki.dovecot.org/MailLocation
 #
--- a/src/lib-storage/index/mbox/mbox-storage.c	Tue Oct 17 13:55:56 2006 +0300
+++ b/src/lib-storage/index/mbox/mbox-storage.c	Tue Oct 17 14:03:30 2006 +0300
@@ -193,7 +193,7 @@
 		return "/";
 
 	if (debug)
-		i_info("mbox: root directory not found");
+		i_info("mbox: root mail directory not found");
 
 	return NULL;
 }
@@ -235,14 +235,14 @@
 
 	home = getenv("HOME");
 	if (home == NULL) {
-		i_error("mbox: We need root IMAP folder, "
+		i_error("mbox: We need root mail directory, "
 			"but can't find it or HOME environment");
 		return NULL;
 	}
 
 	path = t_strconcat(home, "/mail", NULL);
 	if (mkdir_parents(path, CREATE_MODE) < 0) {
-		i_error("mbox: Can't create root IMAP folder %s: %m", path);
+		i_error("mbox: Can't create root mail directory %s: %m", path);
 		return NULL;
 	}
 
@@ -268,7 +268,7 @@
 	autodetect = data == NULL || *data == '\0';
 	if (autodetect) {
 		if ((flags & MAIL_STORAGE_FLAG_NO_AUTODETECTION) != 0) {
-			i_error("mbox: root directory not given");
+			i_error("mbox: root mail directory not given");
 			return NULL;
 		}
 
@@ -277,7 +277,7 @@
 		   either $HOME/mail or $HOME/Mail */
 		root_dir = get_root_dir(flags);
 	} else {
-		/* <root folder> | <INBOX path>
+		/* <root mail directory> | <INBOX path>
 		   [:INBOX=<path>] [:INDEX=<dir>] */
 		if (debug)
 			i_info("mbox: data=%s", data);