From 49148f931646e5ec41e42490d8afc59a0ed2ee52 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Wed, 7 May 2014 09:53:37 +0000
Subject: [PATCH] Add davmail.defaultDomain to template properties file

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2289 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/etc/davmail.properties    |  2 ++
 src/site/xdoc/serversetup.xml | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/etc/davmail.properties b/src/etc/davmail.properties
index bc35d2a0..12b0b995 100644
--- a/src/etc/davmail.properties
+++ b/src/etc/davmail.properties
@@ -61,6 +61,8 @@ davmail.disableUpdateCheck=false
 davmail.enableKeepalive=false
 # Message count limit on folder retrieval
 davmail.folderSizeLimit=0
+# Default windows domain for NTLM and basic authentication
+davmail.defaultDomain=
 
 #############################################################
 # Caldav settings
diff --git a/src/site/xdoc/serversetup.xml b/src/site/xdoc/serversetup.xml
index 18771d74..5c5ecca8 100644
--- a/src/site/xdoc/serversetup.xml
+++ b/src/site/xdoc/serversetup.xml
@@ -15,10 +15,10 @@
             </p>
 
             <p>Davmail Gateway can run in server mode as a gateway between the mail
-                client and the Outlook Web Access (Exchange) server.
+                client and Exchange server through Outlook Web Access and/or EWS.
                 In server mode Davmail can run on any Java supported platform.
-                This mode was tested successfully with the Iphone and should work with
-                any phone with POP/IMAP/SMTP/LDAP/Caldav/Carddav client.
+                This mode was tested successfully with Iphone and Android phones and should work with
+                any equipment with POP/IMAP/SMTP/LDAP/Caldav/Carddav client.
                 In this mode many users can share the same DavMail instance.
             </p>
 
@@ -26,7 +26,8 @@
                 from Sourceforge and uncompress it with your favorite tool,
                 e.g. on Linux:&#x20;<code>unzip davmail-*.zip</code>.
             </p>
-            <p>Prepare a davmail.properties file according to your local needs :
+            <p>
+            Prepare a davmail.properties file according to your local needs :
             </p>
             <source><![CDATA[
 # DavMail settings, see http://davmail.sourceforge.net/ for documentation
@@ -63,7 +64,7 @@ davmail.proxyPassword=
 davmail.noProxyFor=
 
 # allow remote connection to DavMail
-davmail.allowRemote=false
+davmail.allowRemote=true
 # bind server sockets to a specific address
 davmail.bindAddress=
 # client connections SO timeout in seconds
@@ -92,6 +93,8 @@ davmail.disableUpdateCheck=true
 davmail.enableKeepalive=false
 # Message count limit on folder retrieval
 davmail.folderSizeLimit=0
+# Default windows domain for NTLM and basic authentication
+davmail.defaultDomain=
 
 #############################################################
 # Caldav settings