Bug 1236365 - Remove references to Sidebar search results from Help. r=IanN, a=Help change.
authorIsaac Schemm <isaacschemm@gmail.com>
Mon, 13 Jun 2016 19:00:36 +0200
changeset 25253 6b8514a38d060c909e05d3af809d2bac89226b11
parent 25252 75903a87a16606c0132c1185b8aa412ec044ba49
child 25254 bc354348d8a3c3111341966442dcc97009518b05
push idunknown
push userunknown
push dateunknown
reviewersIanN, Help
bugs1236365
Bug 1236365 - Remove references to Sidebar search results from Help. r=IanN, a=Help change.
suite/locales/en-US/chrome/common/help/customize_help.xhtml
suite/locales/en-US/chrome/common/help/help-index1.rdf
suite/locales/en-US/chrome/common/help/images/sidebar-advanced.png
suite/locales/en-US/chrome/common/help/nav_help.xhtml
suite/locales/en-US/chrome/common/help/suite-toc.rdf
suite/locales/jar.mn
--- a/suite/locales/en-US/chrome/common/help/customize_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/customize_help.xhtml
@@ -66,20 +66,19 @@
     <li><a href="#reorganizing_sidebar_tabs">Reorganizing Sidebar Tabs</a></li>
     <li><a href="#removing_sidebar_tabs">Removing Sidebar Tabs</a></li>
   </ul>
 </div>
 
 <h3 id="what_is_sidebar">What is Sidebar?</h3>
 
 <p>Sidebar is a customizable area in your browser where you can keep items
-  that you need to use all the time&mdash;the latest news and weather, your
-  address book, stock quotes, a calendar&mdash;and many other available
-  options. Sidebar presents these items to you in tabs that are continually
-  updated.</p>
+  that you need to use all the time, including your bookmarks, browser history,
+  address book, and other available options. Sidebar presents these items to
+  you in tabs that are continually updated.</p>
 
 <p>&brandShortName; comes with some Sidebar tabs already set up, but you can
   customize Sidebar by adding, removing, and rearranging tabs.</p>
 
 <p>[<a href="#sidebar">Return to beginning of section</a>]</p>
 
 <h3 id="opening_closing_and_resizing_sidebar">Opening, Closing and Resizing
   Sidebar</h3>
--- a/suite/locales/en-US/chrome/common/help/help-index1.rdf
+++ b/suite/locales/en-US/chrome/common/help/help-index1.rdf
@@ -1868,21 +1868,16 @@
          nc:link="mailnews_using_mail.xhtml#saving_and_printing_messages"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#search">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="search:Advanced_mode"
-         nc:name="Sidebar Advanced Search Mode"
-         nc:link="nav_help.xhtml#sidebar_advanced_search_mode"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="search:bookmarks"
          nc:name="search bookmarks"
          nc:link="nav_help.xhtml#searching_the_bookmarks_or_history_list"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="search:setting_preferences"
          nc:name="search preferences"
          nc:link="nav_help.xhtml#setting_search_preferences"/>
deleted file mode 100644
index 34768e6b0bc2f10a20cb41678832ec363037c1ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/suite/locales/en-US/chrome/common/help/nav_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/nav_help.xhtml
@@ -350,20 +350,19 @@
 <p>[<a href="#navigating_web_pages">Return to beginning of section</a>]</p>
 
 <h2 id="using_sidebar">Using Sidebar</h2>
 
 <p>In addition to navigating the Web with the browser, you can let the Web come
   to you by using Sidebar.</p>
 
 <p>Sidebar is a customizable frame in your browser where you can keep items
-  that you need to use all the time&mdash;the latest news and weather, your
-  address book, stock quotes, a calendar&mdash;and many other available
-  options. Sidebar presents these items to you in tabs that it continually
-  updates.</p>
+  that you need to use all the time, including your bookmarks, browser history,
+  address book, and other available options. Sidebar presents these items to
+  you in tabs that it continually updates.</p>
 
 <p>&brandShortName; comes with some Sidebar tabs already set up, but you can
   customize Sidebar by adding, removing, and rearranging tabs. For details,
   see <a href="customize_help.xhtml#sidebar">Sidebar</a>.</p>
 
 <p>To view an item in Sidebar, click its tab.</p>
 
 <table summary="table for images">
@@ -383,18 +382,16 @@
 
 <p>[<a href="#navigating_web_pages">Return to beginning of section</a>]</p>
 
 <h1 id="searching_the_web">Searching the Web</h1>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#fast_searches">Fast Searches</a></li>
-    <li><a href="#sidebar_advanced_search_mode">Sidebar Advanced Search
-      Mode</a></li>
     <li><a href="#setting_search_preferences">Setting Search
       Preferences</a></li>
     <li><a href="#searching_within_a_page">Searching Within a Page</a></li>
     <li><a href="#using_find_as_you_type">Using Find-as-you-type</a></li>
     <li><a href="#searching_the_bookmarks_or_history_list">Searching the
       Bookmarks or History List</a></li>
   </ul>
 </div>
@@ -424,73 +421,55 @@
       <li>Click the Search button.</li>
       <li>Click <q>Search Google for <q>baby doll</q></q> at the bottom of the
         drop-down list in the Location Bar. (Your default search engine may be
         different.)
 
         <p>The default search engine you choose in the
           <a href="cs_nav_prefs_navigator.xhtml#internet_search">Internet
           Search Preferences</a> is used. Search results for <q>baby doll</q>
-          appear in both the browser window and in Sidebar. Click the links to
-          visit web pages about baby dolls.</p>
+          appear in the browser window. Click the links to visit web pages
+          about baby dolls.</p>
       </li>
     </ul>
   </li>
 </ol>
 
-<p>After you perform a search, the results are saved in Sidebar&apos;s Search
-  tab until you do a new search. You don&apos;t have to click the Back button
-  to retrieve the search results.</p>
-
 <p><strong>Note</strong>: In the <q>Unknown Locations</q> section of the
   <a href="cs_nav_prefs_navigator.xhtml#location_bar">Location Bar
   Preferences</a>, you can set up the Location Bar so a search is automatically
   performed if the text you have typed is not a web location. Typing a word in
   the Location Bar and pressing <kbd class="noMac">Enter</kbd><kbd class="mac">
   Return</kbd> will then perform a search.</p>
 
 <h3 id="searching_from_sidebar">Searching from Sidebar</h3>
 
-<p>The Sidebar Search tab lets you quickly search and bookmark your search
-  results. For example, if you want to find information about toy cars:</p>
+<p>The Sidebar Search tab lets you keep a search bar in your sidebar.
+  For example, if you want to find information about toy cars:</p>
 
 <ol>
   <li>If it is not already open, open Sidebar by clicking its handle. If the
     handle is missing, <span class="noMac">press <kbd>F9</kbd> or </span>open
     the View menu in the browser, choose Show/Hide, and then Sidebar from the
     submenu.</li>
   <li>Click the Search tab in Sidebar.</li>
-  <li>Open the <q>using</q> drop-down list, and choose a search
-    engine.</li>
+  <li>Open the drop-down list, and choose a search engine.</li>
   <li>Type <q>toy car</q> in the search field.</li>
-  <li>Click Search. Search results for &apos;toy car&apos; appear in both the
-    browser window and in Sidebar. Click the links to visit web pages about toy
-    cars.</li>
+  <li>Click Search. Search results for &apos;toy car&apos; appear in the
+    browser window. Click the links to visit web pages about toy cars.</li>
 </ol>
 
-<p><strong>Note</strong>: If the Sidebar Search tab contains a list of search
-  engines from which to choose, then it is set to search in
-  <a href ="#sidebar_advanced_search_mode">Advanced mode</a> and you will have
-  to choose one or more search engines before clicking Search. You can keep it
-  that way or change to a basic setting in Preferences.</p>
-
-<p><strong>Tip</strong>: To display the next or previous page of search results
-  quickly, click the Next and Previous buttons at the bottom of the Sidebar
-  Search tab.</p>
-
 <p>See <a href="customize_help.xhtml#sidebar">Sidebar</a> for more information
   on how to use Sidebar.</p>
 
-<h3 id="searching_from_the_net_search_page">Searching from the Net
-  Search page</h3>
+<h3 id="searching_from_the_net_search_page">Searching from your search engine's
+  home page</h3>
 
-<p>The Net Search page lets you type in a Search term or phrase, or explore
-  several categories (such as Arts &amp; Entertainment, Business, and many
-  more) that may interest you. To visit the Net Search page, perform one of
-  these steps:</p>
+<p>You can also perform a search from your search engine's home page.
+  To visit this page, perform one of these steps:</p>
 
 <ul>
   <li>Click on the Search button <img src="images/search_personal_toolbar.gif"
     width="66" height="20" alt="search button"/> on the Navigation Toolbar.</li>
   <li>Open the Tools menu and choose Search the Web.</li>
 </ul>
 
 <h3 id="searching_on_selected_words_in_a_web_page">Searching on Selected Words
@@ -510,100 +489,35 @@
   and uses your default search engine to search for your selected words. To
   learn how to change the search engine used to search for your selected words
   and the way your search results are displayed, see
   <a href="cs_nav_prefs_navigator.xhtml#internet_search">Browser Preferences
   - Internet Search</a>.</p>
 
 <p>[<a href="#searching_the_web">Return to beginning of section</a>]</p>
 
-<h2 id="sidebar_advanced_search_mode">Sidebar Advanced Search Mode</h2>
-
-<p>You can set the Sidebar Search tab to Advanced mode, which lets you narrow a
-  search or choose one or more search engines.</p>
-
-<ol>
-  <li>Open the
-    <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
-    menu and choose Preferences.</li>
-  <li>Under the Browser category, click Internet Search. (If no subcategories
-    are visible, double-click Browser to expand the list.)</li>
-  <li>Under Sidebar Search Tab Preferences, click Advanced, and then OK.</li>
-  <li>If it is not already open, open Sidebar by clicking its handle. If the
-    handle is missing, <span class="noMac">press <kbd>F9</kbd> or </span>open
-    the View menu in the browser, choose Show/Hide, and then Sidebar from the
-    submenu.</li>
-  <li>Click the Search tab in Sidebar.</li>
-  <li>Open the <q>within</q> drop-down list, and choose a category.</li>
-  <li>Choose one or more search engines for the selected category (if
-    available).</li>
-  <li>In the search field, type the word for which you want to search.</li>
-  <li>Click Search.</li>
-</ol>
-
-<p><img src="images/sidebar-advanced.png" alt="Sidebar Search"/></p>
-
-<h3 id="customizing_search_categories">Customizing Search Categories</h3>
-
-<p>You can specify which search engines should be used for different categories
-  of searches. For example, you can select one set of search engines to search
-  for travel, and select another set of search engines to search for
-  software.</p>
-
-<ol>
-  <li>Set Sidebar Search to Advanced Search Mode. See
-    <a href="#sidebar_advanced_search_mode">Sidebar Advanced Search Mode</a>
-    for details.</li>
-  <li>If it is not already open, open Sidebar by clicking its handle. If the
-    handle is missing, open the View menu in the browser, choose Show/Hide, and
-    then Sidebar from the submenu.</li>
-  <li>Click the Search tab in Sidebar.</li>
-  <li>Open the <q>within</q> drop-down list, click <q>Edit
-    Categories</q>. You see the Edit Categories dialog box.</li>
-  <li>From the Categories drop-down list, choose the category you want to
-    customize.<br/>
-    Or<br/>
-    To create a new category, click New and type a name for the category in the
-    dialog box. The drop-down list now displays the name of the selected
-    category.</li>
-  <li>Do one of the following:
-    <ul>
-      <li>To add a search engine for the selected category, highlight the
-        search engine in the list on the left, and click Add.</li>
-      <li>To remove a search engine for the selected category, highlight the
-        engine in the list on the right, and click Remove.</li>
-      <li>To rename the selected category, click Rename and type a new
-        name.</li>
-      <li>To delete the selected category, click Delete.</li>
-    </ul>
-  </li>
-  <li>Click OK when you are finished customizing.</li>
-</ol>
-
-<p>[<a href="#searching_the_web">Return to beginning of section</a>]</p>
-
 <h2 id="setting_search_preferences">Setting Search Preferences</h2>
 
 <p>You can choose a different search engine as the default. You can also
-  specify how you want search results displayed in Sidebar.</p>
+  specify how you want search results displayed.</p>
 
 <ol>
   <li>Open the
     <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
     menu and choose Preferences.</li>
   <li>Under the Browser category, click Internet Search. (If no subcategories
     are visible, double-click the Browser to expand the list.)</li>
   <li>Under Default Search Engine, choose a search engine you want to use for
     web searching.</li>
   <li>Under Search Results, select <q>Open the Search tab in the Sidebar
-    when search results are available</q> if you want the Sidebar search tab
-    to open and show your search results.</li>
-  <li>Under Sidebar Search Tab Preference, select Basic if you want to search
-    using a single search engine, or select Advanced to be able to search using
-    multiple search engines.</li>
+    when a search is invoked</q> if you want the Sidebar search tab to open
+    when you perform a search.</li>
+  <li>Under Search Results, select <q>Open new tabs for sidebar search
+    results</q> if you want to see the results from Sidebar searches to open in
+    a new tab instead of the current tab.</li>
 </ol>
 
 <p>[<a href="#searching_the_web">Return to beginning of section</a>]</p>
 
 <h2 id="searching_within_a_page">Searching Within a Page</h2>
 
 <p>To find text within the page you are currently viewing in the browser:</p>
 
--- a/suite/locales/en-US/chrome/common/help/suite-toc.rdf
+++ b/suite/locales/en-US/chrome/common/help/suite-toc.rdf
@@ -70,17 +70,16 @@
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
   <rdf:Description about="#nav-doc-search">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="nav-doc-searchweb" nc:name="Fast Searches" nc:link="nav_help.xhtml#fast_searches"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="nav-doc-smartsearch" nc:name="Sidebar Advanced Search Mode" nc:link="nav_help.xhtml#sidebar_advanced_search_mode"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-searchprefs" nc:name="Setting Search Preferences" nc:link="nav_help.xhtml#setting_search_preferences"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-searchpage" nc:name="Searching Within a Page" nc:link="nav_help.xhtml#searching_within_a_page"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-find_as_you_type" nc:name="Using Find-as-you-type" nc:link="nav_help.xhtml#using_find_as_you_type"/></rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-searchbookmark" nc:name="Searching the Bookmarks or History List" nc:link="nav_help.xhtml#searching_the_bookmarks_or_history_list"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@@ -132,17 +132,16 @@
   locale/@AB_CD@/communicator/help/images/numbers.gif                       (%chrome/common/help/images/numbers.gif)
   locale/@AB_CD@/communicator/help/images/offline.png                       (%chrome/common/help/images/offline.png)
   locale/@AB_CD@/communicator/help/images/online.png                        (%chrome/common/help/images/online.png)
   locale/@AB_CD@/communicator/help/images/personalbar.png                   (%chrome/common/help/images/personalbar.png)
   locale/@AB_CD@/communicator/help/images/reload.gif                        (%chrome/common/help/images/reload.gif)
   locale/@AB_CD@/communicator/help/images/search.png                        (%chrome/common/help/images/search.png)
   locale/@AB_CD@/communicator/help/images/search_personal_toolbar.gif       (%chrome/common/help/images/search_personal_toolbar.gif)
   locale/@AB_CD@/communicator/help/images/sidebar.png                       (%chrome/common/help/images/sidebar.png)
-  locale/@AB_CD@/communicator/help/images/sidebar-advanced.png              (%chrome/common/help/images/sidebar-advanced.png)
   locale/@AB_CD@/communicator/help/images/tabbed_browsing_bar.png           (%chrome/common/help/images/tabbed_browsing_bar.png)
   locale/@AB_CD@/communicator/help/images/table.gif                         (%chrome/common/help/images/table.gif)
   locale/@AB_CD@/communicator/help/images/taskbar.png                       (%chrome/common/help/images/taskbar.png)
   locale/@AB_CD@/communicator/help/images/taskbar-ab.png                    (%chrome/common/help/images/taskbar-ab.png)
   locale/@AB_CD@/communicator/help/images/task_mail.png                     (%chrome/common/help/images/task_mail.png)
   locale/@AB_CD@/communicator/help/images/task_newmail.png                  (%chrome/common/help/images/task_newmail.png)
   locale/@AB_CD@/communicator/help/images/threadbutton.png                  (%chrome/common/help/images/threadbutton.png)
   locale/@AB_CD@/communicator/help/images/web-links.png                     (%chrome/common/help/images/web-links.png)