2.0.1 updates.

1 files changed, 128 insertions, 102 deletions

diff --git a/gnome2-user-guide/C/goseditmainmenu.xml b/gnome2-user-guide/C/goseditmainmenu.xml
index a8cc63b..654d95c 100644
--- a/gnome2-user-guide/C/goseditmainmenu.xml
+++ b/gnome2-user-guide/C/goseditmainmenu.xml
@@ -9,10 +9,10 @@
 <sect1 id="goseditmainmenu-2">
 <title>Introduction to Menus</title>
 <indexterm><primary>menus</primary><secondary>introduction</secondary></indexterm>
-<para>You can access all desktop functions through menus. The default panels
-contain 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 all desktop functions through menus. The Menu Panel 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 from the desktop:</para>
 <itemizedlist>
 <listitem><para><guimenu>Applications</guimenu> menu: You can access many
@@ -20,7 +20,7 @@ of the applications, commands, and configuration options on your desktop from
 the <guimenu>Applications</guimenu> menu.</para></listitem>
 <listitem><para><guimenu>Actions</guimenu> menu: You can access various desktop
 commands from the <guimenu>Actions</guimenu> menu. For example, you can start
-the <application>Search Tool</application> application, or log out from the
+the <application>Search Tool</application> application, or log out of the
 desktop. </para></listitem>
 <listitem><para><guimenu>GNOME Menu</guimenu>: You can also access the items
 in the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus
@@ -29,9 +29,7 @@ from the <guimenu>GNOME Menu</guimenu>. You can have many <guimenu>GNOME Menu
 </itemizedlist>
 <para>You can also right-click on the desktop background to open the <guimenu>
 Desktop Background</guimenu> menu. The <guimenu>Desktop Background</guimenu>
-menu enables you to perform desktop background-related tasks. For information
-on the <guimenu>Desktop Background</guimenu> menu, see <xref linkend="gosdeskback-1"/>.
-</para>
+menu enables you to perform desktop background-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>
@@ -41,7 +39,7 @@ and enable you to work in the way that you prefer.</para>
 <para>Menus can contain the following items: </para>
 <itemizedlist>
 <listitem><para>Submenus</para></listitem>
-<listitem><para>Launchers</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
@@ -67,18 +65,11 @@ menu also contains a submenu that allows you to perform menu-related tasks.
 </para>
 <itemizedlist>
 <listitem><para>Add launchers to panels. </para></listitem>
-<listitem><para>Remove launchers from menus. </para></listitem>
 <listitem><para>Open the <guilabel>Run Program</guilabel> dialog with the
 launcher 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 launchers.</para></listitem>
 </itemizedlist>
-<para>Some items in the popup menu might not be available to you. Your user
-privileges determine which items are available. For example, if you do not
-have system administrator privileges, you can not modify the properties of
-the <guimenu>Applications</guimenu> menu. </para>
 <para><xref linkend="goseditmainmenu-FIG-39"/> shows the popup menu.</para>
 <indexterm><primary>launcher popup menu</primary><secondary>illustration</secondary>
 </indexterm>
@@ -111,9 +102,6 @@ Description</para></entry></row>
 <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 valign="top"><para><guimenuitem>Remove this item</guimenuitem></para></entry>
-<entry valign="top"><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 Program</guilabel> dialog
 with  the command from the <guilabel>Command</guilabel> field of the launcher
@@ -121,10 +109,7 @@ in  the command field on the <guilabel>Run Program</guilabel> dialog. </para></e
 </row>
 <row><entry colname="COLSPEC0"><para><guimenuitem>Help on <replaceable>application_name
 </replaceable></guimenuitem></para></entry><entry colname="COLSPEC1"><para>
-Open the online help for the application.</para></entry></row>
-<row><entry valign="top"><para><guimenuitem>Properties</guimenuitem></para></entry>
-<entry valign="top"><para>Displays a dialog that enables you to edit the properties
-of the launcher.</para></entry></row>
+Opens the online help for the application.</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>
@@ -135,14 +120,6 @@ 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" valign="top"><para><menuchoice><guimenu>Entire
-menu</guimenu><guimenuitem>Add new item to this menu</guimenuitem>
-</menuchoice></para></entry><entry colname="COLSPEC1" valign="top"><para>
-Enables you to add an item to the submenu.</para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><menuchoice><guimenu>Entire
-menu</guimenu><guimenuitem>Properties</guimenuitem></menuchoice></para></entry>
-<entry colname="COLSPEC1" valign="top"><para>Displays a dialog that enables
-you to edit the properties of the submenu.</para></entry></row>
 </tbody>
 </tgroup>
 </table>
@@ -151,11 +128,11 @@ you to edit the properties of the submenu.</para></entry></row>
 </sect1>
 <sect1 id="goseditmainmenu-8">
 <title>Applications Menu</title>
-<indexterm><primary>menus</primary><secondary>Applications</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 also includes the file manager and
-the help browser.</para>
+<indexterm><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 also includes the
+file manager and the help browser.</para>
 <para>The <guimenu>Applications</guimenu> menu resides in the following places: 
 </para>
 <itemizedlist>
@@ -167,7 +144,7 @@ Nautilus</application></para></listitem>
 </sect1>
 <sect1 id="goseditmainmenu-51">
 <title>Actions Menu</title>
-<indexterm><primary>menus</primary><secondary>Actions</secondary></indexterm>
+<indexterm><primary>menus</primary><secondary>Actions menu</secondary></indexterm>
 <para>The <guimenu>Actions</guimenu> menu contains various desktop commands. <xref
 linkend="goseditmainmenu-TBL-52"/> describes the commands in the <guimenu>
 Actions</guimenu> menu.</para>
@@ -188,16 +165,15 @@ information, see <xref linkend="gospanel-23"/>.</para></entry></row>
 <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 valign="top"><para><guimenuitem>Take a Screen Shot</guimenuitem></para></entry>
-<entry valign="top"><para>Opens the <guilabel>Screenshot</guilabel> dialog.
-Use the <guilabel>Screenshot</guilabel> to take screenshots of your desktop.
-</para></entry></row>
+<row><entry valign="top"><para><guimenuitem>Screenshot</guimenuitem></para></entry>
+<entry valign="top"><para>Takes a screenshot of your desktop,
+and opens the <guilabel>Screenshot</guilabel> dialog. Use the <guilabel>Screenshot
+</guilabel> dialog to save the screenshot.</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Lock Display</guimenuitem></para></entry>
-<entry valign="top"><para>Locks your screen. For more information, see <xref
-linkend="gosstartsession-1"/>.</para></entry></row>
+<entry valign="top"><para>Locks your screen. </para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Log Out</guimenuitem></para></entry>
-<entry valign="top"><para>Logs you out of the current session. For more information,
-see <xref linkend="gosgetstarted-73"/>.</para></entry></row>
+<entry valign="top"><para>Logs you out of the current session. </para></entry>
+</row>
 </tbody>
 </tgroup>
 </table>
@@ -211,10 +187,10 @@ Actions</guimenu> menu are at the top level of the <guimenu>GNOME Menu</guimenu>
 </itemizedlist>
 <sect2 id="gospanel-23">
 <title>Using the Run Program Dialog</title>
-<indexterm><primary>Run Program dialog, using</primary></indexterm>
-<para>The <guilabel>Run Program</guilabel> dialog gives you access to the
-command line. When you run a command in the <guilabel>Run Program</guilabel>
-dialog, you cannot receive output from the command.</para>
+<indexterm><primary>Run Program dialog, using</primary></indexterm><para>
+The <guilabel>Run Program</guilabel> dialog gives you access to the command
+line. When you run a command in the <guilabel>Run Program</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>
@@ -227,11 +203,11 @@ Program</guimenuitem></menuchoice>.</para></listitem>
 <listitem><para>From the <guimenu>GNOME Menu</guimenu></para>
 <para>Open the <guimenu>GNOME Menu</guimenu>, then choose <guimenuitem>Run
 Program</guimenuitem>.</para></listitem>
-<listitem><para>Use a shortcut key</para>
-<para>The default shortcut key to display the <guilabel>Run Program</guilabel>
+<listitem><para>Use shortcut keys</para>
+<para>The default shortcut keys to display the <guilabel>Run Program</guilabel>
 dialog is <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>. You can change the shortcut
-key that displays the <guilabel>Run Program</guilabel> dialog in the <application>
-Desktop Preferences</application>. To change the shortcut key, choose <menuchoice>
+keys that display the <guilabel>Run Program</guilabel> dialog in the <application>
+Desktop Preferences</application>. To change the shortcut keys, choose <menuchoice>
 <guimenu>Applications</guimenu><guisubmenu>Desktop Preferences
 </guisubmenu><guimenuitem>Keyboard Shortcuts</guimenuitem></menuchoice>.</para>
 </listitem>
@@ -240,39 +216,12 @@ Desktop Preferences</application>. To change the shortcut key, choose <menuchoic
 run dialog</guilabel> from the popup menu. The <guilabel>Run Program</guilabel>
 dialog opens with the command from the menu in the command field.</para></listitem>
 </itemizedlist></para>
-<para>The <guilabel>Run Program</guilabel> dialog is displayed as follows:
-</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/runprogram_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Run Program dialog. Contains applications drop-down combination box, Run in terminal check box. Contains Append File, Help, Close, Run buttons. Contains Known Applications button.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
-<listitem><para>Choose the command that you want to run from the applications
-drop-down combination box.</para>
+<para>The <guilabel>Run Program</guilabel> dialog is displayed.</para></listitem>
+<listitem><para>Enter the command that you want to run in the blank field.
+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, click on the <guibutton>Known Applications</guibutton>
-button to display a list of available applications, as shown in the following
-figure:</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/runprogram2_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Run Program dialog, with advanced options. Contains applications drop-down combination box, Run in terminal check box. Contains Append File, Help, Close, Run buttons. Contains expanded Known Applications list.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para>Enter the command that you want to run in the blank field. Alternatively,
-to choose  a command that you ran previously, click the down arrow button,
-then choose the command to run.</para>
+button to display a list of available applications.</para>
 <para>You can also use the <guibutton>Append 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>
@@ -283,6 +232,84 @@ command that does not create a window in which to run.</para></listitem>
 Run Program</guilabel> dialog. </para></listitem>
 </orderedlist>
 </sect2>
+<sect2 id="goseditmainmenu-53">
+<title>Taking Screenshots</title>
+<indexterm><primary>screenshots, taking</primary></indexterm><para>You can
+take a screenshot in any of the following ways:</para>
+<itemizedlist>
+<listitem><para>Use the <guimenu>Actions</guimenu> menu</para>
+<para>To take a screenshot of the entire screen, choose <menuchoice><guimenu>
+Actions</guimenu><guimenuitem>Screenshot</guimenuitem></menuchoice>.
+A <guilabel>Screenshot</guilabel> dialog is displayed. To save the screenshot,
+select the <guilabel>Save screenshot to file</guilabel> option. Enter the
+path and filename for the screenshot in the drop-down combination box. Alternatively,
+to save the screenshot to another directory, click <guibutton>Browse</guibutton>.
+When you select a directory, click <guibutton>OK</guibutton>. </para>
+<para>You can also save the screenshot to the desktop background. To save
+the screenshot to the desktop background, select the <guilabel>Save screenshot
+to desktop</guilabel> option. </para></listitem>
+<listitem><para>Use shortcut keys</para>
+<para>To take a screenshot, use the following shortcut keys:</para>
+<informaltable frame="topbot">
+<tgroup cols="2" colsep="0" rowsep="0">
+
+<colspec colname="COLSPEC0" colwidth="35.67*"/><colspec colname="COLSPEC1"
+colwidth="64.33*"/>
+<thead>
+<row rowsep="1"><entry valign="top"><para>Default Shortcut Keys</para></entry>
+<entry valign="top"><para>Function</para></entry></row>
+</thead>
+<tbody>
+<row><entry colname="COLSPEC0"><para><keycap>Print Screen</keycap></para></entry>
+<entry colname="COLSPEC1"><para>Takes a screenshot of the entire screen, and
+displays the <guilabel>Screenshot</guilabel> dialog. Use the <guilabel>Screenshot
+</guilabel> dialog to save the screenshot.</para></entry></row>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Alt</keycap><keycap>Print
+Screen</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Takes a screenshot
+of the window that has focus, and displays the <guilabel>Screenshot</guilabel>
+dialog. Use the <guilabel>Screenshot</guilabel> dialog to save the screenshot.
+</para></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+<para>You can use the <application>Keyboard Shortcuts</application> preference
+tool to modify the default shortcut keys.</para></listitem>
+<listitem><para>Use a command</para>
+<para>You can use the <command>gnome-panel-screenshot</command> command to
+take a screenshot. The <command>gnome-panel-screenshot</command> command takes
+a screenshot of the entire screen, and displays the <guilabel>Screenshot</guilabel>
+dialog. Use the <guilabel>Screenshot</guilabel> dialog to save the screenshot.
+</para>
+<para>You can also use options on the <command>gnome-panel-screenshot</command>
+command as follows: </para>
+<informaltable frame="topbot">
+<tgroup cols="2" colsep="0" rowsep="0">
+
+<colspec colname="COLSPEC0" colwidth="35.67*"/><colspec colname="COLSPEC1"
+colwidth="64.33*"/>
+<thead>
+<row rowsep="1"><entry valign="top"><para>Option</para></entry><entry valign="top"><para>
+Function</para></entry></row>
+</thead>
+<tbody>
+<row><entry colname="COLSPEC0"><para><command>--window</command></para></entry>
+<entry colname="COLSPEC1"><para>Takes a screenshot of the window that has
+focus, and displays the <guilabel>Screenshot</guilabel> dialog. Use the <guilabel>
+Screenshot</guilabel> dialog to save the screenshot.</para></entry></row>
+<row><entry colname="COLSPEC0"><para><command>--delay=<replaceable>seconds
+</replaceable></command></para></entry><entry colname="COLSPEC1"><para>Takes
+a screenshot after the specified number of seconds, and displays the <guilabel>
+Screenshot</guilabel> dialog. Use the <guilabel>Screenshot</guilabel> dialog
+to save the screenshot.</para></entry></row>
+<row><entry colname="COLSPEC0"><para><command>--help</command></para></entry>
+<entry colname="COLSPEC1"><para>Displays the options for the command.</para></entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+</listitem>
+</itemizedlist>
+</sect2>
 </sect1>
 <sect1 id="goseditmainmenu-7">
 <title>GNOME Menu</title>
@@ -307,14 +334,12 @@ configuration options on your desktop from the <guimenu>GNOME Menu</guimenu>.
 and special menu items: </para>
 <itemizedlist>
 <listitem><para><guimenu>Applications</guimenu>: Contains all applications
-and preference tools. This menu also includes the file manager and help browser.
-</para></listitem>
+and preference tools. This menu also includes the file manager and the help
+browser.</para></listitem>
 <listitem><para><guimenu>Actions</guimenu>: Contains desktop commands the <guimenuitem>
-Lock screen</guimenuitem> and <guimenuitem>Log out</guimenuitem> menu items.
-By default, the items in the <guimenu>Desktop</guimenu> menu are at the top
-level of the <guimenu>GNOME Menu</guimenu>. </para></listitem>
-<listitem><para><guimenuitem>Run</guimenuitem> launcher: Displays the <guilabel>
-Run Program</guilabel> dialog. </para></listitem>
+Lock Display</guimenuitem> and <guimenuitem>Log Out</guimenuitem> menu items.
+The items in the <guimenu>Actions</guimenu> menu are at the top level of the <guimenu>
+GNOME Menu</guimenu>. </para></listitem>
 </itemizedlist>
 <para>You can add <guimenu>GNOME Menu</guimenu> buttons to your panels. By
 default, the <guimenu>GNOME Menu</guimenu> is represented on panels by a stylized
@@ -337,14 +362,15 @@ footprint icon, as follows:</para>
 <itemizedlist>
 <listitem><para>From a panel with a <guimenu>GNOME Menu</guimenu></para>
 <para>Click on the <guimenu>GNOME Menu</guimenu>. </para></listitem>
-<listitem><para>Use a shortcut key</para>
-<para>You can use a shortcut key to open the <guimenu>GNOME Menu</guimenu>.
-When you use a shortcut key to open the <guimenu>GNOME Menu</guimenu>, the <guimenu>
+<listitem><para>Use shortcut keys</para>
+<para>You can use shortcut keys to open the <guimenu>GNOME Menu</guimenu>.
+When you use shortcut keys to open the <guimenu>GNOME Menu</guimenu>, the <guimenu>
 GNOME Menu</guimenu> appears at the mouse pointer. </para>
-<para>The default shortcut key to open the <guimenu>GNOME Menu</guimenu> is <keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo>. To change the shortcut key that opens
-the <guimenu>GNOME Menu</guimenu>, choose <menuchoice><guimenu>Applications
-</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guimenuitem>
-Keyboard Shortcuts</guimenuitem></menuchoice>.</para></listitem>
+<para>The default shortcut keys to open the <guimenu>GNOME Menu</guimenu>
+are <keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo>. To change the shortcut keys
+that open the <guimenu>GNOME Menu</guimenu>, choose <menuchoice><guimenu>
+Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu>
+<guimenuitem>Keyboard Shortcuts</guimenuitem></menuchoice>.</para></listitem>
 </itemizedlist>
 </sect2>
 <sect2 id="goseditmainmenu-29">
@@ -352,9 +378,9 @@ Keyboard Shortcuts</guimenuitem></menuchoice>.</para></listitem>
 <indexterm><primary>GNOME Menu</primary><secondary>adding to panel</secondary>
 </indexterm><para>You can add as many <guimenu>GNOME Menu</guimenu> buttons
 as you want to your panels. To add a <guimenu>GNOME Menu</guimenu> to a panel,
-right-click on any vacant space on the panel to open the panel popup menu.
-Choose <menuchoice><guimenu>Add to panel</guimenu><guimenuitem>GNOME
-Menu</guimenuitem></menuchoice>.</para>
+right-click on any vacant space on the panel. Choose <menuchoice><guimenu>
+Add to Panel</guimenu><guimenuitem>GNOME Menu</guimenuitem></menuchoice>.
+</para>
 </sect2>
 </sect1>
 </chapter>