summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoachim Noreiko <joachimn@src.gnome.org>2006-02-24 09:48:41 +0000
committerJoachim Noreiko <joachimn@src.gnome.org>2006-02-24 09:48:41 +0000
commitdda2e36b67ab910179f41db43069b7794e71317a (patch)
tree3d1eb13450bc36ec25d42dfccbbcb4148496c407
parentaa0de2f18b0aaec8e00316e25eb8ed3905073ffe (diff)
downloadgnome-user-docs-dda2e36b67ab910179f41db43069b7794e71317a.tar.gz
gnome-user-docs-dda2e36b67ab910179f41db43069b7794e71317a.tar.xz
gnome-user-docs-dda2e36b67ab910179f41db43069b7794e71317a.zip
updated first part for 2.14. removed a number of sections moved some
* goseditmainmenu.xml: updated first part for 2.14. removed a number of sections moved some sections to gospanel.xml * gospanel.xml: moved in Run Application Dialog section from goseditmainmenu.xml and updated it moved in Main Menu section from goseditmainmenu.xml moved in Menu Bar section from goseditmainmenu.xml * gosstartsession.xml: changed section ids newly linked to from goseditmainmenu.xml to use meaningful names instead of numbers
-rw-r--r--gnome2-user-guide/C/ChangeLog20
-rw-r--r--gnome2-user-guide/C/goseditmainmenu.xml567
-rw-r--r--gnome2-user-guide/C/gospanel.xml107
-rw-r--r--gnome2-user-guide/C/gosstartsession.xml8
4 files changed, 219 insertions, 483 deletions
diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 9a2d220..2a128b8 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,11 +1,25 @@
+2006-02-24 Joachim Noreiko <jnoreiko@yahoo.com>
+
+ * goseditmainmenu.xml:
+ updated first part for 2.14.
+ removed a number of sections
+ moved some sections to gospanel.xml
+ * gospanel.xml:
+ moved in Run Application Dialog section from goseditmainmenu.xml and updated it
+ moved in Main Menu section from goseditmainmenu.xml
+ moved in Menu Bar section from goseditmainmenu.xml
+ * gosstartsession.xml:
+ changed section ids newly linked to from goseditmainmenu.xml
+ to use meaningful names instead of numbers
+
2006-02-22 Joachim Noreiko <jnoreiko@yahoo.com>
* gospanel.xml:
updated first two sections for 2.14
- * goseditmainmenu.xml,
- * gosoverview.xml,
+ * goseditmainmenu.xml:
+ * gosoverview.xml:
* gosnautilus.xml:
- changed section ids newly linked to from gospanel.xml
+ changed section ids newly linked to from gospanel.xml
to use meaningful names instead of numbers
2006-02-21 Joachim Noreiko <jnoreiko@yahoo.com>
diff --git a/gnome2-user-guide/C/goseditmainmenu.xml b/gnome2-user-guide/C/goseditmainmenu.xml
index 523e739..08c2d2a 100644
--- a/gnome2-user-guide/C/goseditmainmenu.xml
+++ b/gnome2-user-guide/C/goseditmainmenu.xml
@@ -1,236 +1,35 @@
-<chapter id="goseditmainmenu-1">
- <title>Working With Menus</title>
+<chapter id="menubar">
+ <title>The Menubar</title>
+
+ <!-- preserve id for backwards compatibility: 2.12 -->
+ <anchor id="goseditmainmenu-1"/><!-- Working With Menus -->
+ <anchor id="goseditmainmenu-5"/><!-- Menu Features -->
+ <anchor id="goseditmainmenu-11"/><!-- Menu Item Popup Menu -->
+ <anchor id="goseditmainmenu-51"/><!-- Actions Menu -->
+ <anchor id="menus-introduction"/><!-- Introduction to Menus -->
+
<highlights>
- <para>This chapter describes how to use menus in the GNOME Desktop.</para>
+ <para>This chapter describes how to use the GNOME Desktop Menubar.</para>
</highlights>
- <sect1 id="menus-introduction">
- <title>Introduction to Menus</title>
- <!-- preserve id for backwards compatibility: 2.12 -->
- <anchor id="goseditmainmenu-2"/>
- <indexterm>
- <primary>menus</primary>
- <secondary>introduction</secondary>
- </indexterm>
- <para>You can access all GNOME Desktop functions through menus. The panels
-contains menus, so you can use a combination of menus and panels to perform
-your tasks. You can perform various actions on your menus, such as copy menu
-items to panels.</para>
- <para>You can access the following menus in the GNOME Desktop:</para>
- <itemizedlist>
- <listitem>
- <para><guimenu>Main Menu</guimenu>: You can access the items in
-the <guimenu>Applications</guimenu> menu from the <guimenu>Main Menu</guimenu>.
-You can have many <guimenu>Main Menu</guimenu> buttons in your panels. You
-can also access the items in the <guimenu>Actions</guimenu> menu from the <guimenu>Main Menu</guimenu>. The items in the <guimenu>Actions</guimenu> menu are
-at the top level of the <guimenu>Main Menu</guimenu>.</para>
- </listitem>
- <listitem>
- <para><application>Menu Bar</application>: You can access the items
-in the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus
-from <application>Menu Bar</application>. You can have many <application>Menu Bar</application> applets in your panels. </para>
- </listitem>
- <listitem>
- <para><guimenu>Applications</guimenu> menu: You can access many
-of your applications, commands, and configuration options from the <guimenu>Applications</guimenu> menu. You can also access the
-GNOME Desktop preference tools from the <guimenu>Applications</guimenu> menu.</para>
- </listitem>
- <listitem>
- <para><guimenu>Actions</guimenu> menu: You can access commands that
-enable you to perform various tasks from the <guimenu>Actions</guimenu> menu.
-For example, you can start the <application>Search Tool</application> application,
-or log out of the GNOME Desktop. </para>
- </listitem>
- </itemizedlist>
- <para>You can also right-click on the desktop to open the <guimenu>Desktop</guimenu> menu. The <guimenu>Desktop</guimenu> menu enables you to perform
-desktop-related tasks. </para>
- <para>All of these menus provide you with multiple ways to perform your tasks,
-and enable you to work in the way that you prefer.</para>
- </sect1>
- <sect1 id="goseditmainmenu-5">
- <title>Menu Features</title>
- <indexterm>
- <primary>menus</primary>
- <secondary>features</secondary>
- </indexterm>
- <para>Menus can contain the following items: </para>
- <itemizedlist>
- <listitem>
- <para>Submenus</para>
- </listitem>
- <listitem>
- <para>Launchers or menu items</para>
- </listitem>
- </itemizedlist>
- <para>An arrow to the right of an item in a menu indicates that the item is
-a submenu. When you point to the submenu, the submenu opens. You can choose
-items from the submenu.</para>
- <para>When you choose a launcher, the launcher starts an application or runs
-a command. You can also right-click on a launcher to open a popup menu. The
-popup menu enables you to add the item to a panel, and perform other tasks.
-For more information on the popup menu, see the next section.</para>
- <para>You can change the theme for your session to change how all your menus
-look. To change the theme, use the <application>Theme</application> preference
-tool.</para>
- <sect2 id="goseditmainmenu-11">
- <title>Menu Item Popup Menu</title>
- <indexterm>
- <primary>menus</primary>
- <secondary>menu item popup menu</secondary>
- </indexterm>
- <indexterm>
- <primary>menu item popup menu</primary>
- <secondary>description</secondary>
- </indexterm>
- <para>Items in menus have an associated
-popup menu that enables you to perform tasks related to the item. When you
-right-click on an item in a menu, the popup menu for the item opens. The popup
-menu also contains a submenu that allows you to perform menu-related tasks. </para>
- <para>You can use the menu item popup menu to perform the following tasks: </para>
- <itemizedlist>
- <listitem>
- <para>Add menu items as launchers to panels. </para>
- </listitem>
- <listitem>
- <para>Remove items from menus.</para>
- </listitem>
- <listitem>
- <para>Open the <guilabel>Run Application</guilabel> dialog with
-the menu item command in the dialog.</para>
- </listitem>
- <listitem>
- <para>Add menus to panels. You can add a menu as a menu object or
-as a drawer object. </para>
- </listitem>
- <listitem>
- <para>Add new items to menus.</para>
- </listitem>
- <listitem>
- <para>Change the properties of submenus and menu items.</para>
- </listitem>
- </itemizedlist>
- <para><xref linkend="goseditmainmenu-TBL-30"/> describes menu item popup menus. <indexterm><primary>launchers</primary><secondary>adding to panel</secondary></indexterm><indexterm><primary>menus</primary><secondary>adding to panel</secondary></indexterm></para>
- <table frame="topbot" id="goseditmainmenu-TBL-30">
- <title>Menu Item Popup Menus</title>
- <tgroup cols="2" colsep="0" rowsep="0">
- <colspec colname="colspec0" colwidth="42.71*"/>
- <colspec colname="colspec1" colwidth="57.29*"/>
- <thead>
- <row rowsep="1">
- <entry>
- <para>Item</para>
- </entry>
- <entry>
- <para>Description</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry valign="top">
- <para>
- <guimenuitem>Add this launcher to panel</guimenuitem>
- </para>
- </entry>
- <entry valign="top">
- <para>Adds the launcher to the panel from which you open
-the menu.</para>
- </entry>
- </row>
- <row>
- <entry colname="colspec0">
- <para>
- <guimenuitem>Remove this item</guimenuitem>
- </para>
- </entry>
- <entry colname="colspec1">
- <para>Removes the launcher from the menu.</para>
- </entry>
- </row>
- <row>
- <entry valign="top">
- <para>
- <guimenuitem>Put into run dialog</guimenuitem>
- </para>
- </entry>
- <entry valign="top">
- <para>Displays the <guilabel>Run Application</guilabel>
-dialog with the command from the <guilabel>Command</guilabel> field of the
-launcher in the command field on the <guilabel>Run Application</guilabel>
-dialog. </para>
- </entry>
- </row>
- <row>
- <entry colname="colspec0">
- <para>
- <guimenuitem>Properties</guimenuitem>
- </para>
- </entry>
- <entry colname="colspec1">
- <para>Displays a dialog that enables you to edit
-the properties of the launcher.</para>
- </entry>
- </row>
- <row>
- <entry colname="colspec0" valign="top">
- <para>
- <menuchoice>
- <guimenu>Entire
-menu</guimenu>
- <guimenuitem>Add this as drawer to panel</guimenuitem>
- </menuchoice>
- </para>
- </entry>
- <entry colname="colspec1" valign="top">
- <para>Adds the submenu as a drawer to the panel from which you open the menu.</para>
- </entry>
- </row>
- <row>
- <entry colname="colspec0" valign="top">
- <para>
- <menuchoice>
- <guimenu>Entire
-menu</guimenu>
- <guimenuitem>Add this as menu to panel</guimenuitem>
- </menuchoice>
- </para>
- </entry>
- <entry colname="colspec1" valign="top">
- <para>Adds the submenu as a menu object to the panel from which you open the menu.</para>
- </entry>
- </row>
- <row>
- <entry colname="colspec0">
- <para>
- <menuchoice>
- <guimenu>Entire menu</guimenu>
- <guimenuitem>Add new item to this menu</guimenuitem>
- </menuchoice>
- </para>
- </entry>
- <entry colname="colspec1">
- <para>Enables you to add an item to the submenu.</para>
- </entry>
- </row>
- <row>
- <entry colname="colspec0">
- <para>
- <menuchoice>
- <guimenu>Entire menu</guimenu>
- <guimenuitem>Properties</guimenuitem>
- </menuchoice>
- </para>
- </entry>
- <entry colname="colspec1">
- <para>Displays a dialog that enables you to edit
-the properties of the submenu.</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </sect2>
- </sect1>
- <sect1 id="menus-applications-menu">
+ <indexterm>
+ <primary>menus</primary>
+ <secondary>introduction</secondary>
+ </indexterm>
+ <indexterm>
+ <primary>menus</primary>
+ <secondary>Menu Bar</secondary>
+ <see>Menu Bar</see>
+ </indexterm>
+ <indexterm>
+ <primary>Menu Bar</primary>
+ <secondary>introduction</secondary>
+ </indexterm>
+
+ <para>The menubar at the top of the GNOME Desktop, in the <link linkend="top-panel">Top Edge Panel</link>, is your main point of access to GNOME. Use the <guimenu>Applications</guimenu> menu to launch applications, the <guimenu>Places</guimenu> to open locations on your computer or network, and the <guimenu>Desktop</guimenu> to customize your system, get help with GNOME, and log out of GNOME or shut down your computer.</para>
+ <para>The following sections describe these three menus.</para>
+ <tip><para>The menubar is in fact a 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>
+
+ <section id="applications-menu">
<title>Applications Menu</title>
<!-- preserve id for backwards compatibility: 2.12 -->
<anchor id="goseditmainmenu-8"/>
@@ -238,241 +37,59 @@ the properties of the submenu.</para>
<primary>menus</primary>
<secondary>Applications menu</secondary>
</indexterm>
- <para>The <guimenu>Applications</guimenu> menu contains a hierarchy
-of submenus, from which you can start the standard GNOME applications and
-preference tools. The <guimenu>Applications</guimenu>
-menu contains the <guimenu>Desktop Preferences</guimenu> menu. You can use
-the <guimenu>Desktop Preferences</guimenu> menu to start the GNOME Desktop
-preference tools. The <guimenu>Applications</guimenu> menu also includes the
-file manager and the help browser.</para>
- <para>The <guimenu>Applications</guimenu> menu resides in the following places: </para>
- <itemizedlist>
- <listitem>
- <para>
- <guimenu>Main Menu</guimenu>
- </para>
- </listitem>
- <listitem>
- <para>
- <application>Menu Bar</application>
- </para>
- </listitem>
- <listitem>
- <para><guilabel>Start Here</guilabel> location in the file manager</para>
- </listitem>
- </itemizedlist>
- </sect1>
- <sect1 id="goseditmainmenu-51">
- <title>Actions Menu</title>
+ <para>The <guimenu>Applications</guimenu> menu contains a hierarchy of submenus, from which you can start the applications that are installed on your system.</para>
+ <para>Each submenu correponds to a category. For example, in the <guimenu>Sound &amp; Video</guimenu> submenu, you will find applications for playing CDs and recording sound.</para>
+ <para>To launch an application, perform the following steps:</para>
+ <orderedlist>
+ <listitem><para>Click the <guimenu>Applications</guimenu> menu.</para></listitem>
+ <listitem><para>Move the mouse down the menu to the category the application you want is in. Each submenu opens as your mouse passes over the category.</para></listitem>
+ <listitem><para>Click the menu item for the application.</para></listitem>
+ </orderedlist>
+ <para>When you install a new application, it is automatically added to the <guimenu>Applications</guimenu> menu in a suitable category. For example, if you install an instant messenger application, a VoIP application, or an FTP client, you will find it in the <guimenu>Internet</guimenu> submenu.</para>
+ </section>
+ <section id="places-menu">
+ <title>Places Menu</title>
<indexterm>
- <primary>menus</primary>
- <secondary>Actions menu</secondary>
+ <primary>Places menu</primary>
</indexterm>
- <para>The <guimenu>Actions</guimenu> menu contains commands that enable you
-to perform various tasks in the GNOME Desktop. <xref linkend="goseditmainmenu-TBL-52"/> describes the commands in the <guimenu>Actions</guimenu> menu. </para>
- <table frame="topbot" id="goseditmainmenu-TBL-52">
- <title>Actions Menu Commands</title>
- <tgroup cols="2" colsep="0" rowsep="0">
- <colspec colname="colspec0" colwidth="38.48*"/>
- <colspec colname="colspec1" colwidth="61.52*"/>
- <thead>
- <row rowsep="1">
- <entry>
- <para>Menu Item</para>
- </entry>
- <entry>
- <para>Function</para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry valign="top">
- <para>
- <guimenuitem>Run Application</guimenuitem>
- </para>
- </entry>
- <entry valign="top">
- <para>Opens the <guilabel>Run Application</guilabel> dialog.
-Use the <guilabel>Run Application</guilabel> dialog to run commands. For more
-information, see <xref linkend="gospanel-23"/>.</para>
- </entry>
- </row>
- <row>
- <entry valign="top">
- <para>
- <guimenuitem>Search for Files</guimenuitem>
- </para>
- </entry>
- <entry valign="top">
- <para>Starts the <application>Search Tool</application>
-application. For more information, see the <citetitle>Search Tool</citetitle>
-manual.</para>
- </entry>
- </row>
- <row>
- <entry colname="colspec0">
- <para>
- <guimenuitem> Recent Documents</guimenuitem>
- </para>
- </entry>
- <entry colname="colspec1">
- <para>Displays a submenu of the last ten files which
-you saved.</para>
- </entry>
- </row>
- <row>
- <entry valign="top">
- <para>
- <guimenuitem>Take Screenshot</guimenuitem>
- </para>
- </entry>
- <entry valign="top">
- <para>Takes a screenshot of the screen, and opens the <guilabel>Save Screenshot</guilabel> dialog. Use the <guilabel>Save Screenshot</guilabel>
-dialog to save the screenshot.</para>
- </entry>
- </row>
- <row>
- <entry colname="colspec0">
- <para>
- <guimenuitem>Lock Screen</guimenuitem>
- </para>
- </entry>
- <entry colname="colspec1">
- <para>Lock Screen locks your screen.</para>
- </entry>
- </row>
- <row>
- <entry valign="top">
- <para>
- <guimenuitem>Log Out</guimenuitem>
- <emphasis>username</emphasis>
- </para>
- </entry>
- <entry valign="top">
- <para>Logs you out of
-the current session. </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <para>The <guimenu>Actions</guimenu> menu resides in the following
-places: </para>
+ <para>The <guimenu>Places</guimenu> menu is a quick way to go to various locations on your computer and your local network. The <guimenu>Places</guimenu> menu allows you to open the following items:</para>
<itemizedlist>
- <listitem>
- <para><guimenu>Main Menu</guimenu>. The items in the <guimenu>Actions</guimenu> menu are at the top level of the <guimenu>Main Menu</guimenu>.</para>
- </listitem>
- <listitem>
- <para><application>Menu Bar</application>. </para>
- </listitem>
+ <listitem><para>Your Home folder<remark>Add link!</remark></para></listitem>
+ <listitem><para>The Desktop folder, which corresponds to the items displays in the desktop.</para></listitem>
+ <listitem><para>The items in your Nautilus bookmarks. For more on this, see <xref linkend="gosnautilus-36"/>.</para></listitem>
+ <listitem><para>Your computer, which shows all your drives.</para></listitem>
+ <listitem><para>The Nautilus CD/DVD Creator. For more on this, see <xref linkend="gosnautilus-475"/>.</para></listitem>
+ <listitem><para>The local network. For more on this, see <xref linkend="gosnautilus-465"/>.</para></listitem>
</itemizedlist>
- <sect2 id="gospanel-23">
- <title>Using the Run Application Dialog</title>
- <indexterm>
- <primary>Run Application dialog, using</primary>
- </indexterm>
- <para>The <guilabel>Run Application</guilabel> dialog gives you access to the command
-line. When you run a command in the <guilabel>Run Application</guilabel> dialog,
-you cannot receive output from the command.</para>
- <para>To run a command from the command line perform the following steps:</para>
- <orderedlist>
- <listitem>
- <para>Display the <guilabel>Run Application</guilabel> dialog. You
-can display the <guilabel>Run Application</guilabel> dialog in any of the
-following ways:<itemizedlist><listitem><para>From any panel</para><para>Add the <guibutton>Run</guibutton> button to a panel. Right-click on
-the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Run</guimenuitem></menuchoice>.
-Click on the <guibutton>Run</guibutton> button.</para></listitem><listitem><para>From the <guimenu>Main Menu</guimenu></para><para>Open the <guimenu>Main Menu</guimenu>, then choose <guimenuitem>Run
-Application</guimenuitem>.</para></listitem><listitem><para>From the <application>Menu Bar</application></para><para>Choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>Run
-Application</guimenuitem></menuchoice>.</para></listitem><listitem><para>Use shortcut keys</para><para>The default shortcut keys to display the <guilabel>Run Application</guilabel> dialog are <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>. You can change
-the shortcut keys that display the <guilabel>Run Application</guilabel> dialog
-in the <application>Keyboard Shortcuts</application> preference tool.</para></listitem><listitem><para>From a menu item popup menu</para><para>Right-click on an item in a menu, then choose <guilabel>Put into run
-dialog</guilabel> from the popup menu. The <guilabel>Run Application</guilabel>
-dialog opens with the command from the menu in the command field.</para></listitem></itemizedlist></para>
- <para>The <guilabel>Run Application</guilabel> dialog is displayed.</para>
- </listitem>
- <listitem>
- <para>Enter the command that you want to run in the blank field. </para>
- <para>Alternatively, to choose a command that you ran previously, click the
-down arrow button beside the command field, then choose the command to run.</para>
- <para>Alternatively, select the <guilabel>Show list of known applications</guilabel> option to display a list of available applications.</para>
- <para>You can also use the <guibutton>Run with file</guibutton> button to
-choose a file to append to the command line. For example, you can enter <application>emacs</application> as the command, then choose a file to edit.</para>
- <para>Select the <guilabel>Run in terminal</guilabel> option to run the application
-or command in a terminal window. Choose this option for an application or
-command that does not create a window in which to run.</para>
- </listitem>
- <listitem>
- <para>Click on the <guibutton>Run</guibutton> button on the <guilabel>Run Application</guilabel> dialog. </para>
- </listitem>
- </orderedlist>
- </sect2>
- </sect1>
- <sect1 id="goseditmainmenu-7">
- <title>Main Menu</title>
- <indexterm>
- <primary>menus</primary>
- <secondary>Main Menu</secondary>
- <see>Main
-Menu</see>
- </indexterm>
- <indexterm>
- <primary>Main Menu</primary>
- <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,
-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>
- <sect2 id="goseditmainmenu-29">
- <title>To Add a Main Menu to a Panel</title>
- <indexterm>
- <primary>Main Menu</primary>
- <secondary>adding to panel</secondary>
- </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>
- </sect2>
- </sect1>
- <sect1 id="goseditmainmenu-65">
- <title>Menu Bar</title>
- <indexterm>
- <primary>menus</primary>
- <secondary>Menu Bar</secondary>
- <see>Menu
-Bar</see>
- </indexterm>
+
+ <para>The last three items on the menu perform actions rather than open locations.</para>
+
+ <itemizedlist>
+ <listitem><para><guimenuitem>Connect to Server</guimenuitem> lets you choose a server on your network. For more on this, see <xref linkend="gosnautilus-37"/>.</para></listitem>
+ <listitem><para><guimenuitem>Search for Files</guimenuitem> lets you search for files on your computer. For more on this, see the <ulink type="help" url="ghelp:gnome-search-tool">Search for Files Manual</ulink>.</para></listitem>
+ <listitem><para>The <guimenuitem>Recent Documents</guimenuitem> submenu lists the documents you have recently opened. The last entry in the submenu clears the list.</para></listitem>
+ </itemizedlist>
+ </section>
+ <section id="desktop-menu">
+ <title>Desktop Menu</title>
<indexterm>
- <primary>Menu Bar</primary>
- <secondary>introduction</secondary>
+ <primary>Desktop Menu</primary>
</indexterm>
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="figures/menu_bar_applet.png" format="PNG"/>
- </imageobject>
- <textobject>
- <phrase>Menu Bar applet. Menus: Applications, Actions.</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
- <para>The <application>Menu Bar</application> provides access to the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus. You can access
-almost all of the standard applications, commands, and configuration options
-from the <application>Menu Bar</application>. </para>
- <sect2 id="goseditmainmenu-66">
- <title>To Add a Menu Bar to a Panel</title>
- <indexterm>
- <primary>Menu Bar</primary>
- <secondary>adding to panel</secondary>
- </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>
- </sect2>
- </sect1>
- <sect1 id="goseditmainmenu-54">
+ <para>The <guimenu>Desktop</guimenu> menu allows you to set your preferences for the GNOME Desktop, get help with using GNOME, and log out or shut down.</para>
+ <itemizedlist>
+ <listitem><para>The <guimenuitem>Administration</guimenuitem> submenu contains tools to manage your computer. These all require your system's password.</para></listitem>
+ <listitem><para>The <guimenuitem>Preferences</guimenuitem> submenu contains all the <firstterm>preference tools</firstterm>. With these you can configure your GNOME Desktop. For more on preference tools, see <xref linkend="prefs"/>.</para></listitem>
+ <listitem><para>The <guimenuitem>Help</guimenuitem> item launches the Help Browser.</para></listitem>
+ <listitem><para>The <guimenuitem>About GNOME</guimenuitem> item has a brief introduction to GNOME, links to the GNOME website, and credits.</para></listitem>
+ <listitem><para>The <guimenuitem>Lock Screen</guimenuitem> command starts your screensaver, and requires your password to return to the desktop. For more on this, see <xref linkend="lock-screen"/>.</para></listitem>
+ <listitem><para>Choose <guimenuitem>Log Out</guimenuitem> to log out of GNOME, or to switch user.</para></listitem>
+ <listitem><para>Choose <guimenuitem>Shut Down</guimenuitem> to end your GNOME session and turn off your computer, or restart it.</para></listitem>
+ </itemizedlist>
+
+ <para>For more on logging out and shutting down, see <xref linkend="shutdown"/>.</para>
+
+ </section>
+ <section id="goseditmainmenu-54">
<title>Customizing Your Menus</title>
<indexterm>
<primary>menus</primary>
@@ -544,7 +161,7 @@ in the file manager, access one of the following URIs in the file manager:</para
</informaltable>
<para>For more information on the file manager, see <citetitle>Nautilus File
Manager</citetitle>.</para>
- <sect2 id="goseditmainmenu-61">
+ <section id="goseditmainmenu-61">
<title>To Add a Menu</title>
<indexterm>
<primary>menus</primary>
@@ -566,8 +183,8 @@ is added to the menu. The name of the folder is selected.</para>
</orderedlist>
<para>The next time that you log out then log in again, the menu is in the
assigned location.</para>
- </sect2>
- <sect2 id="goseditmainmenu-55">
+ </section>
+ <section id="goseditmainmenu-55">
<title>To Add a Launcher to a Menu</title>
<indexterm>
<primary>menus</primary>
@@ -590,8 +207,8 @@ Launcher</guilabel> dialog. For more information on the elements in the <guilabe
<para>Click <guibutton>OK</guibutton>.</para>
</listitem>
</orderedlist>
- </sect2>
- <sect2 id="goseditmainmenu-63">
+ </section>
+ <section id="goseditmainmenu-63">
<title>To Add a Launcher to an Empty Menu</title>
<para>To add a launcher to an empty menu, perform the following steps:</para>
<orderedlist>
@@ -611,8 +228,8 @@ Launcher</guilabel> dialog. For more information on the elements in the <guilabe
<para>Click <guibutton>OK</guibutton>.</para>
</listitem>
</orderedlist>
- </sect2>
- <sect2 id="goseditmainmenu-56">
+ </section>
+ <section id="goseditmainmenu-56">
<title>To Copy a Launcher to a Menu</title>
<indexterm>
<primary>menus</primary>
@@ -640,8 +257,8 @@ want to copy the launcher.</para>
<para>Alternatively, you can drag the launcher from one location to another.</para>
<para>The next time that you log out then log in again, the launcher is in
the new menu location.</para>
- </sect2>
- <sect2 id="goseditmainmenu-62">
+ </section>
+ <section id="goseditmainmenu-62">
<title>To Edit the Properties of a Menu</title>
<indexterm>
<primary>menus</primary>
@@ -664,8 +281,8 @@ Properties</guilabel> dialog. For more information on the elements in the <guila
<para>Click <guibutton>OK</guibutton>.</para>
</listitem>
</orderedlist>
- </sect2>
- <sect2 id="goseditmainmenu-57">
+ </section>
+ <section id="goseditmainmenu-57">
<title>To Edit a Menu Item</title>
<indexterm>
<primary>menus</primary>
@@ -687,8 +304,8 @@ Properties</guilabel> dialog. For more information on the elements in the <guila
<para>Click <guibutton>OK</guibutton>.</para>
</listitem>
</orderedlist>
- </sect2>
- <sect2 id="goseditmainmenu-58">
+ </section>
+ <section id="goseditmainmenu-58">
<title>To Delete an Item from a Menu</title>
<indexterm>
<primary>menus</primary>
@@ -704,6 +321,6 @@ To delete an item from a menu, perform the following steps:</para>
<para>Choose <guimenuitem>Remove this item</guimenuitem>. </para>
</listitem>
</orderedlist>
- </sect2>
- </sect1>
+ </section>
+ </section>
</chapter>
diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index dd7546d..7b22b9e 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="menus-introduction"/>.</para></listitem>
+ <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>
</varlistentry>
<varlistentry>
<term><application>Web Browser Launcher</application></term>
@@ -1604,12 +1604,12 @@ Area</application> applet. </para>
right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Utility</guisubmenu><guimenuitem>Notification Area</guimenuitem></menuchoice>.</para>
</section>
</section>
- <section id="gospanel-37">
+ <section id="panel-menus">
<title>Menus</title>
<!-- Desktop Overview / Menus -->
<anchor id="gosoverview-42"/>
-
+ <anchor id="gospanel-37"/>
<indexterm>
<primary>menus</primary>
<secondary>adding to panel</secondary>
@@ -1846,6 +1846,7 @@ to set the color or image as the background of the drawer. For more information,
</section>
</section>
<section id="panel-default">
+ <!-- a temporary home for things that should one day be in a greater list of panel objects -->
<title>Default Panel Objects</title>
<para>This section covers the panel objects that appear in the default GNOME desktop.</para>
@@ -1881,5 +1882,105 @@ applet. The following figure shows an example of the <application>Window Selecto
all workspaces. The windows in all workspaces other than the current workspace,
are listed under a separator line.</para>
</section>
+
+ <section id="panel-runapplication">
+ <title>Run Application Dialog</title>
+ <!-- preserve id for backwards compatibility: 2.12 -->
+ <anchor id="gospanel-23"/>
+ <indexterm>
+ <primary>Run Application dialog, using</primary>
+ </indexterm>
+ <para>The <guilabel>Run Application</guilabel> dialog gives you access to the command
+line. When you run a command in the <guilabel>Run Application</guilabel> dialog,
+you cannot receive output from the command.</para>
+ <para>To run a command from the command line perform the following steps:</para>
+ <orderedlist>
+ <listitem>
+ <para>Display the <guilabel>Run Application</guilabel> dialog. You
+can display the <guilabel>Run Application</guilabel> dialog in any of the
+following ways:
+ <variablelist>
+ <varlistentry><term>From a panel</term>
+ <listitem><para>You can add the <application>Run Application</application> object to any panel. See <xref linkend="panels-addobject"/>. Click on the <guibutton>Run</guibutton> button to open the <guilabel>Run Application</guilabel> dialog.</para></listitem></varlistentry>
+ <varlistentry><term>Using shortcut keys</term>
+ <listitem><para>Press <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>. You can change the shortcut keys that display the <guilabel>Run Application</guilabel> dialog
+in the <link linkend="prefs-keyboard-shortcuts"><application>Keyboard Shortcuts</application> preference tool</link>.</para></listitem></varlistentry>
+ </variablelist>
+ </para>
+ <para>The <guilabel>Run Application</guilabel> dialog is displayed.</para>
+ </listitem>
+ <listitem>
+ <para>Enter the command that you want to run in the blank field. </para>
+ <para>Alternatively, to choose a command that you ran previously, click the
+down arrow button beside the command field, then choose the command to run.</para>
+ <para>Alternatively, select the <guilabel>Show list of known applications</guilabel> option to display a list of available applications.</para>
+ <para>You can also use the <guibutton>Run with file</guibutton> button to
+choose a file to append to the command line. For example, you can enter <application>emacs</application> as the command, then choose a file to edit.</para>
+ <para>Select the <guilabel>Run in terminal</guilabel> option to run the application
+or command in a terminal window. Choose this option for an application or
+command that does not create a window in which to run.</para>
+ </listitem>
+ <listitem>
+ <para>Click on the <guibutton>Run</guibutton> button on the <guilabel>Run Application</guilabel> dialog. </para>
+ </listitem>
+ </orderedlist>
+ </section>
+
+
+ <section id="goseditmainmenu-7">
+ <title>Main Menu panel object</title>
+ <indexterm>
+ <primary>menus</primary>
+ <secondary>Main Menu</secondary>
+ <see>Main
+ Menu</see>
+ </indexterm>
+ <indexterm>
+ <primary>Main Menu</primary>
+ <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,
+ 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>
+ <section id="goseditmainmenu-29">
+ <title>To Add a Main Menu to a Panel</title>
+ <indexterm>
+ <primary>Main Menu</primary>
+ <secondary>adding to panel</secondary>
+ </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>
+ </section>
+ </section>
+ <section id="goseditmainmenu-65">
+ <title>Menu Bar panel object</title>
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/menu_bar_applet.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Menu Bar applet. Menus: Applications, Actions.</phrase>
+ </textobject>
+ </mediaobject>
+ </screenshot>
+ <para>The <application>Menu Bar</application> provides access to the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus. You can access
+ almost all of the standard applications, commands, and configuration options
+ from the <application>Menu Bar</application>. </para>
+ <section id="goseditmainmenu-66">
+ <title>To Add a Menu Bar to a Panel</title>
+ <indexterm>
+ <primary>Menu Bar</primary>
+ <secondary>adding to panel</secondary>
+ </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>
+ </section>
+ </section>
+
</section>
</chapter>
diff --git a/gnome2-user-guide/C/gosstartsession.xml b/gnome2-user-guide/C/gosstartsession.xml
index b16899c..c7e3eb4 100644
--- a/gnome2-user-guide/C/gosstartsession.xml
+++ b/gnome2-user-guide/C/gosstartsession.xml
@@ -116,8 +116,10 @@ for the session. To choose a keyboard layout, use the <ulink type="help" url="gh
</note>
</sect2>
</sect1>
- <sect1 id="gosstartsession-1">
+ <sect1 id="lock-screen">
<title>Locking Your Screen</title>
+ <!-- preserve id for backwards compatibility: 2.12 -->
+ <anchor id="gosstartsession-1"/>
<screenshot>
<mediaobject>
<imageobject>
@@ -273,8 +275,10 @@ current settings. To save your settings, select the option, then continue
to log out.</para>
</sect2>
</sect1>
- <sect1 id="gosgetstarted-73">
+ <sect1 id="shutdown">
<title>Ending a Session</title>
+ <!-- preserve id for backwards compatibility: 2.12 -->
+ <anchor id="gosgetstarted-73"/>
<indexterm>
<primary>sessions</primary>
<secondary>ending</secondary>