Return-Path: 
 <cvs-return-20246-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 66079 invoked from network); 1 Oct 2004 13:14:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 1 Oct 2004 13:14:28 -0000
Received: (qmail 3770 invoked by uid 500); 1 Oct 2004 13:14:27 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 3644 invoked by uid 500); 1 Oct 2004 13:14:25 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 3622 invoked by uid 99); 1 Oct 2004 13:14:24 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 01 Oct 2004 06:14:23 -0700
Received: (qmail 66016 invoked by uid 65534); 1 Oct 2004 13:14:22 -0000
Date: 1 Oct 2004 13:14:22 -0000
Message-ID: <20041001131422.66012.qmail@minotaur.apache.org>
From: vgritsenko@apache.org
To: cvs@cocoon.apache.org
Subject: svn commit: rev 47645 - in
 cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs: actions xsp
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: vgritsenko
Date: Fri Oct  1 06:14:21 2004
New Revision: 47645

Modified:
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/actions/sendmail-action.xml
   cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/xsp/sendmail.xml
Log:
update docs with smtp auth parameters


Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/actions/sendmail-action.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/actions/sendmail-action.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/actions/sendmail-action.xml	Fri Oct  1 06:14:21 2004
@@ -86,7 +86,11 @@
 <![CDATA[
 <map:match pattern="mail/*">
   <map:act type="sendmail">
-    <map:parameter name="smtphost" value="localhost"/>
+    <!-- To override defaults specified in cocoon.xconf:
+    <map:parameter name="smtp-host" value="localhost"/>
+    <map:parameter name="smtp-user" value="john"/>
+    <map:parameter name="smtp-password" value="john"/>
+    -->
     <map:parameter name="from" value="cocoon@localhost"/>
     <map:parameter name="to" value="mailinglist@somewhere.com"/>
     <map:parameter name="subject" value="{request-param:subject}"/>
@@ -131,11 +135,25 @@
           <th>Description:</th>
         </tr>
         <tr>
-          <td>smtphost</td>
+          <td>smtp-host</td>
           <td>no</td>
           <td>
             The IP address or the name of the host, which should deliver the
             email message. Better known as the mail transfer agent or short MTA.
+          </td>
+        </tr>
+        <tr>
+          <td>smtp-user</td>
+          <td>no</td>
+          <td>
+            User name
+          </td>
+        </tr>
+        <tr>
+          <td>smtp-password</td>
+          <td>no</td>
+          <td>
+            Password
           </td>
         </tr>
         <tr>

Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/xsp/sendmail.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/xsp/sendmail.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/xsp/sendmail.xml	Fri Oct  1 06:14:21 2004
@@ -182,8 +182,11 @@
       <sendmail:from>from address</sendmail:from>
       <sendmail:to>some maillinglist address</sendmail:to>
       <sendmail:subject><xsp-request:get-parameter name="subject"/></sendmail:subject>
-      <!-- Modify the next line to point to your mail server -->
+      <!-- Uncomment to override defaults from cocoon.xconf
       <sendmail:smtphost>localhost</sendmail:smtphost>
+      <sendmail:smtpuser>localhost</sendmail:smtpuser>
+      <sendmail:smtppassword>localhost</sendmail:smtppassword>
+      -->
       <sendmail:body><xsp:expr>body.toString()</xsp:expr></sendmail:body>
       <sendmail:attachment>
         <sendmail:param name="object"><xsp:expr>request.get("attachment")</xsp:expr></sendmail:param>
@@ -319,7 +322,7 @@
           </td>
 
           <td>The IP-address or the name of the host, which should
-	    deliver the email message. Better know as the mail
+	    deliver the email message. Better known as the mail
 	    transfer agent or short MTA.</td>
         </tr>