Change language to refer to Classic Menu and Compact Menu

Update the references to Classic Menu and Compact Menu so mate-user-guide is consistent with the change in https://github.com/mate-desktop/mate-panel/pull/1025

4 files changed, 23 insertions, 23 deletions

diff --git a/mate-user-guide/C/gosdconfkeys.xml b/mate-user-guide/C/gosdconfkeys.xml
index fc982d7..9d612db 100644
--- a/mate-user-guide/C/gosdconfkeys.xml
+++ b/mate-user-guide/C/gosdconfkeys.xml
@@ -980,7 +980,7 @@ $ gsettings get org.mate.interface file-chooser-backend</screen>
       <varlistentry>
         <term>menubar-accel</term>
         <listitem>
-          <para>(s) Keyboard shortcut to open the menu bars.</para>
+          <para>(s) Keyboard shortcut to open the menus.</para>
           <para its:translate="no">
             <screen>$ dconf read /org/mate/desktop/interface/menubar-accel
 $ gsettings get org.mate.interface menubar-accel</screen>
diff --git a/mate-user-guide/C/goseditmainmenu.xml b/mate-user-guide/C/goseditmainmenu.xml
index 3cb887d..5ea3e6f 100644
--- a/mate-user-guide/C/goseditmainmenu.xml
+++ b/mate-user-guide/C/goseditmainmenu.xml
@@ -23,17 +23,17 @@
   </indexterm>
   <indexterm>
     <primary>menus</primary>
-    <secondary>Menu Bar</secondary>
-    <see>Menu Bar</see>
+    <secondary>Classic Menu</secondary>
+    <see>Classic Menu</see>
   </indexterm>
   <indexterm>
-    <primary>Menu Bar</primary>
+    <primary>Classic Menu</primary>
     <secondary>introduction</secondary>
   </indexterm>  
 
-  <para>The panel menubar is your main point of access to MATE. Use the <guimenu>Applications</guimenu> menu to launch applications, the <guimenu>Places</guimenu> to open locations on your computer or network, and the <guimenu>System</guimenu> to customize your system, get help with MATE, and log out of MATE or shut down your computer.</para>
+  <para>The classic menu is your main point of access to MATE. Use the <guimenu>Applications</guimenu> menu to launch applications, the <guimenu>Places</guimenu> to open locations on your computer or network, and the <guimenu>System</guimenu> to customize your system, get help with MATE, and log out of MATE or shut down your computer.</para>
   <para>The following sections describe these three menus.</para>
-  <tip><para>By default, the panel menubar is on the <xref linkend="top-panel"/>. But like any other panel object, you can move the menubar to another panel, or have more than one instance of the menubar in your panels. For more on this, see <xref linkend="panel-menus"/>.</para></tip>
+  <tip><para>By default, the classic menu is on the <xref linkend="top-panel"/>. But like any other panel object, you can move the classic menu to another panel, or have more than one instance of the classic menu in your panels. For more on this, see <xref linkend="panel-menus"/>.</para></tip>
 
   <section xml:id="applications-menu"><info><title>Applications Menu</title></info>
     <!-- preserve id for backwards compatibility: 2.12 -->
diff --git a/mate-user-guide/C/gosoverview.xml b/mate-user-guide/C/gosoverview.xml
index a26ac3d..0585e8d 100644
--- a/mate-user-guide/C/gosoverview.xml
+++ b/mate-user-guide/C/gosoverview.xml
@@ -54,7 +54,7 @@
     </varlistentry>  
     <varlistentry>
       <term>Panels</term>
-      <listitem><para>The <firstterm>panels</firstterm> are the two bars that run along the top and bottom of the screen. By default, the top panel shows you the MATE main menu bar, the date and time, and a set of application launcher icons, and the bottom panel shows you the list of open windows and the workspace switcher.</para>
+      <listitem><para>The <firstterm>panels</firstterm> are the two bars that run along the top and bottom of the screen. By default, the top panel shows you the MATE Classic Menu, the date and time, and a set of application launcher icons, and the bottom panel shows you the list of open windows and the workspace switcher.</para>
       <para>Panels can be customized to contain a variety of tools, such as other menus and launchers, and small utility applications, called
       <firstterm>panel applets</firstterm>. For example, you can configure
       your panel to display the current weather for your location.  For more
diff --git a/mate-user-guide/C/gospanel.xml b/mate-user-guide/C/gospanel.xml
index e983e60..e80a908 100644
--- a/mate-user-guide/C/gospanel.xml
+++ b/mate-user-guide/C/gospanel.xml
@@ -49,8 +49,8 @@ these panels.</para>
            
       <variablelist>
       	<varlistentry>
-      		<term><application>Menu Bar</application> applet</term>
-      		<listitem><para>The Menu Bar contains the <guimenu>Applications</guimenu>, <guimenu>Places</guimenu>, and <guimenu>System</guimenu> menus. For more on the menu bar, see <xref linkend="menubar"/>.</para></listitem>
+      		<term><application>Classic Menu</application> applet</term>
+      		<listitem><para>The Classic Menu contains the <guimenu>Applications</guimenu>, <guimenu>Places</guimenu>, and <guimenu>System</guimenu> menus. For more on the classic menu, see <xref linkend="menubar"/>.</para></listitem>
       	</varlistentry>
       	<varlistentry>
       	  <term>A set of application launcher icons</term>
@@ -1267,27 +1267,27 @@ See <xref linkend="panels-addobject"/> for more on this.</para>
     <para>You can add the following types of menu to your panels: </para>
     <itemizedlist>
       <listitem>
-        <para><guimenu>Menu Bar</guimenu>: You can access almost
+        <para><guimenu>Classic Menu</guimenu>: You can access almost
 all the standard applications, commands, and configuration options from
-the menus in the Menu Bar. It contains the <guimenu>Applications</guimenu>, 
+the menus in the Classic Menu. It contains the <guimenu>Applications</guimenu>, 
 <guimenu>Places</guimenu>, and <guimenu>System</guimenu> menus.</para>
-        <para>To add a <guimenu>Menu Bar</guimenu> to a panel, right-click
+        <para>To add a <guimenu>Classic Menu</guimenu> to a panel, right-click
 on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then 
-choose <application>Menu Bar</application> from the Add to Panel dialog. 
+choose <application>Classic Menu</application> from the Add to Panel dialog. 
 See <xref linkend="panels-addobject"/> for more on this.</para>
       </listitem>
       <listitem>
-        <para><guimenu>Main Menu</guimenu>: The Main Menu contains the same 
-        items as the Menu Bar, but organizes them into one menu instead of three. 
+        <para><guimenu>Compact Menu</guimenu>: The Compact Menu contains the same 
+        items as the Classic Menu, but organizes them into one menu instead of three. 
         It takes up less space on the panels as a result.</para>
-        <para>To add a <guimenu>Main Menu</guimenu> to a panel, right-click
+        <para>To add a <guimenu>Compact Menu</guimenu> to a panel, right-click
 on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then 
-choose <application>Main Menu</application> from the Add to Panel dialog. 
+choose <application>Compact Menu</application> from the Add to Panel dialog. 
 See <xref linkend="panels-addobject"/> for more on this.</para>
       </listitem>
       <listitem>
-        <para><guimenu>Submenus</guimenu>: You can add a submenu of the Menu Bar 
-        or Main Menu directly to the panel. For example, you can add the <guimenu>Games</guimenu> 
+        <para><guimenu>Submenus</guimenu>: You can add a submenu of the Classic Menu
+        or Compact Menu directly to the panel. For example, you can add the <guimenu>Games</guimenu> 
         submenu of the <guimenu>Applications</guimenu> menu to the panel.</para>
         <para>To add a submenu to a panel, open the submenu, right-click on a launcher, then choose 
 <menuchoice><guimenu>Entire menu</guimenu><guimenuitem>Add this as menu to panel</guimenuitem></menuchoice>. </para>
@@ -1547,22 +1547,22 @@ applet. The graphic above illustrates the CD icon in the <application>Notificati
 Area</application> applet. </para>
     </section>
      
-    <section xml:id="goseditmainmenu-65"><info><title>Menu Bar</title></info>
+    <section xml:id="goseditmainmenu-65"><info><title>Classic Menu</title></info>
       <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/menu_bar_applet.png" format="PNG"/>
           </imageobject>
           <textobject>
-            <phrase>Menu Bar applet. Menus: Applications, Places, System.</phrase>
+            <phrase>Classic Menu applet. Menus: Applications, Places, System.</phrase>
           </textobject>
         </mediaobject>
       </screenshot>
-      <para>The <application>Menu Bar</application> contains the 
+      <para>The <application>Classic Menu</application> contains the 
       <guimenu>Applications</guimenu>, <guimenu>Places</guimenu>, and 
       <guimenu>System</guimenu> menus. You can access
   almost all 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>Classic Menu</application>. For more on using the Classic Menu, see <xref linkend="menubar"/>.</para>
     </section>
 
 <!-- This has been pasted from the Window List manual so that the Window List applet help is integrated into the GUG. -->