example-config: 10-mail.conf: Added example configuration for the new settings relati...

diff --git a/doc/example-config/conf.d/10-mail.conf b/doc/example-config/conf.d/10-mail.conf
index 2768129a8345e58b747039153c4c0792c813b0a0..ea4c9e0fd42a7b2d6e25ebd5c4fb7cc5f3ad9057 100644 (file)
--- a/doc/example-config/conf.d/10-mail.conf
+++ b/doc/example-config/conf.d/10-mail.conf
@@ -130,6 +130,18 @@ namespace inbox {
 # URLAUTH and METADATA extensions.
 #mail_attribute_dict =
 
+# A comment or note that is associated with the server. This value is
+# accessible for authenticated users through the IMAP METADATA server
+# entry "/shared/comment". 
+#mail_server_comment = ""
+
+# Indicates a method for contacting the server administrator. According to
+# RFC 5464, this value MUST be a URI (e.g., a mailto: or tel: URL), but that
+# is currently not enforced. Use for example mailto:admin@example.com. This
+# value is accessible for authenticated users through the IMAP METADATA server
+# entry "/shared/admin".
+#mail_server_admin = 
+
 ##
 ## Mail processes
 ##

diff --git a/doc/example-config/conf.d/15-mailboxes.conf b/doc/example-config/conf.d/15-mailboxes.conf
index 6f5bef40a224f93e6eb0a330ac1d4dbb4f8997f7..cd5b21b828b9508dc75f10816406d54cd11e5a10 100644 (file)
--- a/doc/example-config/conf.d/15-mailboxes.conf
+++ b/doc/example-config/conf.d/15-mailboxes.conf
@@ -34,6 +34,13 @@
 #                 have been sent.
 #     \Trash    - This mailbox is used to hold messages that have been
 #                 deleted.
+#
+# comment:
+#   Defines a default comment or note associated with the mailbox. This
+#   value is accessible through the IMAP METADATA mailbox entries
+#   "/shared/comment" and "/private/comment". Users with sufficient
+#   privileges can override the default value for entries with a custom
+#   value.
 
 # NOTE: Assumes "namespace inbox" has been defined in 10-mail.conf.
 namespace inbox {
@@ -60,10 +67,12 @@ namespace inbox {
   # If you have a virtual "All messages" mailbox:
   #mailbox virtual/All {
   #  special_use = \All
+  #  comment = All my messages
   #}
 
   # If you have a virtual "Flagged" mailbox:
   #mailbox virtual/Flagged {
   #  special_use = \Flagged
+  #  comment = All my flagged messages
   #}
 }