[evolution] Bug #692213 - Remove evolution-exchange recommendation

[Andre Klapper <aklapper src gnome org>]

commit eadf3bfbdb164742f25f1e140a3eb955e1f8d791
Author: Andre Klapper <a9016009 gmx de>
Date:   Tue Jan 22 23:26:13 2013 +0100

    Bug #692213 - Remove evolution-exchange recommendation

 help/C/exchange-connectors-overview.page           |   15 +----
 ...-account-manage-microsoft-exchange-evo-ews.page |    2 +-
 ...unt-manage-microsoft-exchange-evo-exchange.page |   60 --------------------
 ...account-manage-microsoft-exchange-evo-mapi.page |    4 +-
 help/C/mail-default-CC-and-BCC.page                |    1 -
 help/C/mail-default-folder-locations.page          |    1 -
 help/C/mail-encryption.page                        |    1 -
 .../mail-receiving-options-evolution-exchange.page |   60 --------------------
 8 files changed, 7 insertions(+), 137 deletions(-)
---
diff --git a/help/C/exchange-connectors-overview.page b/help/C/exchange-connectors-overview.page
index 1725c2c..c475d1e 100644
--- a/help/C/exchange-connectors-overview.page
+++ b/help/C/exchange-connectors-overview.page
@@ -8,7 +8,7 @@
 
     <link type="guide" xref="exchange-placeholder"/>
 
-    <revision pkgversion="3.5.3" version="0.6" date="2012-06-18" status="final"/>
+    <revision pkgversion="3.7.5" version="0.7" date="2013-01-22" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47 gmx net</email>
@@ -32,20 +32,13 @@
   </if:when>
 </if:choose>
 
-<p>Only if <sys>evolution-ews</sys> does not work well for you it is recommended to use the package <sys>evolution-mapi</sys>. It supports Microsoft Exchange 2007 and 2010 (and possibly earlier versions that support MAPI).</p>
-<if:choose>
-  <if:when test="if:supports('action:install')">
-    <note style="info package">
-      <p><link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download"; style="button">Install evolution-mapi</link></p>
-    </note>
-  </if:when>
-</if:choose>
 
-<p>For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of Exchange that use Outlook Web Access) it is recommended to use the package <sys>evolution-exchange</sys>.</p>
+<p>For older versions of Microsoft Exchange, or if <sys>evolution-ews</sys> does not work well for you, try <sys>evolution-mapi</sys>. It uses Microsoft's Messaging API which is also used by Microsoft Outlook. However, <sys>evolution-mapi</sys> requires installing <sys>OpenChange</sys> and <sys>Samba 4</sys>, and is not as performant as <sys>evolution-ews</sys>.</p>
+
 <if:choose>
   <if:when test="if:supports('action:install')">
     <note style="info package">
-      <p><link action="install:evolution-exchange" href="http://projects.gnome.org/evolution/download"; style="button">Install evolution-exchange</link></p>
+      <p><link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download"; style="button">Install evolution-mapi</link></p>
     </note>
   </if:when>
 </if:choose>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
index 64fae54..963285b 100644
--- a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
@@ -2,7 +2,7 @@
       type="guide" id="mail-account-manage-microsoft-exchange-evo-ews">
 
   <info>
-    <desc>Add and edit a Microsoft Exchange 2010 account in Evolution.</desc>
+    <desc>Add and edit a Microsoft Exchange 2007 or 2010 account in Evolution.</desc>
 
   <link type="guide" xref="mail-account-manage-microsoft-exchange" group="#first"/>
 
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
index 1f8a71f..b7ad088 100644
--- a/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
@@ -2,11 +2,11 @@
       type="guide" id="mail-account-manage-microsoft-exchange-evo-mapi">
 
   <info>
-    <desc>Add and edit a Microsoft Exchange 2007 account in Evolution.</desc>
+    <desc>Add and edit a Microsoft Exchange MAPI account in Evolution.</desc>
 
     <link type="guide" xref="mail-account-manage-microsoft-exchange"/>
 
-    <revision pkgversion="3.4" version="0.5" date="2012-02-19" status="candidate"/>
+    <revision pkgversion="3.7" version="0.6" date="2013-01-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47 gmx net</email>
diff --git a/help/C/mail-default-CC-and-BCC.page b/help/C/mail-default-CC-and-BCC.page
index bdde377..8371ffc 100644
--- a/help/C/mail-default-CC-and-BCC.page
+++ b/help/C/mail-default-CC-and-BCC.page
@@ -14,7 +14,6 @@
     <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#defaults"/>
     <link type="guide" xref="mail-account-manage-usenet-news#defaults"/>
     <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-mapi#defaults"/>
-    <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-exchange#defaults"/>
     <link type="guide" xref="mail-account-manage-novell-groupwise#defaults"/>
     <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-ews#defaults"/>
 
diff --git a/help/C/mail-default-folder-locations.page b/help/C/mail-default-folder-locations.page
index 70d5950..0b96ca8 100644
--- a/help/C/mail-default-folder-locations.page
+++ b/help/C/mail-default-folder-locations.page
@@ -14,7 +14,6 @@
     <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#defaults"/>
     <link type="guide" xref="mail-account-manage-usenet-news#defaults"/>
     <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-mapi#defaults"/>
-    <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-exchange#defaults"/>
     <link type="guide" xref="mail-account-manage-novell-groupwise#defaults"/>
     <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-ews#defaults"/>
 
diff --git a/help/C/mail-encryption.page b/help/C/mail-encryption.page
index b1043e2..75ee555 100644
--- a/help/C/mail-encryption.page
+++ b/help/C/mail-encryption.page
@@ -17,7 +17,6 @@
     <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#security"/>
     <link type="guide" xref="mail-account-manage-usenet-news#security"/>
     <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-mapi#security"/>
-    <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-exchange#security"/>
     <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-ews#security"/>
 
     <revision pkgversion="2.32.1" version="0.3" date="2011-01-06" status="candidate"/>