[evolution] Bug #690697 - Document using real (non-virtual) Junk and Trash folders with IMAP+

[Andre Klapper <aklapper src gnome org>]

commit 7496cba6089064f46391497579c2e550a01aa841
Author: Andre Klapper <a9016009 gmx de>
Date:   Wed Jan 23 00:32:54 2013 +0100

    Bug #690697 - Document using real (non-virtual) Junk and Trash folders with IMAP+

 help/C/mail-default-folder-locations.page |    6 +++---
 help/C/mail-two-trash-folders.page        |   20 ++++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/help/C/mail-default-folder-locations.page b/help/C/mail-default-folder-locations.page
index 4db8db3..cc86d49 100644
--- a/help/C/mail-default-folder-locations.page
+++ b/help/C/mail-default-folder-locations.page
@@ -2,7 +2,7 @@
       type="topic" id="mail-default-folder-locations">
 
   <info>
-    <desc>Changing the location of the Draft folder and Sent folder.</desc>
+    <desc>Changing the location of Draft, Sent, Trash and Junk folders.</desc>
 
     <link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
     <link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
@@ -16,7 +16,7 @@
     <link type="guide" xref="mail-account-manage-novell-groupwise#defaults"/>
     <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-ews#defaults"/>
 
-    <revision pkgversion="2.32.1" version="0.1" date="2011-01-06" status="draft"/>
+    <revision pkgversion="3.7.4" version="0.2" date="2013-01-23" status="draft"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47 gmx net</email>
@@ -30,6 +30,6 @@
   <title>Mail folder locations</title>
 
 <p>You can set a different place where to store messages in your Draft folder and Sent folder in the <gui>Defaults</gui> section of the mail account editor (<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui></guiseq>).</p>
-<p>For remote account types (accounts such as IMAP) you can also set a Trash folder and Junk folder on the mail server so Evolution's local virtual folders will not be used for it, but folders on the mail server.</p>
+<p>For remote account types (accounts such as IMAP) you can also use folders on the mail server for Junk and Trash by selecting the corresponding <gui>Use a Real Folder</gui> option. In this case, Evolution's local <link xref="mail-search-folders">virtual folders</link> will not be used.</p>
 
 </page>
diff --git a/help/C/mail-two-trash-folders.page b/help/C/mail-two-trash-folders.page
index a008322..9269a01 100644
--- a/help/C/mail-two-trash-folders.page
+++ b/help/C/mail-two-trash-folders.page
@@ -2,29 +2,33 @@
       type="topic" id="mail-two-trash-folders">
 
   <info>
-    <desc>An explanation for the problem that two trash folders are present in Evolution.</desc>
+    <desc>How to have only one trash or junk folder per account.</desc>
     
     <link type="guide" xref="index#common-mail-problems" />
+    <link type="seealso" xref="mail-default-folder-locations" />
 
-    <revision pkgversion="2.28.3" version="0.1" date="2010-10-09" status="final"/>
+    <revision pkgversion="3.7.4" version="0.2" date="2013-01-23" status="final"/>
     <credit type="author">
       <name its:translate="no">April Gonzales</name>
       <email its:translate="no">loonycookie gmail com</email>
     </credit>
+    <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>Two Trash folders shown for the same account</title>
-
-<p>You may have created another Trash folder to hold all your deleted email messages. This can happen when you use another email client together with Evolution.</p>
-
-<p>Evolution's <gui>Trash</gui> folder is a <link xref="mail-search-folders">Search folder</link>. It does not really exist but simply displays all the messages that are marked for deletion in any folders of that account.</p>
+<title>Two Trash or Junk folders shown for the same account</title>
 
+<p>If you use a remote mail account that also has Junk and/or Trash folders on the server you might face duplicated folders in Evolution.</p>
 <p>You can easily tell the two Trash folders apart by looking at their icons. The Evolution <gui>Trash</gui> folder has a special icon whereas the other physical Trash folder looks like any other folder.</p>
 
-<note style="tip"><p>Note that the <gui>Junk</gui> folder is also a search folder and may also appear twice.</p></note>
+<p>By default, Evolution's <gui>Trash</gui> and <gui>Junk</gui> folders are <link xref="mail-search-folders">Search folders</link>. They do not really exist but simply display all the messages that are marked as junk or for deletion in any folders of that account.</p>
+
+<p>In order to only use the folders for Junk and Trash on the mail server, select the corresponding <gui>Use a Real Folder</gui> option under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui></guiseq>. In this case, Evolution's local virtual folders will not be used.</p>
 
 </page>