Allow to turn off translation of generated html options in menu method

[roundup.git] / doc / user_guide.txt

diff --git a/doc/user_guide.txt b/doc/user_guide.txt
index 944013251e546ab0dd5e07b6d90fa48592b9795d..055c5da5cc14ef162bf7189f02d31b4a5d5603a7 100644 (file)
--- a/doc/user_guide.txt
+++ b/doc/user_guide.txt
@@ -440,7 +440,7 @@ For example,
 
 - setting the priority of an issue::
 
-   Subject: Re: [issue1] the coffee machine is broken! [priority=urgent]
+   Subject: Re: [issue2] the coffee machine is broken! [priority=urgent]
 
 - adding yourself to a nosy list::
 
@@ -616,11 +616,39 @@ POP:
  are both valid. The username and/or password will be prompted for if
  not supplied on the command-line.
 
+POPS:
+ Connect to a POP server over ssl. This requires python 2.4 or later.
+ This supports the same notation as POP::
+
+    pops username:password@server
+
 APOP:
  Same as POP, but using Authenticated POP::
 
     apop username:password@server
 
+IMAP:
+ Connect to an IMAP server. This supports the same notation as that of
+ POP mail::
+
+    imap username:password@server
+
+ It also allows you to specify a specific mailbox other than INBOX using
+ this format::
+
+    imap username:password@server mailbox
+
+IMAPS:
+ Connect to an IMAP server over ssl.
+ This supports the same notation as IMAP::
+
+    imaps username:password@server [mailbox]
+
+IMAPS_CRAM:
+ Connect to an IMAP server over ssl using CRAM-MD5 authentication.
+ This supports the same notation as IMAP::
+
+    imaps_cram username:password@server [mailbox]
 
 Command Line Tool
 =================