Merge lp:~raj-abhilash1/mailman/bugfix into lp:mailman

[Abhilash Raj]

Updated the templates and reason for held message.

[lp:~raj-abhilash1/mailman/bugfix]

7321. By Barry Warsaw on 2015-04-16

Update versions for 3.0rc1, but don't tag yet.

7322. By Barry Warsaw on 2015-04-16

Move a doctest to the right directory.

7323. By Barry Warsaw on 2015-04-16

Clean up some templates; given by raj-abhilash1

=== modified file 'src/mailman/app/docs/chains.rst'
--- src/mailman/app/docs/chains.rst	2015-03-26 20:06:23 +0000
+++ src/mailman/app/docs/chains.rst	2015-04-16 14:06:01 +0000
@@ -132,13 +132,10 @@
         List:    [e-mail]
         From:    [e-mail]
         Subject: My first post
-        Reason:  XXX
-    <BLANKLINE>
-    At your convenience, visit:
-    <BLANKLINE>
-        http://lists.example.com/admindb/[e-mail]
-    <BLANKLINE>
-    to approve or deny the request.
+        Reason:  N/A
+    <BLANKLINE>
+    At your convenience, visit your dashboard to approve or deny the
+    request.
     <BLANKLINE>
     ...
     Content-Type: message/rfc822
@@ -189,7 +186,7 @@
     <BLANKLINE>
     The reason it is being held:
     <BLANKLINE>
-        XXX
+        N/A
     <BLANKLINE>
     Either the message will get posted to the list, or you will receive
     notification of the moderator's decision.  If you would like to cancel
 
=== modified file 'src/mailman/app/tests/test_subscriptions.py'
--- src/mailman/app/tests/test_subscriptions.py	2015-04-16 02:51:39 +0000
+++ src/mailman/app/tests/test_subscriptions.py	2015-04-16 14:06:01 +0000
@@ -420,7 +420,7 @@
         list(workflow)
         line = mark.readline()
         self.assertEqual(
-            line[29:-1],
+            line[28:-1],
             '[e-mail]: held subscription request from [e-mail]'
             )
 
 
=== modified file 'src/mailman/chains/hold.py'
--- src/mailman/chains/hold.py	2015-01-05 01:22:39 +0000
+++ src/mailman/chains/hold.py	2015-04-16 14:06:01 +0000
@@ -158,7 +158,7 @@
             listname    = mlist.fqdn_listname,
             subject     = original_subject,
             sender      = msg.sender,
-            reason      = 'XXX', #reason,
+            reason      = 'N/A', #reason,
             confirmurl  = '{0}/{1}'.format(mlist.script_url('confirm'), token),
             admindb_url = mlist.script_url('admindb'),
             )
 
=== modified file 'src/mailman/templates/en/postauth.txt'
--- src/mailman/templates/en/postauth.txt	2008-09-29 06:44:19 +0000
+++ src/mailman/templates/en/postauth.txt	2015-04-16 14:06:01 +0000
@@ -6,8 +6,6 @@
     Subject: $subject
     Reason:  $reason
 
-At your convenience, visit:
+At your convenience, visit your dashboard to approve or deny the
+request.
 
-    $admindb_url
-        
-to approve or deny the request.