Bug 243101 Content about Sidebar in customize_help.xhtml needs to be updated

images by giacomo.magnini@portalis.it
p=stefan_h@hem.utfors.se r=me

suite/locales/en-US/chrome/common/help/customize_help.xhtml

@@ -49,14 +49,15 @@
 <div class="contentsBox">In this section:
 <ul>
   <li><a href="#what_is_sidebar">What is Sidebar?</a></li>
-  <li><a href="#using_sidebar">Using Sidebar</a></li>
+  <li><a href="#opening_closing_and_resizing_sidebar">Opening, Closing and
+    Resizing Sidebar</a></li>
+  <li><a href="#viewing_sidebar_tabs">Viewing Sidebar Tabs</a></li>
   <li><a href="#adding_sidebar_tabs">Adding Sidebar Tabs</a></li>
   <li><a href="#customizing_individual_sidebar_tabs">Customizing Individual
     Sidebar Tabs</a></li>
   <li><a href="#reorganizing_sidebar_tabs">Reorganizing Sidebar Tabs</a></li>
   <li><a href="#removing_sidebar_tabs">Removing Sidebar Tabs</a></li>
-  <li><a href="#opening_closing_and_resizing_sidebar">Opening, Closing, and
+
-    Resizing Sidebar</a></li>
 </ul>
 </div>
 
@@ -64,48 +65,66 @@
 
 <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 or Buddy List, stock quotes, a calendar&mdash;and many other
+  address book, stock quotes, a calendar&mdash;and many other available
-  available options. Sidebar presents these items to you in tabs that are
+  options. Sidebar presents these items to you in tabs that are continually
-  continually updated.</p>
+  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="using_sidebar">Using Sidebar</h3>
+<h3 id="opening_closing_and_resizing_sidebar">Opening, Closing and Resizing
+  Sidebar</h3>
 
-<p>Unless you have <a href="#opening_closing_and_resizing_sidebar">closed</a>
+<p>To open Sidebar, <span class="noMac">press <kbd>F9</kbd> or</span> open the
-  Sidebar, it is always open at the left side of your browser. To view a
+  View menu in Navigator, choose Show/Hide, and then Sidebar from the
-  tab:</p>
+  submenu.</p>
 
-<ul>
+<p>Once Sidebar is opened, you can use its handle to close, open and resize
-  <li>Click a tab&apos;s title; for instance, click the word
+  Sidebar&apos;s frame. Move the mouse pointer up and down along the left edge
-    <q>Search</q>. The Search tab opens, which allows you to search for
+  of the &brandShortName; window. The pointer changes to a hand when it touches
-    web pages.</li>
+  the <q>handle</q> for Sidebar, as shown in the picture.</p>
-</ul>
 
-<table>
+<table summary="Image table">
   <tr>
-    <td style="width: 140px;"> <img src="images/sidebarclosed_small.png"
+    <td colspan="2"></td>
-      alt="Sidebar with handle"/></td>
+  </tr>
-    <td style="vertical-align:
+  <tr style="vertical-align: top;">
-      middle;"><strong>Sidebar<br/>Handle</strong></td>
+    <td><img src="images/sidebar.png" alt="image of sidebar with
+      handle"/></td>
+    <td style="vertical-align: middle;">
+
+      <p><strong>Sidebar<br/>Handle</strong></p>
+
+    </td>
   </tr>
 </table>
 
-<p>If you don&apos;t see Sidebar, it may be closed. To open it:</p>
+<ul>
+  <li>Click the handle to close/open Sidebar&apos;s frame</li>
+  <li>Click and drag the handle to resize Sidebar&apos;s frame</li>
+</ul>
 
-<ol>
+<p>To close Sidebar with its handle, do one of the following:</p>
-  <li>Move the mouse pointer up and down along the left-hand border of the
+
-    &brandShortName; window. The pointer changes to a hand when it touches the
+<ul>
-    <q>handle</q> of Sidebar.</li>
+  <li class="noMac">Press <kbd>F9</kbd></li>
-  <li>Click the handle to open Sidebar.
+  <li>Click the X in the upper-right corner of Sidebar</li>
-  <p><strong>Note</strong>: If Sidebar is not selected from the View menu
+  <li>Open the View menu, choose Show/Hide, and then Sidebar from the
-    in Navigator (within the Show/Hide submenu), you will not see the frame
+    submenu</li>
-    or its handle.</p>
+</ul>
-  </li>
+
-</ol>
+<p>[<a href="#sidebar">Return to beginning of section</a>]</p>
+
+<h3 id="viewing_sidebar_tabs">Viewing Sidebar Tabs</h3>
+
+<p>To view a tab:</p>
+
+<ul>
+  <li>Click a tab&apos;s title; for instance, click the word <q>Search</q>. The
+    Search tab opens, which allows you to search for web pages.</li>
+</ul>
 
 <p><strong>Tip</strong>: To reload a Sidebar tab, right-click on the tab title
   and choose Reload from the pop-up menu.</p>
@@ -186,7 +205,7 @@
 <h3 id="reorganizing_sidebar_tabs">Reorganizing Sidebar Tabs</h3>
 
 <ol>
-  <li>Click "Tabs" at the top of Sidebar and select Customize Sidebar from
+  <li>Click <q>Tabs</q> at the top of Sidebar and select Customize Sidebar from
     the menu.</li>
   <li>Select a tab from the list on the right.</li>
   <li>Click Up and Down to change the tab&apos;s placement.</li>
@@ -200,8 +219,8 @@
 <h3 id="removing_sidebar_tabs">Removing Sidebar Tabs</h3>
 
 <ol>
-  <li>Click "Tabs" at the top of Sidebar and select Customize Sidebar from the
+  <li>Click <q>Tabs</q> at the top of Sidebar and select Customize Sidebar from
-    menu.</li>
+    the menu.</li>
   <li>Select a tab from the list on the right.</li>
   <li>Click Remove.</li>
   <li>Continue removing as many tabs as you like.</li>
@@ -210,56 +229,6 @@
 
 <p>[<a href="#sidebar">Return to beginning of section</a>]</p>
 
-<h3 id="opening_closing_and_resizing_sidebar">Opening, Closing, and Resizing
-  Sidebar</h3>
-
-<p>Use Sidebar&apos;s handles to open, close, and resize Sidebar&apos;s
-  frame:</p>
-
-<table summary="Image table">
-  <tr>
-    <td colspan="2"></td>
-  </tr>
-  <tr style="vertical-align: top;">
-    <td><img src="images/sidebarclosed_small.png" alt="image of sidebar with
-      handle"/></td>
-    <td style="vertical-align: middle;">
-
-      <p><strong>Sidebar<br/>Handle</strong></p>
-
-    </td>
-  </tr>
-</table>
-
-<p>If Sidebar is closed, you can still see its handle. If the 
-  handle is missing, open the View menu , choose Show/Hide, and then
-  Sidebar. Move the mouse pointer up and down along the left edge of the
-  &brandShortName; window. The pointer changes to a hand when it touches the
-  <q>handle</q> for Sidebar, as shown in the picture.</p>
-
-<ul>
-  <li>Click the <q>Open Sidebar</q> icon
-    <img src="chrome://navigator/skin/sbar-open.gif"
-    alt="open sidebar icon"/> on the left side of the Personal
-    Toolbar.</li>
-  <li>Click the handle to open and close Sidebar.</li>
-  <li>Click and drag the handle to resize Sidebar.</li>
-</ul>
-
-<p>To remove Sidebar, including the handle, do one of the following:</p>
-
-<ul>
-  <li>Click the <q>Close Sidebar</q> icon
-    <img src="chrome://navigator/skin/sbar-close.gif"
-    alt="close sidebar icon"/>on the left side of the Personal
-    Toolbar.</li>
-  <li>Click the X in the upper-right corner of Sidebar.</li>
-  <li>Open the View menu, choose Show/Hide, and uncheck Sidebar.</li>
-  <li>Press <kbd>F9</kbd>.</li>
-</ul>
-
-<p>[<a href="#sidebar">Return to beginning of section</a>]</p>
-
 <h2 id="tabbed_browsing">Tabbed Browsing</h2>
 
 <div class="contentsBox">In this section:
@@ -454,7 +423,7 @@
     in this category, double-click Appearance to expand the list.)</li>
   <li>From the "Fonts for" drop-down list, choose a language group/script.
     For instance, to set default fonts for West European languages/script
-    (Latin), choose "Western."</li>
+    (Latin), choose <q>Western</q>.</li>
   <li>Select whether proportional text should be serif (like Times Roman) or
     sans-serif (like Arial). Then specify the font size you want for
     proportional text.</li>

suite/locales/en-US/chrome/common/help/help-index1.rdf

@@ -1948,8 +1948,8 @@
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="search:Advanced_mode"
-         nc:name="Advanced Search mode"
+         nc:name="Sidebar Advanced Search Mode"
-	 nc:link="nav_help.xhtml#search:advanced_search_mode"/>
+	 nc:link="nav_help.xhtml#sidebar_advanced_search_mode"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="search:bookmarks"
@@ -2051,6 +2051,11 @@
          nc:name="what is Sidebar?"
 	 nc:link="customize_help.xhtml#what_is_sidebar"/>
      </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="Sidebar:opening_closing_resizing"
+         nc:name="opening, closing, and resizing sidebar"
+	 nc:link="customize_help.xhtml#opening_closing_and_resizing_sidebar"/>
+     </rdf:li>
      <rdf:li>
        <rdf:Description ID="Sidebar:removing_tabs"
          nc:name="removing sidebar tabs"
@@ -2072,9 +2077,9 @@
 	 nc:link="nav_help.xhtml#searching_from_sidebar"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="Sidebar:using"
+       <rdf:Description ID="Sidebar:viewing_tabs"
-         nc:name="using Sidebar"
+         nc:name="viewing sidebar tabs"
-	 nc:link="customize_help.xhtml#using_sidebar"/>
+	 nc:link="customize_help.xhtml#viewing_sidebar_tabs"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>

suite/locales/en-US/chrome/common/help/nav_help.xhtml

@@ -336,9 +336,9 @@ search, and save web pages.</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 or Buddy List, stock quotes, a calendar&mdash;and many other
+  address book, stock quotes, a calendar&mdash;and many other available
-  available options. Sidebar presents these items to you in tabs that it
+  options. Sidebar presents these items to you in tabs that it continually
-  continually updates.</p>
+  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,
@@ -348,7 +348,7 @@ search, and save web pages.</p>
 
 <table summary="table for images">
   <tr>
-    <td><img src="images/sidebarclosed_small.png"
+    <td><img src="images/sidebar.png"
       alt="Sidebar Handle"/></td>
     <td style="vertical-align:
       middle; padding-right: 20px;"><strong>Sidebar<br/>Handle</strong></td>
@@ -358,8 +358,8 @@ search, and save web pages.</p>
   </tr>
 </table>
 
-<p><strong>Tip</strong>: To quickly open or close the Sidebar, press
+<p class="noMac"><strong>Tip</strong>: To quickly open or close the Sidebar,
-  <kbd>F9</kbd>.</p>
+  press <kbd>F9</kbd>.</p>
 
 <p>[<a href="#navigating_web_pages">Return to beginning of section</a>]</p>
 
@@ -368,7 +368,8 @@ search, and save web pages.</p>
 <div class="contentsBox">In this section:
 <ul>
   <li><a href="#fast_searches">Fast Searches</a></li>
-  <li><a href="#advanced_search_mode">Advanced Search Mode</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="#using_internet_keywords">Using Internet Keywords</a></li>
   <li><a href="#searching_within_a_page">Searching Within a Page</a></li>
@@ -406,9 +407,9 @@ search, and save web pages.</p>
 	search engine may be different.)<p>
         The default search engine you choose in
         <a href="cs_nav_prefs_navigator.xhtml#smart_browsing">Preferences</a>
-	is used. Search results for <q>baby doll</q> appear in both the
+        is used. Search results for <q>baby doll</q> appear in both the browser
-	browser window and in Sidebar. Click the links to visit web pages about
+        window and in Sidebar. Click the links to visit web pages about baby
-	baby dolls.</p></li>
+        dolls.</p></li>
     </ul>
   </li>
 </ol>
@@ -427,9 +428,10 @@ search, and save web pages.</p>
 
 <ol>
   <li>If it is not already open, open Sidebar by clicking its handle. If the
-    handle is missing, open the View menu in Navigator, choose Show/Hide, and
+    handle is missing, <span class="noMac">press <kbd>F9</kbd> or</span>open
-    then Sidebar from the submenu.</li>
+    the View menu in Navigator, choose Show/Hide, and then Sidebar from the
-  <li>Click the Search tab.</li>
+    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>Type <q>toy car</q> in the search field.</li>
@@ -439,14 +441,18 @@ search, and save web pages.</p>
 </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 Advanced mode and
+  engines from which to choose, then it is set to search in
-  you will have to choose one or more search engines before clicking Search.
+  <a href ="#sidebar_advanced_search_mode">Advanced mode</a> and you will have
-  You can keep it that way or change to a basic setting in Preferences.</p>
+  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>
 
@@ -469,7 +475,7 @@ search, and save web pages.</p>
 
 <ol>
   <li>Select (highlight) any words in a web page.</li>
-  <li>Right-click<span class="mac">or, if you have a one-button mouse,
+  <li>Right-click<span class="mac"> or, if you have a one-button mouse,
     <kbd>Ctrl</kbd>-click</span> and choose <q>Search Web for
     [your selected words]</q> for the menu.</li>
 </ol>
@@ -482,7 +488,7 @@ search, and save web pages.</p>
 
 <p>[<a href="#searching_the_web">Return to beginning of section</a>]</p>
 
-<h2 id="advanced_search_mode">Advanced Search Mode</h2>
+<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>
@@ -495,8 +501,9 @@ search, and save web pages.</p>
     are visible, double-click Navigator 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, open the View menu in Navigator, choose Show/Hide, and
+    handle is missing, <span class="noMac">press <kbd>F9</kbd> or</span>open
-    then Sidebar from the submenu.</li>
+    the View menu in Navigator, 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
@@ -505,7 +512,7 @@ search, and save web pages.</p>
   <li>Click Search.</li>
 </ol>
 
-<p><img src="images/searchmusic.png" alt="Sidebar Search"/></p>
+<p><img src="images/sidebar-advanced.png" alt="Sidebar Search"/></p>
 
 <h3 id="customizing_search_categories">Customizing Search Categories</h3>
 
@@ -516,7 +523,8 @@ search, and save web pages.</p>
 
 <ol>
   <li>Set Sidebar Search to Advanced Search Mode. See
-    <a href="#advanced_search_mode">Advanced Search mode</a> for details.</li>
+    <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 Navigator, choose Show/Hide, and
     then Sidebar from the submenu.</li>

suite/locales/en-US/chrome/common/help/suite-toc.rdf

@@ -78,7 +78,7 @@
     <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="Advanced Search Mode" nc:link="nav_help.xhtml#advanced_search_mode"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="nav-doc-smartsearch" nc:name="Advanced Sidebar Search Mode" nc:link="nav_help.xhtml#advanced_sidebar_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-keywords" nc:name="Using Internet Keywords" nc:link="nav_help.xhtml#using_internet_keywords"/> </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>
@@ -667,12 +667,12 @@
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="cust-sidebar-define" nc:name="What is Sidebar?"  nc:link="customize_help.xhtml#what_is_sidebar"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="cust-sidebar-using" nc:name="Using Sidebar"  nc:link="customize_help.xhtml#using_sidebar"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="cust-sidebar-openclose" nc:name="Opening, Closing, and Resizing Sidebar"  nc:link="customize_help.xhtml#opening_closing_and_resizing_sidebar"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="cust-sidebar-using" nc:name="Viewing Sidebar Tabs"  nc:link="customize_help.xhtml#viewing_sidebar_tabs"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-sidebar-adding" nc:name="Adding Sidebar Tabs"  nc:link="customize_help.xhtml#adding_sidebar_tabs"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-sidebar-indiv" nc:name="Customizing Individual Sidebar Tabs"  nc:link="customize_help.xhtml#customizing_individual_sidebar_tabs"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-sidebar-reorg" nc:name="Reorganizing Sidebar Tabs"  nc:link="customize_help.xhtml#reorganizing_sidebar_tabs"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-sidebar-removing" nc:name="Removing Sidebar Tabs"  nc:link="customize_help.xhtml#removing_sidebar_tabs"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="cust-sidebar-openclose" nc:name="Opening, Closing, and Resizing"  nc:link="customize_help.xhtml#opening_closing_and_resizing_sidebar"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>