- merged CONFLUENCE_3_2

[packages/confluence.git] / confluence-context.xml

diff --git a/confluence-context.xml b/confluence-context.xml
index e99db4075c1bc5a3a4c8c20fe81cbb81582730de..45f9372bfc2ad2fbbd8462cc83fe622b8df11591 100644 (file)
--- a/confluence-context.xml
+++ b/confluence-context.xml
@@ -18,4 +18,19 @@
       validationQuery="select 1" />
     -->
 
+    <!-- Example mail session definition for Confluence. You can refer it in
+        confluence configuration as JNDI: java:comp/env/mail/ConfluenceMS
+
+        Alternatively you can configure mail server via web interface.
+
+        TODO: how to specify SMTP username and password here?
+    -->
+
+  <!--
+
+    <Resource name="mail/ConfluenceMS" auth="Container" type="javax.mail.Session"
+        mail.smtp.host="smtp.example.net" />
+
+    -->
+
 </Context>