cleaning up terminology for the panel menubar

1 files changed, 7 insertions, 7 deletions

diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index f5e3841..999dbce 100644
--- a/gnome2-user-guide/C/gospanel.xml
+++ b/gnome2-user-guide/C/gospanel.xml
@@ -76,7 +76,7 @@ these panels.</para>
       <variablelist>
       	<varlistentry>
       		<term><application>Menu Bar</application> applet</term>
-      		<listitem><para>Contains the <guimenu>Applications</guimenu>, the <guimenu>Places</guimenu>, and the <guimenu>Desktop</guimenu> menu. For more on the menu bar, see <xref linkend="menubar"/>.</para></listitem>
+      		<listitem><para>The panel menubar contains the <guimenu>Applications</guimenu>, the <guimenu>Places</guimenu>, and the <guimenu>Desktop</guimenu> menu. For more on the menu bar, see <xref linkend="menubar"/>.</para></listitem>
       	</varlistentry>
       	<varlistentry>
       	  <term><application>Web Browser Launcher</application></term>
@@ -743,7 +743,7 @@ control the volume of the speaker on your system.</para>
       <see>launchers</see>
     </indexterm>
     <para>A <firstterm>launcher</firstterm> is an object that performs a specific action when you open it.</para>
-    <para>You can find launchers in the panels, in the Main Menubar, and on the desktop. A launcher is represented by an icon in all of these locations.</para>
+    <para>You can find launchers in the panels, in the panel menubar, and on the desktop. A launcher is represented by an icon in all of these locations.</para>
     <para>You might use a launcher to do any of the following:</para>
     <itemizedlist>
       <listitem>
@@ -1770,7 +1770,7 @@ right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to
         <secondary>introduction</secondary>
       </indexterm>
       <para>The <guimenu>Main Menu</guimenu> provides access to
-  the <guimenu>Applications</guimenu> menu and many of the items in the <guimenu>Actions</guimenu> menu. You can access almost all of the standard applications,
+  the <guimenu>Applications</guimenu> menu and many of the items in the <guimenu>Desktop</guimenu> menu. You can access almost all of the standard applications,
   commands, and configuration options from the <guimenu>Main Menu</guimenu>. </para>
       <para>You can add <guimenu>Main Menu</guimenu> buttons to your panels. Click
   on the <guimenu>Main Menu</guimenu> button to open the <guimenu>Main Menu</guimenu>.</para>
@@ -1782,7 +1782,7 @@ right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to
         </indexterm>
         <para>You can add as many <guimenu>Main Menu</guimenu> buttons
   as you want to your panels. To add a <guimenu>Main Menu</guimenu> to a panel,
-  right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Main Menu</guimenuitem></menuchoice>.</para>
+  right-click on any vacant space on the panel. Choose <guimenuitem>Add to Panel</guimenuitem> and choose <guilabel>Main Menu</guilabel> from the <link linkend="panels-addobject"><guilabel>Add to Panel</guilabel></link> dialog.</para>
       </section>
     </section>
     <section id="goseditmainmenu-65">
@@ -1797,9 +1797,9 @@ right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to
           </textobject>
         </mediaobject>
       </screenshot>
-      <para>The <application>Menu Bar</application> provides access to the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus. You can access
+      <para>The <application>Menu Bar</application> provides access to the panel menubar, which contains the <guimenu>Applications</guimenu>, <guimenu>Places</guimenu>, and <guimenu>Desktop</guimenu> menus. You can access
   almost all of the standard applications, commands, and configuration options
-  from the <application>Menu Bar</application>. For more on using the Menu Bar, see <xref linkend="menubar"/>.</para>
+  from the <application>Menu Bar</application>. For more on using the panel menubar, see <xref linkend="menubar"/>.</para>
       <section id="goseditmainmenu-66">
         <title>To Add a Menu Bar to a Panel</title>
         <indexterm>
@@ -1808,7 +1808,7 @@ right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to
         </indexterm>
         <para>You can add as many <application>Menu Bar</application>
   applets as you want to your panels. To add a <application>Menu Bar</application>
-  to a panel, right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Menu Bar</guimenuitem></menuchoice>.</para>
+  to a panel, right-click on any vacant space on the panel. Choose <guimenuitem>Add to Panel</guimenuitem> and choose <guilabel>Menu Bar</guilabel> from the <link linkend="panels-addobject"><guilabel>Add to Panel</guilabel></link> dialog.</para>
       </section>
     </section>