merged changes to main branch

2 files changed, 4 insertions, 4 deletions

diff --git a/src/mailman/model/docs/domains.txt b/src/mailman/model/docs/domains.rst
index 00824d65c..924ab7301 100644
--- a/src/mailman/model/docs/domains.txt
+++ b/src/mailman/model/docs/domains.rst
@@ -18,7 +18,7 @@ Domains are how Mailman interacts with email host names and web host names.
     ...     if len(manager) == 0:
     ...         print 'no domains'
     ...         return
-    ...     for domain in sorted(manager, key=attrgetter('email_host')):
+    ...     for domain in sorted(manager, key=attrgetter('mail_host')):
     ...         print domain
 
     >>> show_domains()
@@ -97,8 +97,8 @@ property.
 In the global domain manager, domains are indexed by their email host name.
 ::
 
-    >>> for domain in sorted(manager, key=attrgetter('email_host')):
-    ...     print domain.email_host
+    >>> for domain in sorted(manager, key=attrgetter('mail_host')):
+    ...     print domain.mail_host
     example.com
     example.net
 
diff --git a/src/mailman/model/docs/requests.txt b/src/mailman/model/docs/requests.rst
index 812d25a43..e01544490 100644
--- a/src/mailman/model/docs/requests.txt
+++ b/src/mailman/model/docs/requests.rst
@@ -312,7 +312,7 @@ indicates that the message has been approved.
 
     >>> id_3 = moderator.hold_message(mlist, msg, msgdata, 'Needs approval')
     >>> moderator.handle_message(mlist, id_3, Action.accept)
-    >>> inq = config.switchboards['in']
+    >>> inq = config.switchboards['pipeline']
     >>> qmsg, qdata = dequeue(inq)
     >>> print qmsg.as_string()
     From: aperson@example.org