plugin

2 files changed, 4 insertions, 7 deletions

diff --git a/src/mailman/rest/docs/membership.rst b/src/mailman/rest/docs/membership.rst
index b0b5e1254..6e24d14f9 100644
--- a/src/mailman/rest/docs/membership.rst
+++ b/src/mailman/rest/docs/membership.rst
@@ -642,7 +642,6 @@ won't have to approve her subscription request.
     ...           'display_name': 'Elly Person',
     ...           'pre_verified': True,
     ...           'pre_confirmed': True,
-    ...           'pre_approved': True,
     ...           })
     content-length: 0
     content-type: application/json; charset=UTF-8
@@ -699,7 +698,6 @@ list with her preferred address.
     ...     'subscriber': user_id,
     ...     'pre_verified': True,
     ...     'pre_confirmed': True,
-    ...     'pre_approved': True,
     ...     })
     content-length: 0
     content-type: application/json; charset=UTF-8
diff --git a/src/mailman/rest/docs/sub-moderation.rst b/src/mailman/rest/docs/sub-moderation.rst
index 92c0c8849..8bf95fcd2 100644
--- a/src/mailman/rest/docs/sub-moderation.rst
+++ b/src/mailman/rest/docs/sub-moderation.rst
@@ -13,8 +13,8 @@ A mailing list starts with no pending subscription or unsubscription requests.
 
     >>> ant = create_list('ant@example.com')
     >>> ant.admin_immed_notify = False
-    >>> from mailman.interfaces.mailinglist import SubscriptionPolicy
-    >>> ant.subscription_policy = SubscriptionPolicy.moderate
+    >>> from mailman.workflows.subscription import ModerationSubscriptionPolicy
+    >>> ant.subscription_policy = ModerationSubscriptionPolicy
     >>> transaction.commit()
     >>> dump_json('http://localhost:9001/3.0/lists/ant.example.com/requests')
     http_etag: "..."
@@ -31,7 +31,6 @@ is returned to track her subscription request.
     ...           'subscriber': 'anne@example.com',
     ...           'display_name': 'Anne Person',
     ...           'pre_verified': True,
-    ...           'pre_confirmed': True,
     ...           })
     http_etag: ...
     token: 0000000000000000000000000000000000000001
@@ -48,7 +47,7 @@ The subscription request can be viewed in the REST API.
         list_id: ant.example.com
         token: 0000000000000000000000000000000000000001
         token_owner: moderator
-        type: subscription
+        type: sub-policy-moderate
         when: 2005-08-01T07:49:23
     http_etag: "..."
     start: 0
@@ -69,7 +68,7 @@ You can view an individual membership change request by providing the token
     list_id: ant.example.com
     token: 0000000000000000000000000000000000000001
     token_owner: moderator
-    type: subscription
+    type: sub-policy-moderate
     when: 2005-08-01T07:49:23