From eb41bebb04cb8158d46d130ba63ca2044f2ccbb1 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Wed, 7 Mar 2012 15:45:09 -0800
Subject:  * Mailing lists get multiple chains and pipelines.  For example,
 normal    postings go through the `posting_chain` while messages to owners to
 through    `owners_chain`.  The default `built-in` chain is renamed to   
 `default-posting-chain` while the `built-in` pipeline is renamed   
 `default-posting-pipeline`.

 * Schema changes:
   - start_chain      -> posting_chain
   - pipeline         -> posting_pipeline
---
 src/mailman/app/docs/chains.rst    | 16 ++++++++--------
 src/mailman/app/docs/pipelines.rst |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/mailman/app/docs')

diff --git a/src/mailman/app/docs/chains.rst b/src/mailman/app/docs/chains.rst
index 7096cc17c..7975d23fe 100644
--- a/src/mailman/app/docs/chains.rst
+++ b/src/mailman/app/docs/chains.rst
@@ -2,9 +2,9 @@
 Chains
 ======
 
-When a new message comes into the system, Mailman uses a set of rule chains to
-decide whether the message gets posted to the list, rejected, discarded, or
-held for moderator approval.
+When a new message is posted to a mailing list, Mailman uses a set of rule
+chains to decide whether the message gets accepted for posting, rejected,
+discarded, or held for moderator approval.
 
 There are a number of built-in chains available that act as end-points in the
 processing of messages.
@@ -285,13 +285,13 @@ Run-time chains are made up of links where each link associates both a rule
 and a `jump`.  The rule is really a rule name, which is looked up when
 needed.  The jump names a chain which is jumped to if the rule matches.
 
-There is one built-in run-time chain, called appropriately `built-in`.  This
-is the default chain to use when no other input chain is defined for a mailing
-list.  It runs through the default rules.
+There is one built-in posting chain.  This is the default chain to use when no
+other input chain is defined for a mailing list.  It runs through the default
+rules.
 
-    >>> chain = config.chains['built-in']
+    >>> chain = config.chains['default-posting-chain']
     >>> print chain.name
-    built-in
+    default-posting-chain
     >>> print chain.description
     The built-in moderation chain.
 
diff --git a/src/mailman/app/docs/pipelines.rst b/src/mailman/app/docs/pipelines.rst
index bc6f9f0ea..fbd405f68 100644
--- a/src/mailman/app/docs/pipelines.rst
+++ b/src/mailman/app/docs/pipelines.rst
@@ -9,8 +9,8 @@ handlers, each of which is applied in turn.  Unlike rules and chains, there is
 no way to stop a pipeline from processing the message once it's started.
 
     >>> mlist = create_list('test@example.com')
-    >>> print mlist.pipeline
-    built-in
+    >>> print mlist.posting_pipeline
+    default-posting-pipeline
     >>> from mailman.core.pipelines import process
 
 
@@ -28,7 +28,7 @@ Messages hit the pipeline after they've been accepted for posting.
     ... First post!
     ... """)
     >>> msgdata = {}
-    >>> process(mlist, msg, msgdata, mlist.pipeline)
+    >>> process(mlist, msg, msgdata, mlist.posting_pipeline)
 
 The message has been modified with additional headers, footer decorations,
 etc.
-- 
cgit v1.2.3-70-g09d2