[evolution] Bug #690696 - Remove references to the old IMAP backend

[Andre Klapper <aklapper src gnome org>]

commit f31c953016d62a8b452acb9ee57c4f148e55cb9a
Author: Andre Klapper <a9016009 gmx de>
Date:   Tue Jan 22 23:39:15 2013 +0100

    Bug #690696 - Remove references to the old IMAP backend

 help/C/mail-access-gmail-imap-account.page         |    4 +-
 help/C/mail-account-manage-imap-plus.page          |    1 -
 help/C/mail-account-manage-imap.page               |   62 --------------------
 .../mail-composer-mail-signatures-per-account.page |    1 -
 help/C/mail-default-CC-and-BCC.page                |    1 -
 help/C/mail-default-folder-locations.page          |    1 -
 help/C/mail-encryption.page                        |    1 -
 help/C/mail-imap-headers.page                      |   47 ---------------
 help/C/mail-imap-subscriptions.page                |    1 -
 help/C/mail-read-receipts.page                     |    1 -
 help/C/mail-receiving-options-imap.page            |    1 -
 help/C/mail-sending-options-smtp.page              |    1 -
 12 files changed, 2 insertions(+), 120 deletions(-)
---
diff --git a/help/C/mail-access-gmail-imap-account.page b/help/C/mail-access-gmail-imap-account.page
index 4c968d4a..d5e3023 100644
--- a/help/C/mail-access-gmail-imap-account.page
+++ b/help/C/mail-access-gmail-imap-account.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="index#common-mail-problems" />
     <link type="guide" xref="google-services"/>
-    <link type="seealso" xref="mail-account-manage-imap"/>
+    <link type="seealso" xref="mail-account-manage-imap-plus"/>
 
     <revision pkgversion="3.1.5" version="0.2" date="2011-07-30" status="final"/>
     <credit type="author">
@@ -23,7 +23,7 @@
 
 <title>Access a Gmail IMAP Account via Evolution</title>
 
-<p>Please refer to the <link xref="mail-account-manage-imap">IMAP mail account settings</link>.</p>
+<p>Please refer to the <link xref="mail-account-manage-imap-plus">IMAP+ mail account settings</link>.</p>
 
 <note style="important"><p>To access Gmail via IMAP you must turn on IMAP in your Google account. See the <link href="https://mail.google.com/support/bin/answer.py?answer=77695";>Gmail Help</link> for more information.</p></note>
 </page>
diff --git a/help/C/mail-account-manage-imap-plus.page b/help/C/mail-account-manage-imap-plus.page
index 861ba54..3bd4c8d 100644
--- a/help/C/mail-account-manage-imap-plus.page
+++ b/help/C/mail-account-manage-imap-plus.page
@@ -57,5 +57,4 @@
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section>
 
-<!-- TODO:DEVELOPERS: Find out if there are any different settings between IMAP and IMAP+. If not, merge with mail-account-manage-imap! Also see https://bugzilla.gnome.org/show_bug.cgi?id=670277 -->
 </page>
diff --git a/help/C/mail-composer-mail-signatures-per-account.page b/help/C/mail-composer-mail-signatures-per-account.page
index 1cf4e50..cd46c5c 100644
--- a/help/C/mail-composer-mail-signatures-per-account.page
+++ b/help/C/mail-composer-mail-signatures-per-account.page
@@ -5,7 +5,6 @@
     <desc>Setting a default signature for an email account.</desc>
     
     <link type="guide" xref="mail-composer-mail-signatures" />
-    <link type="guide" xref="mail-account-manage-imap#identity"/>
     <link type="guide" xref="mail-account-manage-imap-plus#identity"/>
     <link type="guide" xref="mail-account-manage-local-delivery#identity"/>
     <link type="guide" xref="mail-account-manage-maildir-format-directories#identity"/>
diff --git a/help/C/mail-default-CC-and-BCC.page b/help/C/mail-default-CC-and-BCC.page
index 8371ffc..0c452ed 100644
--- a/help/C/mail-default-CC-and-BCC.page
+++ b/help/C/mail-default-CC-and-BCC.page
@@ -4,7 +4,6 @@
   <info>
     <desc>Make somebody always receive copies of your sent mail.</desc>
 
-    <link type="guide" xref="mail-account-manage-imap#defaults"/>
     <link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
     <link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
     <link type="guide" xref="mail-account-manage-maildir-format-directories#defaults"/>
diff --git a/help/C/mail-default-folder-locations.page b/help/C/mail-default-folder-locations.page
index 0b96ca8..4db8db3 100644
--- a/help/C/mail-default-folder-locations.page
+++ b/help/C/mail-default-folder-locations.page
@@ -4,7 +4,6 @@
   <info>
     <desc>Changing the location of the Draft folder and Sent folder.</desc>
 
-    <link type="guide" xref="mail-account-manage-imap#defaults"/>
     <link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
     <link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
     <link type="guide" xref="mail-account-manage-maildir-format-directories#defaults"/>
diff --git a/help/C/mail-encryption.page b/help/C/mail-encryption.page
index 75ee555..22bf2ae 100644
--- a/help/C/mail-encryption.page
+++ b/help/C/mail-encryption.page
@@ -5,7 +5,6 @@
     <desc>Sending and receiving encrypted mail.</desc>
 
     <link type="guide" xref="index#mail-advanced"/>
-    <link type="guide" xref="mail-account-manage-imap#security"/>
     <link type="guide" xref="mail-account-manage-imap-plus#security"/>
     <link type="guide" xref="mail-account-manage-local-delivery#security"/>
     <link type="guide" xref="mail-account-manage-maildir-format-directories#security"/>
diff --git a/help/C/mail-imap-subscriptions.page b/help/C/mail-imap-subscriptions.page
index f5a4e5b..6d41161 100644
--- a/help/C/mail-imap-subscriptions.page
+++ b/help/C/mail-imap-subscriptions.page
@@ -5,7 +5,6 @@
     <desc>IMAP folder subscriptions.</desc>
     
     <link type="guide" xref="index#mail-advanced-imap" />
-    <link type="guide" xref="mail-account-manage-imap#other-settings"/>
     <link type="guide" xref="mail-account-manage-imap-plus#other-settings"/>
 
     <revision pkgversion="3.0.2" version="0.3" date="2011-08-05" status="final"/>
diff --git a/help/C/mail-read-receipts.page b/help/C/mail-read-receipts.page
index df528c3..816a42e 100644
--- a/help/C/mail-read-receipts.page
+++ b/help/C/mail-read-receipts.page
@@ -5,7 +5,6 @@
     <desc>How to enable requesting read receipts.</desc>
     
     <link type="guide" xref="index#mail-advanced" />
-    <link type="guide" xref="mail-account-manage-imap#defaults"/>
     <link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
     <link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
     <link type="guide" xref="mail-account-manage-maildir-format-directories#defaults"/>
diff --git a/help/C/mail-receiving-options-imap.page b/help/C/mail-receiving-options-imap.page
index 8a17ad7..96e0887 100644
--- a/help/C/mail-receiving-options-imap.page
+++ b/help/C/mail-receiving-options-imap.page
@@ -5,7 +5,6 @@
     <desc>Receiving options for IMAP accounts.</desc>
 
     <link type="guide" xref="mail-receiving-options#common-server-types"/>
-    <link type="guide" xref="mail-account-manage-imap#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>
diff --git a/help/C/mail-sending-options-smtp.page b/help/C/mail-sending-options-smtp.page
index f90cbb1..f05208c 100644
--- a/help/C/mail-sending-options-smtp.page
+++ b/help/C/mail-sending-options-smtp.page
@@ -4,7 +4,6 @@
   <info>
     <desc>Sending options for SMTP.</desc>
 
-    <link type="guide" xref="mail-account-manage-imap#sending-email"/>
     <link type="guide" xref="mail-account-manage-imap-plus#sending-email"/>
     <link type="guide" xref="mail-account-manage-local-delivery#sending-email"/>
     <link type="guide" xref="mail-account-manage-maildir-format-directories#sending-email"/>