Bug #690696 - Remove references to the old IMAP backend

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 4c968d4a99..d5e3023b0f 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 861ba54426..3bd4c8ddad 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-account-manage-imap.page b/help/C/mail-account-manage-imap.page
deleted file mode 100644
index 50542ed7dd..0000000000
--- a/help/C/mail-account-manage-imap.page
+++ /dev/null
@@ -1,62 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
-      type="guide" id="mail-account-manage-imap">
-
-  <info>
-    <desc>Add and edit an IMAP mail account in Evolution.</desc>
-
-    <link type="guide" xref="mail-account-management#mail-common-account-types"/>
-
-    <revision pkgversion="3.4" version="0.4" 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>IMAP mail 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="sending-email">
-<title>Sending Email</title>
-</section>
-
-<section id="defaults">
-<title>Defaults</title>
-</section>
-
-<section id="security">
-<title>Security</title>
-</section>
-
-<section id="imap-headers">
-<title>IMAP Headers</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-composer-mail-signatures-per-account.page b/help/C/mail-composer-mail-signatures-per-account.page
index 1cf4e50bfe..cd46c5c559 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 8371ffce77..0c452ed2b9 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 0b96ca8633..4db8db3173 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 75ee555008..22bf2ae636 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-headers.page b/help/C/mail-imap-headers.page
deleted file mode 100644
index cf47fa5aff..0000000000
--- a/help/C/mail-imap-headers.page
+++ /dev/null
@@ -1,47 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" id="mail-imap-headers">
-
-  <info>
-    <desc>Define which mail headers to download when using IMAP.</desc>
-    
-    <link type="guide" xref="index#mail-advanced-imap" />
-    <link type="guide" xref="mail-account-manage-imap#imap-headers"/>
-
-    <revision pkgversion="3.1.5" version="0.3" date="2011-07-29" 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/b15fx7uz.html.en -->
-    </credit>
-    <license>
-      <p>Creative Commons Share Alike 3.0</p>
-    </license>
-
-  </info>
-
-
-<title>IMAP Headers</title>
-
-<note style="important"><p>The <gui>IMAP Headers</gui> tab is only displayed in the <gui>Account Editor</gui> if <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>IMAP Features</gui></guiseq> is enabled.</p></note>
-
-<p>Evolution allows you for IMAP accounts to choose the headers that you want to download so that you can reduce the download time and filter or move your mail around the way you like it. The IMAP Mail header options are as follows:</p>
-<list>
-<item><p>Fetch All Headers:</p><p>All available IMAP mail headers for all the messages will be downloaded.</p></item>
-<item><p>Basic Headers (Fastest):</p><p>This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, Message-ID, Mime-Version, and Content-Type. If you want to just fetch and see messages without having to categorically filter messages based on your mailing lists, choose this option. This will make Evolution work faster and is generally recommended for common users.</p></item>
-<item><p>Basic and Mailing List Headers (Default):</p><p>Enable this option to have filters based on mailing list headers (like list ID) so that in addition to the basic headers, the headers that correspond to mailing-lists are also fetched. Mailing list headers will have information such as the mailinglist-ID, owner of the mailing list, and so on with which you can create mailing list filters.</p><p>This is the default Header preference that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the <gui>Basic Headers</gui> option.</p></item>
-</list>
-
-<p>To set the IMAP Mail headers:</p>
-<steps>
-<item><p>Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>.</p></item>
-<item><p>Select the IMAP account.</p></item>
-<item><p>Click <gui>Edit</gui>.</p></item>
-<item><p>Click the <gui>IMAP Headers</gui> tab.</p></item>
-<item><p>Optionally: If you want to define extra headers to download you can add these in the <gui>Custom Headers</gui> section.</p></item>
-</steps>
-
-<note style="tip"><p>The option to define IMAP Headers is currently only available for IMAP accounts, but not for IMAP+ accounts.</p></note><!-- TODO:DEVELOPERS: Recheck this once https://bugzilla.gnome.org/show_bug.cgi?id=655519 has been fixed -->
-</page>
-
diff --git a/help/C/mail-imap-subscriptions.page b/help/C/mail-imap-subscriptions.page
index f5a4e5bea5..6d4116101c 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 df528c376a..816a42e579 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 8a17ad78b0..96e0887d4e 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 f90cbb12cd..f05208c72e 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"/>