Merge branch 'master' into py3k

This requires regenerating the accounts_table docs, as they've changed
for python 3.

1 files changed, 31 insertions, 1 deletions

diff --git a/docs/source/configuration/accounts_table b/docs/source/configuration/accounts_table
index 0fca90ff..db727898 100644
--- a/docs/source/configuration/accounts_table
+++ b/docs/source/configuration/accounts_table
@@ -63,6 +63,16 @@
     :default: None
 
 
+.. _draft-tags:
+
+.. describe:: draft_tags
+
+     list of tags to automatically add to draft messages
+
+    :type: string list
+    :default: draft
+
+
 .. _encrypt-by-default:
 
 .. describe:: encrypt_by_default
@@ -114,6 +124,16 @@
     :default: None
 
 
+.. _passed-tags:
+
+.. describe:: passed_tags
+
+     list of tags to automatically add to passed messages
+
+    :type: string list
+    :default: passed
+
+
 .. _realname:
 
 .. describe:: realname
@@ -122,6 +142,16 @@
 
     :type: string
 
+.. _replied-tags:
+
+.. describe:: replied_tags
+
+     list of tags to automatically add to replied messages
+
+    :type: string list
+    :default: replied
+
+
 .. _sendmail-command:
 
 .. describe:: sendmail_command
@@ -153,7 +183,7 @@
      list of tags to automatically add to outgoing messages
 
     :type: string list
-    :default: sent,
+    :default: sent
 
 
 .. _sign-by-default: