[MKDoc-commit] Removed comment about goods being delivered 'within five working days'.

[bruno at mkdoc.demon.co.uk]

Log Message:
-----------
Removed comment about goods being delivered 'within five working days'.
Fixed mixed-up </From> and </To> closing tags.

Tags:
----
mkdoc-1-6

Modified Files:
--------------
    mkd/templates/shop/email/accept_customer:
        en.xml
    mkd/templates/shop/email/accept_merchant:
        en.xml
    mkd/templates/shop/email/reject_merchant:
        en.xml

-------------- next part --------------
Index: en.xml
===================================================================
RCS file: /var/spool/cvs/mkd/templates/shop/email/accept_customer/Attic/en.xml,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Ltemplates/shop/email/accept_customer/en.xml -Ltemplates/shop/email/accept_customer/en.xml -u -r1.1.2.3 -r1.1.2.4
--- templates/shop/email/accept_customer/en.xml
+++ templates/shop/email/accept_customer/en.xml
@@ -39,8 +39,7 @@
 
     <pre petal:content="self/address/as_string" />
 
-    <p>You should receive your goods in three to five business
-days. Should you have any inquiries about your order, simply reply
+    <p>Should you have any inquiries about your order, simply reply
 to this email or contact us at ${self/admin_user/email}.</p>
 
     <p>${config:PUBLIC_DOMAIN}</p>
Index: en.xml
===================================================================
RCS file: /var/spool/cvs/mkd/templates/shop/email/accept_merchant/Attic/en.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Ltemplates/shop/email/accept_merchant/en.xml -Ltemplates/shop/email/accept_merchant/en.xml -u -r1.1.2.2 -r1.1.2.3
--- templates/shop/email/accept_merchant/en.xml
+++ templates/shop/email/accept_merchant/en.xml
@@ -9,8 +9,8 @@
   <MIME-Version>1.0</MIME-Version>
 
   <From petal:content="string:${self/address/first_name} ${self/address/last_name} &lt;${self/address/email}&gt;"
-    >fred.flintstone at rocks.com</To>
-  <To petal:content="string:${self/admin_user/real_name} &lt;${self/admin_user/email}&gt;">MKDoc &lt;info at example.com&gt;</From>
+    >fred.flintstone at rocks.com</From>
+  <To petal:content="string:${self/admin_user/real_name} &lt;${self/admin_user/email}&gt;">MKDoc &lt;info at example.com&gt;</To>
   <Subject petal:content="string:[ACCEPTED] ${self/admin_user/real_name} - Order ${self/id}">Order</Subject>
   <User-Agent>MKDoc Mailer v1.6</User-Agent>
   <Organization petal:content="self/root/title">MKDoc</Organization>
@@ -39,8 +39,7 @@
 
 <pre petal:content="self/address/as_string" />
 
-    <p>You should receive your goods in three to five business
-days. Should you have any inquiries about your order, simply reply
+    <p>Should you have any inquiries about your order, simply reply
 to this email or contact us at ${self/admin_user/email}.</p>
 
     <p>${config:PUBLIC_DOMAIN}</p>
Index: en.xml
===================================================================
RCS file: /var/spool/cvs/mkd/templates/shop/email/reject_merchant/Attic/en.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Ltemplates/shop/email/reject_merchant/en.xml -Ltemplates/shop/email/reject_merchant/en.xml -u -r1.1.2.2 -r1.1.2.3
--- templates/shop/email/reject_merchant/en.xml
+++ templates/shop/email/reject_merchant/en.xml
@@ -9,8 +9,8 @@
   <MIME-Version>1.0</MIME-Version>
 
   <From petal:content="string:${self/address/first_name} ${self/address/last_name} &lt;${self/address/email}&gt;"
-    >fred.flintstone at rocks.com</To>
-  <To petal:content="string:${self/admin_user/real_name} &lt;${self/admin_user/email}&gt;">MKDoc &lt;info at example.com&gt;</From>
+    >fred.flintstone at rocks.com</From>
+  <To petal:content="string:${self/admin_user/real_name} &lt;${self/admin_user/email}&gt;">MKDoc &lt;info at example.com&gt;</To>
   <Subject petal:content="string:[CANCELLED] ${self/admin_user/real_name} - Order ${self/id}">Order</Subject>
   <User-Agent>MKDoc Mailer v1.6</User-Agent>
   <Organization petal:content="self/root/title">MKDoc</Organization>