diff --git a/help/C/exchange-connectors-overview.page b/help/C/exchange-connectors-overview.page deleted file mode 100644 index 24dc094839..0000000000 --- a/help/C/exchange-connectors-overview.page +++ /dev/null @@ -1,52 +0,0 @@ - - - - Which additional package to install in order to connect to an Exchange server. - - - - - - Andre Klapper - ak-47@gmx.net - - - - - - - -Choosing the right connector - -

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.

- -

For Microsoft Exchange 2007, 2010 and newer it is recommended to use the package evolution-ews.

- - - -

Install evolution-ews

-
-
-
- - -

For older versions of Microsoft Exchange, or if evolution-ews does not work well for you, try evolution-mapi. It uses Microsoft's Messaging API which is also used by Microsoft Outlook. However, evolution-mapi requires installing OpenChange and Samba 4, and is not as performant as evolution-ews.

- - - - -

Install evolution-mapi

-
-
-
- -

If you are unsure which Microsoft Exchange server version is used, you may want to contact your system administrator for more information.

- - - -
- diff --git a/help/C/exchange-placeholder.page b/help/C/exchange-placeholder.page deleted file mode 100644 index 8f0308d670..0000000000 --- a/help/C/exchange-placeholder.page +++ /dev/null @@ -1,23 +0,0 @@ - - - - Connecting to Exchange Servers - - - - - - Andre Klapper - ak-47@gmx.net - - - - - - - -Connecting to Exchange Servers - -

For topics not covered here please refer to the old Evolution manual.

-
diff --git a/help/C/index.page b/help/C/index.page index 1cf7ec45a9..5e1ceb8680 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -64,13 +64,6 @@ Data Migration and Synchronization -
- Corporate Environments -
- Microsoft Exchange -
-
-
Tracking down Problems
diff --git a/help/C/mail-account-manage-microsoft-exchange.page b/help/C/mail-account-manage-microsoft-exchange.page index 44024af819..34c57f87ee 100644 --- a/help/C/mail-account-manage-microsoft-exchange.page +++ b/help/C/mail-account-manage-microsoft-exchange.page @@ -1,4 +1,6 @@ @@ -20,6 +22,30 @@ Microsoft Exchange account settings -

Please first read Choosing the right connector to find out about the right Exchange account type for you.

+

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.

+ +

For Microsoft Exchange 2007, 2010 and newer it is recommended to use the package evolution-ews.

+ + + +

Install evolution-ews

+
+
+
+ + +

For older versions of Microsoft Exchange, or if evolution-ews does not work well for you, try evolution-mapi. It uses Microsoft's Messaging API which is also used by Microsoft Outlook. However, evolution-mapi requires installing OpenChange and Samba 4, and is not as performant as evolution-ews.

+ + + + +

Install evolution-mapi

+
+
+
+ +

If you are unsure which Microsoft Exchange server version is used, you may want to contact your system administrator for more information.

+ +

For topics not covered here please refer to the old Evolution manual.

diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt index 781072c979..0c0b648366 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