[evolution] Move exchange-placeholder + exchange-connectors-overview into mail-account-manage-microsoft-exchange

[Andre Klapper <aklapper src gnome org>]

commit 8f967d9f4c03b8eec0bec985408ccdf3cbc5a0c8
Author: Andre Klapper <a9016009 gmx de>
Date:   Sat Apr 8 17:36:46 2017 +0200

    Move exchange-placeholder + exchange-connectors-overview into mail-account-manage-microsoft-exchange; 
Remove useless Corporate section from index page.

 help/C/exchange-connectors-overview.page           |   52 --------------------
 help/C/exchange-placeholder.page                   |   23 ---------
 help/C/index.page                                  |    7 ---
 help/C/mail-account-manage-microsoft-exchange.page |   28 ++++++++++-
 help/CMakeLists.txt                                |    2 -
 5 files changed, 27 insertions(+), 85 deletions(-)
---
diff --git a/help/C/index.page b/help/C/index.page
index 1cf7ec4..5e1ceb8 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -64,13 +64,6 @@
     <title>Data Migration and Synchronization</title>
   </section>
 
-  <section id="corporate-environments" style="2column">
-    <title>Corporate Environments</title>
-      <section id="corporate-environments-exchange" style="2column">
-        <title>Microsoft Exchange</title>
-      </section>
-  </section>
-
   <section id="tracking-down-problems" style="2column">
     <title>Tracking down Problems</title>
   </section>
diff --git a/help/C/mail-account-manage-microsoft-exchange.page 
b/help/C/mail-account-manage-microsoft-exchange.page
index 44024af..34c57f8 100644
--- a/help/C/mail-account-manage-microsoft-exchange.page
+++ b/help/C/mail-account-manage-microsoft-exchange.page
@@ -1,4 +1,6 @@
 <page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+      xmlns:e="http://projectmallard.org/experimental/";
+      xmlns:if="http://projectmallard.org/experimental/if/";
       type="guide" id="mail-account-manage-microsoft-exchange">
 
   <info>
@@ -20,6 +22,30 @@
 
   <title>Microsoft Exchange account settings</title>
 
-<note style="important"><p>Please first read <link xref="exchange-connectors-overview">Choosing the right 
connector</link> to find out about the right Exchange account type for you.</p></note>
+<note style="important"><p>Depending on the version of the Microsoft Exchange server that you would like to 
connect to it is required to make sure that an additional package is installed that provides this 
functionality.</p>
+
+<p>For Microsoft Exchange 2007, 2010 and newer it is recommended to use the package 
<sys>evolution-ews</sys>.</p>
+<if:choose xmlns:if="http://projectmallard.org/if/1.0/";>
+  <if:when test="action:install">
+    <note style="info package">
+      <p><link action="install:evolution-ews" 
href="https://wiki.gnome.org/Apps/Evolution#Get_the_Source_Code"; style="button">Install 
evolution-ews</link></p>
+    </note>
+  </if:when>
+</if:choose>
+
+
+<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 xmlns:if="http://projectmallard.org/if/1.0/";>
+  <if:when test="action:install">
+    <note style="info package">
+      <p><link action="install:evolution-mapi" 
href="https://wiki.gnome.org/Apps/Evolution#Get_the_Source_Code"; style="button">Install 
evolution-mapi</link></p>
+    </note>
+  </if:when>
+</if:choose>
+
+<p>If you are unsure which Microsoft Exchange server version is used, you may want to contact your system 
administrator for more information.</p></note>
+
+<p>For topics not covered here please refer to the <link 
href="https://help.gnome.org/users/evolution/2.32/usage-exchange.html";>old <app>Evolution</app> 
manual</link>.</p>
 
 </page>
diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
index 781072c..0c0b648 100644
--- a/help/CMakeLists.txt
+++ b/help/CMakeLists.txt
@@ -76,8 +76,6 @@ set(HELP_FILES
        deleting-appointments.page
        deleting-emails.page
        deleting-to-free-disk-space.page
-       exchange-connectors-overview.page
-       exchange-placeholder.page
        exporting-data-calendar.page
        exporting-data-contacts.page
        exporting-data-mail.page