3 files changed, 8 insertions, 2 deletions

diff --git a/src/mailman/commands/docs/aliases.txt b/src/mailman/commands/docs/aliases.txt
index 51dd4d002..5c1fa2e1a 100644
--- a/src/mailman/commands/docs/aliases.txt
+++ b/src/mailman/commands/docs/aliases.txt
@@ -27,6 +27,7 @@ generation.
     ... incoming: mailman.mta.postfix.LMTP
     ... lmtp_host: lmtp.example.com
     ... lmtp_port: 24
+    ... postfix_map_cmd: /bin/true
     ... """)
 
 Let's create a mailing list and then display the transport map for it.  We'll
diff --git a/src/mailman/commands/docs/membership.txt b/src/mailman/commands/docs/membership.txt
index a04622cf7..f3d9ae1df 100644
--- a/src/mailman/commands/docs/membership.txt
+++ b/src/mailman/commands/docs/membership.txt
@@ -255,3 +255,8 @@ unsubscribe her from the list.
 
     >>> print mlist.members.get_member('anne@example.com')
     None
+
+
+Confirmations
+=============
+
diff --git a/src/mailman/queue/docs/command.txt b/src/mailman/queue/docs/command.txt
index 19c01dcae..445bf2ab6 100644
--- a/src/mailman/queue/docs/command.txt
+++ b/src/mailman/queue/docs/command.txt
@@ -132,7 +132,7 @@ address, and the other is the results of his email command.
     2
 
     >>> def sortkey(item):
-    ...     return item.msg['subject']
+    ...     return str(item.msg['subject'])
     >>> messages = sorted(get_queue_messages('virgin'), key=sortkey)
 
     >>> from mailman.interfaces.domain import IDomainManager
@@ -145,8 +145,8 @@ address, and the other is the results of his email command.
     ...         token = str(subject).split()[1].strip()
     ...         status = registrar.confirm(token)
     ...         assert status, 'Confirmation failed'
-    Subject: confirm ...
     Subject: The results of your email commands
+    Subject: confirm ...
 
 Similarly, to leave a mailing list, the user need only email the -leave or
 -unsubscribe address (the latter is deprecated).