From: yamaoka <yamaoka>
Date: Thu, 25 May 2000 22:56:15 +0000 (+0000)
Subject: Sync with Gnus.
X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~40
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab93cd87c89e4e3f860095cb029a3bb8cbd20614;p=elisp%2Fgnus.git-

Sync with Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79e665e..a7aad1b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-25  Simon Josefsson  <jas@pdc.kth.se>
+
+	* gnus-group.el (gnus-group-nnimap-edit-acl): Help text updated
+	from latest draft.
+
 2000-05-08  Simon Josefsson  <jas@pdc.kth.se>
 
 	* gnus-group.el (gnus-group-expire-articles-1): Make sure server
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 5d48fc5..7367cd4 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2467,14 +2467,14 @@ score file entries for articles to include in the group."
    l - lookup (mailbox is visible to LIST/LSUB commands)
    r - read (SELECT the mailbox, perform CHECK, FETCH, PARTIAL,
        SEARCH, COPY from mailbox)
-   s - keep seen/unseen information across sessions (STORE SEEN flag)
-   w - write (STORE flags other than SEEN and DELETED)
+   s - keep seen/unseen information across sessions (STORE \\SEEN flag)
+   w - write (STORE flags other than \\SEEN and \\DELETED)
    i - insert (perform APPEND, COPY into mailbox)
    p - post (send mail to submission address for mailbox,
        not enforced by IMAP4 itself)
-   c - create (CREATE new sub-mailboxes in any implementation-defined
-       hierarchy)
-   d - delete (STORE DELETED flag, perform EXPUNGE)
+   c - create and delete mailbox (CREATE new sub-mailboxes in any
+       implementation-defined hierarchy, RENAME or DELETE mailbox)
+   d - delete messages (STORE \\DELETED flag, perform EXPUNGE)
    a - administer (perform SETACL)" group)
 		    `(lambda (form)
 		       (nnimap-acl-edit