[QA] Suite: update help file (eng version) SEAMONKEY_2_29b2_BUILD1 SEAMONKEY_2_29b2_RELEASE SEAMONKEY_2_30b1_BUILD1 SEAMONKEY_2_30b1_RELEASE
authorIacopo Benesperi <iacopo.benesperi@mozillaitalia.org>
Thu, 24 Apr 2014 16:41:23 +1000
changeset 3653 d566b6224c56972105f3b6d9177e5fdce43d9856
parent 3649 2e56c2a6aa91d339b1cf6e07c80bffad748606ec
child 3764 17a99840705a9b110b231a5f72de5b0a8f802162
child 3850 2bfc2b95ff4a1638b2045f28b3741ab95d219db7
child 4028 6f6c16d87373bde3fdfafb4944c1e17963e55ebe
child 4146 35c50f18f0dac4060f2503bd7ab5d510792cf64b
push id693
push useriacchi@mozillaitalia.org
push dateThu, 24 Apr 2014 06:42:40 +0000
[QA] Suite: update help file (eng version)
suite/chrome/common/help/mailnews_organizing.xhtml
--- a/suite/chrome/common/help/mailnews_organizing.xhtml
+++ b/suite/chrome/common/help/mailnews_organizing.xhtml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -380,25 +384,25 @@
   option from the submenu.</p>
 
 <ul>
   <li><strong>All</strong>: Choose this option to view all messages.</li>
   <li><strong>Unread</strong>: Choose this option to view only unread
     messages.</li>
   <li><strong>Tags</strong>: Choose a <a href="#tagging_messages">tag</a>
     to view tagged messages.</li>
-  <li><strong>Custom views</strong>: Choose a custom view. By default you have
-    four preset views: <q>People I Know</q>, <q>Recent Mail</q>, <q>Last 5
-    Days</q>, and <q>Not Junk</q>.</li>
+  <li><strong>Custom Views</strong>: Choose a custom view. By default you have
+    five preset views: <q>People I Know</q>, <q>Recent Mail</q>, <q>Last 5
+    Days</q>, <q>Not Junk</q>, and <q>Has Attachments</q>.</li>
   <li><strong>Customize</strong>: Choose this option to view or modify
-    settings for custom views.</li>
+    settings for custom views or create your own custom view.</li>
 </ul>
 
-<p><strong>Tip</strong>: You can quickly change message view from the View box
-  in the Search Bar. If you do not see the Search Bar, open the View menu,
+<p><strong>Tip</strong>: You can quickly change the message view from the View 
+  box in the Search Bar. If you do not see the Search Bar, open the View menu,
   choose Show/Hide, and then choose Search Bar.</p>
 
 <table>
   <tr>
     <td colspan="2"><img src="images/mail_quicksearch.png" alt=""/></td>
   </tr>
   <tr>
     <td style="width: 80px;"></td>
@@ -638,21 +642,31 @@
 
 <ol>
   <li>Open the Tools menu and choose Search Messages. You see the Search
     Messages dialog box.</li>
   <li>Next to <q>Search for messages in</q>, choose the account, newsgroup, or
     folder through which you want to search.</li>
   <li>Select <q>Search subfolders</q> to include all subfolders in the
     search.</li>
-  <li>Select <q>Search local system</q> to search only messages from newsgroups
-    or IMAP accounts that have been saved locally.
-
-    <p><strong>Note</strong>: The checkbox will be disabled if it&apos;s not
-      possible to search remotely stored messages.</p>
+  <li>Next to <q>Perform search operations on</q>, select an option where to
+    search for messages in newsgroups or IMAP accounts:
+    <ul>
+      <li>Choose <q>Local system</q> to use only the information stored locally
+        for the search without any network activity. This mode includes all
+        major message headers. You can&apos;t search the message body locally
+        unless the account and its folders have been set up for
+        <a href="mailnews_account_settings.xhtml#synchronization_and_storage">synchronization</a>.
+      </li>
+      <li>Choose <q>Remote server</q> to perform all searches on the server
+        where the messages are located. This will allow you to also search for
+        contents in message bodies which have not been synchronized.</li>
+    </ul>
+    <p><strong>Note</strong>: This menu will be disabled if it&apos;s not
+      possible to search remotely on the server (e.g., for POP accounts).</p>
   </li>
   <li>Select which matching option Mail &amp; Newsgroups will use to search for
     messages that match all or at least one of the conditions (criteria) that
     you choose.</li>
   <li>Use the drop-down lists to indicate the search criteria (for example,
     <q>Subject</q> and <q>contains</q>) and then type the text or phrase that
     you want to match.