Trunk merge

3 files changed, 60 insertions, 1 deletions

diff --git a/src/mailman/rest/docs/__init__.py b/src/mailman/rest/docs/__init__.py
index 95ce89e63..794f5f034 100644
--- a/src/mailman/rest/docs/__init__.py
+++ b/src/mailman/rest/docs/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/rest/docs/helpers.rst b/src/mailman/rest/docs/helpers.rst
index 4f0b1c804..3e8092f4e 100644
--- a/src/mailman/rest/docs/helpers.rst
+++ b/src/mailman/rest/docs/helpers.rst
@@ -27,6 +27,7 @@ be set in the configuration file.
     ... use_https: yes
     ... api_version: 4.2
     ... """)
+    >>> cleanups.append((config.pop, 'helpers'))
 
     >>> print path_to('system')
     https://geddy:2112/4.2/system
diff --git a/src/mailman/rest/docs/lists.rst b/src/mailman/rest/docs/lists.rst
index 295e8c0b7..27503c1c1 100644
--- a/src/mailman/rest/docs/lists.rst
+++ b/src/mailman/rest/docs/lists.rst
@@ -230,3 +230,61 @@ The mailing list does not exist.
 
     >>> print list_manager.get('ant@example.com')
     None
+
+
+Managing mailing list archivers
+===============================
+
+The Mailman system has some site-wide enabled archivers, and each mailing list
+can enable or disable these archivers individually.  This gives list owners
+control over where traffic to their list is archived.  You can see which
+archivers are available, and whether they are enabled for this mailing list.
+::
+
+    >>> mlist = create_list('dog@example.com')
+    >>> transaction.commit()
+
+    >>> dump_json('http://localhost:9001/3.0/lists/dog@example.com/archivers')
+    http_etag: "..."
+    mail-archive: True
+    mhonarc: True
+    prototype: True
+
+You can set all the archiver states by putting new state flags on the
+resource.
+::
+
+    >>> dump_json(
+    ...     'http://localhost:9001/3.0/lists/dog@example.com/archivers', {
+    ...         'mail-archive': False,
+    ...         'mhonarc': True,
+    ...         'prototype': False,
+    ...         }, method='PUT')
+    content-length: 0
+    date: ...
+    server: ...
+    status: 204
+
+    >>> dump_json('http://localhost:9001/3.0/lists/dog@example.com/archivers')
+    http_etag: "..."
+    mail-archive: False
+    mhonarc: True
+    prototype: False
+
+You can change the state of a subset of the list archivers.
+::
+
+    >>> dump_json(
+    ...     'http://localhost:9001/3.0/lists/dog@example.com/archivers', {
+    ...         'mhonarc': False,
+    ...         }, method='PATCH')
+    content-length: 0
+    date: ...
+    server: ...
+    status: 204
+
+    >>> dump_json('http://localhost:9001/3.0/lists/dog@example.com/archivers')
+    http_etag: "..."
+    mail-archive: False
+    mhonarc: False
+    prototype: False