Bug #692213 - Remove evolution-exchange recommendation

8 files changed, 7 insertions, 137 deletions

diff --git a/help/C/exchange-connectors-overview.page b/help/C/exchange-connectors-overview.page
index 1725c2c3a7..c475d1e191 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 64fae541f4..963285ba89 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-exchange.page b/help/C/mail-account-manage-microsoft-exchange-evo-exchange.page
deleted file mode 100644
index 4951a42b05..0000000000
--- a/help/C/mail-account-manage-microsoft-exchange-evo-exchange.page
+++ /dev/null
@@ -1,60 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
-      type="guide" id="mail-account-manage-microsoft-exchange-evo-exchange">
-
-  <info>
-    <desc>Add and edit a Microsoft Exchange 2000/2003 account in Evolution.</desc>
-
-    <link type="guide" xref="mail-account-manage-microsoft-exchange" group="#last"/>
-
-    <revision pkgversion="3.4" version="0.6" date="2012-02-19" status="candidate"/>
-    <credit type="author">
-      <name its:translate="no">Andre Klapper</name>
-      <email its:translate="no">ak-47@gmx.net</email>
-    </credit>
-    <license>
-      <p>Creative Commons Share Alike 3.0</p>
-    </license>
-
-  </info>
-
-  <title>Microsoft Exchange account settings</title>
-
-<section id="account-editor">
-<title>Account Editor</title>
-
-<p>Mail accounts can be added by choosing <guiseq><gui>File</gui><gui>New</gui><gui>Mail Account</gui></guiseq> or via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
-<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq> or by right-clicking on the respective top-level node in the folder list and choosing <gui>Properties</gui>.</p>
-<p>The following settings are available when editing an existing account:</p>
-
-<section id="identity">
-<title>Identity</title>
-<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
-<p>Here you define your name and your email address.</p>
-<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
-</section>
-
-<section id="receiving-email">
-<title>Receiving Email and Receiving options</title>
-</section>
-
-<section id="defaults">
-<title>Defaults</title>
-</section>
-
-<section id="exchange-settings">
-<title>Exchange Settings</title>
-<p>In this section you can define your "Out of Office" status, change the password for your Exchange account, and manage the delegation settings.</p><p>You can also view the size of all Exchange folders.</p>
-</section>
-
-<section id="security">
-<title>Security</title>
-</section>
-
-</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
-
-<!-- <section id="other-settings">
-<title>Other settings</title>
-<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
-</section> -->
-
-</page>
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 1f8a71ff25..b7ad08836f 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 bdde377773..8371ffce77 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 70d5950930..0b96ca8633 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 b1043e261e..75ee555008 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"/>
diff --git a/help/C/mail-receiving-options-evolution-exchange.page b/help/C/mail-receiving-options-evolution-exchange.page
deleted file mode 100644
index 5ad6a85aea..0000000000
--- a/help/C/mail-receiving-options-evolution-exchange.page
+++ /dev/null
@@ -1,60 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" id="mail-receiving-options-evolution-exchange">
-
-  <info>
-    <desc>Receiving options for Evolution Exchange accounts.</desc>
-
-    <link type="guide" xref="mail-receiving-options#corporate-server-types"/>
-    <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-exchange#receiving-email"/>
-    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
-    <credit type="author">
-      <name its:translate="no">Andre Klapper</name>
-      <email its:translate="no">ak-47@gmx.net</email>
-    </credit>
-    <credit type="author">
-      <name its:translate="no">Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#bstgjve -->
-    </credit>
-    <license>
-      <p>Creative Commons Share Alike 3.0</p>
-    </license>
-
-  </info>
-
-  <title>Evolution Exchange receiving options</title>
-
-<section id="receiving-email">
-<title>Receiving Email</title>
-
-<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
-
-<list>
-<item><p>Enter your username for that server.</p></item>
-<item><p>Enter the OWA URL for that server.</p></item>
-<item><p>Select if the mailbox name is different from the username. If it is, enter the mailbox name.</p>
-<note style="tip"><p>If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
-<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
-<item><p>Click <gui style="button">Authenticate</gui> and enter your password.</p></item>
-</list>
-
-</section>
-
-<section id="receiving-options">
-<title>Receiving Options</title>
-
-<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
-
-<list>
-<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
-<item><p>You can also define if Evolution checks for new messages in all folders.</p></item>
-<item><p>In the section <gui>Global Address List/Active Directory</gui>, specify the name of the Global Catalog server. The Global Catalog Server contains the user information for users.</p></item>
-<item><p>Select if you want to limit the number of Global Address List (GAL) responses as this may increase speed. The GAL contains a list of all email addresses.</p></item>
-<item><p>You also have to define the Authentication type, and whether you want groups of contacts in GAL to be represented in the Evolution address book by <link xref="contacts-using-contact-lists">contact lists</link>.</p></item>
-</list>
-
-</section>
-
-<section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
-<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-</section>
-</page>