From e17175dabad5bec26899f3cf4ce2d2a7338e4295 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Mon, 26 Jul 2010 16:10:37 +0000
Subject: [PATCH] Doc: Update homepage and project description

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1281 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/site/xdoc/build.xml                     |  2 +-
 src/site/xdoc/download.xml                  |  2 +-
 src/site/xdoc/faq.xml                       |  2 +-
 src/site/xdoc/gettingstarted.xml            |  2 +-
 src/site/xdoc/index.xml                     | 33 +++++++++++++--------
 src/site/xdoc/linuxsetup.xml                |  2 +-
 src/site/xdoc/macosxsetup.xml               |  2 +-
 src/site/xdoc/osxaddressbooksetup.xml       | 18 +++++++++++
 src/site/xdoc/osxdirectorysetup.xml         |  2 +-
 src/site/xdoc/osxicalsetup.xml              |  2 +-
 src/site/xdoc/osximapmailsetup.xml          |  2 +-
 src/site/xdoc/roadmap.xml                   |  2 +-
 src/site/xdoc/serversetup.xml               |  2 +-
 src/site/xdoc/thunderbirdcalendarsetup.xml  |  5 ++--
 src/site/xdoc/thunderbirddirectorysetup.xml |  6 +++-
 src/site/xdoc/thunderbirdimapmailsetup.xml  |  2 +-
 src/site/xdoc/thunderbirdmailsetup.xml      |  2 +-
 src/site/xdoc/windowssetup.xml              |  2 +-
 18 files changed, 60 insertions(+), 30 deletions(-)
 create mode 100644 src/site/xdoc/osxaddressbooksetup.xml

diff --git a/src/site/xdoc/build.xml b/src/site/xdoc/build.xml
index 85d3c66c..d2e61741 100644
--- a/src/site/xdoc/build.xml
+++ b/src/site/xdoc/build.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Frequently asked questions</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Frequently asked questions</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/download.xml
index 5e6ffbf3..a9b62025 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/download.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Download</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Download</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/faq.xml b/src/site/xdoc/faq.xml
index f4044fe4..d4571bce 100644
--- a/src/site/xdoc/faq.xml
+++ b/src/site/xdoc/faq.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Frequently asked questions</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Frequently asked questions</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/gettingstarted.xml b/src/site/xdoc/gettingstarted.xml
index 280dda70..3070f120 100644
--- a/src/site/xdoc/gettingstarted.xml
+++ b/src/site/xdoc/gettingstarted.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Getting started</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Getting started</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index e18f097d..cd7b90d9 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -4,31 +4,37 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
     <body>
-        <section name="DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway">
+        <section name="DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway">
             <table class="about" border="0" style="width: 98%">
                 <tr>
                     <td>
-                        <p>Ever wanted to get rid of Outlook ? DavMail is a POP/IMAP/SMTP/Caldav/LDAP exchange gateway
-                            allowing users to use any mail/calendar client (e.g. Thunderbird with Lightning or Apple iCal) with
-                            an Exchange server, even from the internet or behind a firewall through Outlook Web Access.
-                            DavMail now includes an LDAP gateway to Exchange global address book and user personal contacts
-                            to allow recipient address completion in mail compose window and full calendar support
-                            with attendees free/busy display.
+                        <p>Ever wanted to get rid of Outlook ? DavMail is a POP/IMAP/SMTP/Caldav/Carddav/LDAP exchange
+                            gateway allowing users to use any mail/calendar client (e.g. Thunderbird with Lightning or
+                            Apple iCal) with an Exchange server, even from the internet or behind a firewall through
+                            Outlook Web Access.
+                            DavMail now includes an LDAP gateway to Exchange global address book and user personal
+                            contacts to allow recipient address completion in mail compose window and full calendar
+                            support with attendees free/busy display.
+                        </p>
+                        <p>DavMail also supports the CardDav protocol to sync address books. This new feature
+                            is sponsored by
+                            <a href="http://www.defense.gouv.fr/dga/">French Defense / DGA</a>
+                            through project
+                            <a href="http://www.trustedbird.org">Trustedbird</a>
                         </p>
-                        <p>DavMail will soon also support the CardDav protocol to sync address books. This new feature
-                        is sponsored by <a href="http://www.defense.gouv.fr/dga/">French Defense / DGA</a> through project <a href="http://www.trustedbird.org">Trustedbird</a></p>
                         <div style="width: 100%;text-align: center">
                             <img src="images/davmailArchitecture.png" alt="DavMail Architecture" width="550"
                                  height="364"/>
                         </div>
                         <p>The main goal of DavMail is to provide standard compliant protocols in front of proprietary
-                            Exchange. This means LDAP for address book, SMTP to send messages, IMAP to browse messages
-                            on the server in any folder, POP to retrieve inbox messages only and Caldav for calendar support.
+                            Exchange. This means LDAP for globale address book, SMTP to send messages, IMAP to browse
+                            messages on the server in any folder, POP to retrieve inbox messages only, Caldav for
+                            calendar support and Carddav for personal contacts sync.
                             Thus any standard compliant client can be used with Microsoft Exchange.
                         </p>
                         <p>DavMail gateway is implemented in java and should run on any platform. Releases are tested
@@ -49,4 +55,5 @@
             </table>
         </section>
     </body>
-</document>
\ No newline at end of file
+</document>
+        
\ No newline at end of file
diff --git a/src/site/xdoc/linuxsetup.xml b/src/site/xdoc/linuxsetup.xml
index 2aedffdb..a4f7599a 100644
--- a/src/site/xdoc/linuxsetup.xml
+++ b/src/site/xdoc/linuxsetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Linux setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Linux setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/macosxsetup.xml b/src/site/xdoc/macosxsetup.xml
index 1e816cbc..0f612179 100644
--- a/src/site/xdoc/macosxsetup.xml
+++ b/src/site/xdoc/macosxsetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Mac OS X setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Mac OS X setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/osxaddressbooksetup.xml b/src/site/xdoc/osxaddressbooksetup.xml
new file mode 100644
index 00000000..c02a0b0b
--- /dev/null
+++ b/src/site/xdoc/osxaddressbooksetup.xml
@@ -0,0 +1,18 @@
+<!--
+  ~ DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway
+  ~ Copyright (C) 2010  Mickael Guessant
+  ~
+  ~ This program is free software; you can redistribute it and/or
+  ~ modify it under the terms of the GNU General Public License
+  ~ as published by the Free Software Foundation; either version 2
+  ~ of the License, or (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program; if not, write to the Free Software
+  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  -->
diff --git a/src/site/xdoc/osxdirectorysetup.xml b/src/site/xdoc/osxdirectorysetup.xml
index d7120db4..f222615a 100644
--- a/src/site/xdoc/osxdirectorysetup.xml
+++ b/src/site/xdoc/osxdirectorysetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - OSX directory setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - OSX directory setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/osxicalsetup.xml b/src/site/xdoc/osxicalsetup.xml
index 9bc15ea0..302b0be1 100644
--- a/src/site/xdoc/osxicalsetup.xml
+++ b/src/site/xdoc/osxicalsetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - OSX iCal setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - OSX iCal setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/osximapmailsetup.xml b/src/site/xdoc/osximapmailsetup.xml
index 858ba75a..d283ecb5 100644
--- a/src/site/xdoc/osximapmailsetup.xml
+++ b/src/site/xdoc/osximapmailsetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - OSX IMAP Mail setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - OSX IMAP Mail setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/roadmap.xml b/src/site/xdoc/roadmap.xml
index d1356247..dab439b3 100644
--- a/src/site/xdoc/roadmap.xml
+++ b/src/site/xdoc/roadmap.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - RoadMap</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - RoadMap</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/serversetup.xml b/src/site/xdoc/serversetup.xml
index 090eaa98..cad28fa6 100644
--- a/src/site/xdoc/serversetup.xml
+++ b/src/site/xdoc/serversetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Server setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Server setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/thunderbirdcalendarsetup.xml b/src/site/xdoc/thunderbirdcalendarsetup.xml
index 98c72d2e..ce9a437e 100644
--- a/src/site/xdoc/thunderbirdcalendarsetup.xml
+++ b/src/site/xdoc/thunderbirdcalendarsetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Thunderbird calendar setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Thunderbird calendar setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
@@ -40,6 +40,7 @@
 
 
                 <p>Provide your credentials, login is Active Directory account name, i.e. domain\account
+                    or email address with Exchange 2007
                 </p>
                 <div style="width: 100%;text-align: center">
                     <img src="images/thunderbirdCalendar4.png" alt=""/>
@@ -52,7 +53,7 @@
                     <img src="images/thunderbirdCalendar5.png" alt=""/>
                 </div>
 
-                <p>You may want to enable the (experimental) Lightning calendar cach feature to avoid
+                <p>You may want to enable the (experimental) Lightning calendar cache feature to avoid
                     the possibly long calendar load task delay on Thunderbird startup: double click
                     on the calendar in Lightning left pane and activate cache. Restart Thunderbird.
                 </p>
diff --git a/src/site/xdoc/thunderbirddirectorysetup.xml b/src/site/xdoc/thunderbirddirectorysetup.xml
index 3103e870..34eb472d 100644
--- a/src/site/xdoc/thunderbirddirectorysetup.xml
+++ b/src/site/xdoc/thunderbirddirectorysetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Thunderbird directory setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Thunderbird directory setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
@@ -29,6 +29,10 @@
                 <div style="width: 100%;text-align: center">
                     <img src="images/thunderbirdDirectory2.png" alt=""/>
                 </div>
+
+                <p>Proceed to
+                    <a href="thunderbirdcarddavsetup.html">Thunderbird Carddav setup</a>
+                </p>
             </subsection>
         </section>
     </body>
diff --git a/src/site/xdoc/thunderbirdimapmailsetup.xml b/src/site/xdoc/thunderbirdimapmailsetup.xml
index 2660169c..c9ffb555 100644
--- a/src/site/xdoc/thunderbirdimapmailsetup.xml
+++ b/src/site/xdoc/thunderbirdimapmailsetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Thunderbird mail setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Thunderbird mail setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/thunderbirdmailsetup.xml b/src/site/xdoc/thunderbirdmailsetup.xml
index a81bed9f..a3a47714 100644
--- a/src/site/xdoc/thunderbirdmailsetup.xml
+++ b/src/site/xdoc/thunderbirdmailsetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Thunderbird mail setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Thunderbird mail setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>
 
diff --git a/src/site/xdoc/windowssetup.xml b/src/site/xdoc/windowssetup.xml
index 7821245d..ab8ecf07 100644
--- a/src/site/xdoc/windowssetup.xml
+++ b/src/site/xdoc/windowssetup.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
     <properties>
-        <title>DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway - Windows setup</title>
+        <title>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway - Windows setup</title>
         <author email="mguessan@free.fr">Mickael Guessant</author>
     </properties>