2.0.1 updates.

1 files changed, 163 insertions, 262 deletions

diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index b10eda7..b50d37e 100644
--- a/gnome2-user-guide/C/gospanel.xml
+++ b/gnome2-user-guide/C/gospanel.xml
@@ -56,11 +56,6 @@ the standard GNOME applications.</para></entry></row>
 <row><entry valign="top"><para><guimenu>Actions</guimenu> menu</para></entry>
 <entry valign="top"><para>The <guimenu>Actions</guimenu> menu provides menu
 items that relate to the current status of your desktop. </para></entry></row>
-<row><entry colname="COLSPEC3" valign="top"><para><application>GNOME Terminal
-</application> launcher </para></entry><entry colname="COLSPEC4" valign="top"><para>
-Click on this button to start a <application>GNOME Terminal</application>. <application>
-GNOME Terminal</application> provides access to a UNIX command line.</para></entry>
-</row>
 <row><entry colname="COLSPEC3" valign="top"><para><application>Volume Control
 </application> applet</para></entry><entry colname="COLSPEC4" valign="top"><para><application>
 Volume Control</application> enables you to control the volume of the speaker
@@ -133,34 +128,34 @@ linkend="gospanel-TBL-47"/> lists the types of panel that you can create, and
 their characteristics. </para>
 <table frame="topbot" id="gospanel-TBL-47">
 <title>Types of Panel</title>
-<tgroup cols="3" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="32.86*"/>
-<colspec colname="COLSPEC1" colwidth="32.96*"/><colspec colname="COLSPEC2"
-colwidth="33.17*"/>
+<tgroup cols="3" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="24.28*"/>
+<colspec colname="COLSPEC1" colwidth="37.36*"/><colspec colname="COLSPEC2"
+colwidth="37.36*"/>
 <thead>
 <row rowsep="1"><entry valign="top"><para>Panel Type</para></entry><entry
 valign="top"><para>Snap Behavior </para></entry><entry valign="top"><para>
 Size</para></entry></row>
 </thead>
 <tbody>
-<row><entry colname="COLSPEC0" valign="top"><para>Corner panel</para></entry>
+<row><entry colname="COLSPEC0" valign="top"><para>Corner Panel</para></entry>
 <entry colname="COLSPEC1" valign="top"><para>Snaps to one of the edges of
 the screen, but can only snap to the center or the corner of the edge. </para></entry>
 <entry colname="COLSPEC2" valign="top"><para>Stretches as much as required
 to display the objects on the panel.</para></entry></row>
-<row><entry valign="top"><para>Edge panel</para></entry><entry valign="top"><para>
+<row><entry valign="top"><para>Edge Panel</para></entry><entry valign="top"><para>
 Snaps to one of the edges of the screen. The startup panel at the bottom of
 the desktop is an example of an edge panel. </para></entry><entry valign="top"><para>
 Stretches the full length of the edge that the panel snaps to.</para></entry>
 </row>
-<row><entry valign="top"><para>Floating panel</para></entry><entry valign="top"><para>
+<row><entry valign="top"><para>Floating Panel</para></entry><entry valign="top"><para>
 Does not snap to anything. You can place a floating panel anywhere on your
 desktop.</para></entry><entry valign="top"><para>Stretches as much as required
 to display the objects on the panel.</para></entry></row>
 <row><entry valign="top"><para>Menu Panel</para></entry><entry valign="top"><para>
-Snaps to the top edge of the screen. You can not move the Menu Panel.</para></entry>
+Snaps to the top edge of the screen. You cannot move the Menu Panel.</para></entry>
 <entry valign="top"><para>Stretches the full length of the top edge of the
 screen. You can only have one Menu Panel on your desktop.</para></entry></row>
-<row><entry valign="top"><para>Sliding panel</para></entry><entry valign="top"><para>
+<row><entry valign="top"><para>Sliding Panel</para></entry><entry valign="top"><para>
 Snaps to one of the edges of the screen, can snap to any point on the edge.
 </para></entry><entry valign="top"><para>Stretches as much as required to
 display the objects on the panel.</para></entry></row>
@@ -170,7 +165,7 @@ display the objects on the panel.</para></entry></row>
 <para>To create a panel perform the following steps:</para>
 <orderedlist>
 <listitem><para>Right-click on a vacant space on any panel, then choose <guimenuitem>
-Create panel</guimenuitem> from the panel popup menu.</para></listitem>
+New Panel</guimenuitem>.</para></listitem>
 <listitem><para>Choose the type of panel that you want to create. The new
 panel is added to the desktop. The new panel contains no objects, except for
 a Menu Panel. </para>
@@ -178,7 +173,7 @@ a Menu Panel. </para>
 </orderedlist>
 </sect2>
 <sect2 id="gospanel-11">
-<title>Interacting With a Panel</title>
+<title>To Interact With a Panel</title>
 <indexterm><primary>panels</primary><secondary>interacting with</secondary>
 </indexterm><para>To interact with a panel, you must left-click, middle-click,
 or right-click on a vacant space on the panel. You can also middle-click or
@@ -210,7 +205,7 @@ the panel to the new location.</para>
 The panel does not snap to any part of the desktop. When you drag a corner
 panel, an edge panel, or a sliding panel, the panel snaps to the edge of the
 screen.</para>
-<note><para>You can not move the Menu Panel.</para>
+<note><para>You cannot move the Menu Panel.</para>
 </note>
 </sect2>
 <sect2 id="gospanel-7">
@@ -218,8 +213,8 @@ screen.</para>
 <indexterm><primary>panels</primary><secondary>hiding</secondary></indexterm>
 <para>You can hide or show a panel on your desktop, except for the Menu Panel.
 To hide a panel, use a hide button. If the hide buttons are not visible on
-a panel, modify the preferences of the panel so that the hide buttons are
-visible. </para>
+a panel, modify the panel properties so that the hide buttons are visible. 
+</para>
 <para>Hide buttons are at either end of a panel. The hide buttons contain
 an optional arrow icon. The following illustration shows hide buttons. </para>
 <screenshot>
@@ -242,7 +237,7 @@ buttons are now visible.</para>
 <para>You can set a panel to autohide. When you set autohide, the panel hides
 automatically when the mouse is not pointing to the panel. The panel reappears
 when you point to the part of the screen where the panel resides. To set your
-panel to autohide, modify the preferences of the panel.</para>
+panel to autohide, modify the properties of the panel.</para>
 <note><para>On a corner panel, the behavior of the hide buttons is slightly
 different. If the panel is in one of the corners of the screen, you can use
 the hide buttons as follows:</para>
@@ -272,29 +267,19 @@ and the visual appearance. </para>
 <orderedlist>
 <listitem><para>Right-click on a vacant space on the panel, then choose <guimenuitem>
 Properties</guimenuitem> to display the <guilabel>Panel Properties</guilabel>
-dialog. The following figure shows the <guilabel>Panel Properties</guilabel>
-dialog for the edge panel at the bottom of your desktop. </para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/panelprop_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows a Panel Properties dialog. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
+dialog. </para>
 <para>The <guilabel>Panel Properties</guilabel> dialog contains the following
 tabbed sections: </para>
 <itemizedlist>
-<listitem><para><guilabel>Panel</guilabel></para></listitem>
+<listitem><para><guilabel><replaceable>Panel_type</replaceable> Panel</guilabel></para>
+</listitem>
 <listitem><para><guilabel>Background</guilabel></para></listitem>
 </itemizedlist>
 </listitem>
 <listitem><para>To modify panel size, position, and hiding properties, click
-on the <guilabel>Panel</guilabel> tab. The following table describes the dialog
-elements on the <guilabel>Panel</guilabel> tabbed section: </para>
+on the <guilabel><replaceable>Panel_type</replaceable> Panel</guilabel> tab.
+The following table describes the dialog elements on the <guilabel><replaceable>
+Panel_type</replaceable> Panel</guilabel> tabbed section: </para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="28.57*"/>
 <colspec colname="COLSPEC1" colwidth="71.43*"/>
@@ -303,54 +288,38 @@ elements on the <guilabel>Panel</guilabel> tabbed section: </para>
 valign="top"><para>Description </para></entry></row>
 </thead>
 <tbody>
-<row><entry valign="top"><para><guilabel>Panel size</guilabel></para></entry>
-<entry valign="top"><para>Choose the size of the panel.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Panel position</guilabel></para></entry>
-<entry valign="top"><para>Choose the position of the panel on your desktop.
+<row><entry colname="COLSPEC0"><para><guilabel>Position</guilabel></para></entry>
+<entry colname="COLSPEC1"><para>Select the position of the panel on your desktop.
 Click on the required position for the panel. </para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><guilabel>Panel window level
-</guilabel></para></entry><entry colname="COLSPEC1" valign="top"><para>Select
-the level or layer at which you want the panel to appear. Select from one
-of the following options:</para><itemizedlist>
-<listitem><para><guilabel>Default (from global preferences) </guilabel>: Select
-this option to use the default setting that is specified in <menuchoice><guimenu>
-Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu>
-<guisubmenu>Advanced</guisubmenu><guimenuitem>Panel</guimenuitem>
-</menuchoice>.</para></listitem>
-<listitem><para><guilabel>Below other windows</guilabel>: Select this option
-if you want the panel to appear below windows.</para></listitem>
-<listitem><para><guilabel>Normal</guilabel>: Select this option if you want
-the panel to appear at the same level as windows.</para></listitem>
-<listitem><para><guilabel>Above other windows</guilabel>: Select this option
-if you want the panel to appear above windows.</para></listitem>
-</itemizedlist></entry></row>
-<row><entry valign="top"><para><guilabel>Orient panel horizontally</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Size</guilabel></para></entry><entry
+valign="top"><para>Select the size of the panel.</para></entry></row>
+<row><entry valign="top"><para><guilabel>Orient horizontally</guilabel></para></entry>
 <entry valign="top"><para>Floating panel only. Select this option to display
 the panel horizontally. </para></entry></row>
-<row><entry valign="top"><para><guilabel>Orient panel vertically</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Orient vertically</guilabel></para></entry>
 <entry valign="top"><para>Floating panel only. Select this option to display
 the panel vertically.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Top left corner's position</guilabel></para></entry>
-<entry valign="top"><para>Floating panel only. Use the <guilabel>X</guilabel>
-and <guilabel>Y</guilabel> spin boxes to specify the coordinates for the top-left
-corner of the panel. </para></entry></row>
-<row><entry valign="top"><para><guilabel>Offset from screen edge</guilabel></para></entry>
+<row><entry colname="COLSPEC0"><para><guilabel>Horizontal offset</guilabel></para></entry>
+<entry colname="COLSPEC1"><para>Floating panel only. Use the spin box to specify
+the distance of the panel from the left edge of the desktop. </para></entry>
+</row>
+<row><entry colname="COLSPEC0"><para><guilabel>Vertical offset</guilabel></para></entry>
+<entry colname="COLSPEC1"><para>Floating panel only. Use the spin box to specify
+the distance of the panel from the top edge of the desktop. </para></entry>
+</row>
+<row><entry valign="top"><para><guilabel>Screen edge offset</guilabel></para></entry>
 <entry valign="top"><para>Sliding panel only. Use this spin box to specify
 the distance between your panel and the edge of the screen, in pixels. </para></entry>
 </row>
-<row><entry valign="top"><para><guilabel>Enable Auto-hide</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Autohide</guilabel></para></entry>
 <entry valign="top"><para>Select this option to enable autohide. </para></entry>
 </row>
 <row><entry valign="top"><para><guilabel>Show hide buttons</guilabel></para></entry>
 <entry valign="top"><para>Select this option to display hide buttons on your
 panel.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Show arrows on hide button </guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Arrows on hide button </guilabel></para></entry>
 <entry valign="top"><para>Select this option to display arrows on the hide
 buttons, if the hide button is enabled.</para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><guilabel>Avoid this panel
-when maximizing windows</guilabel></para></entry><entry colname="COLSPEC1"
-valign="top"><para>Select this option if you do not want to overlap the panel
-when you maximize windows.</para></entry></row>
 </tbody>
 </tgroup>
 </informaltable>
@@ -370,26 +339,27 @@ namest="COLSPEC5" nameend="COLSPEC6" valign="top"><para>Description</para></entr
 <row><entry valign="top"><para><guilabel>Background Type</guilabel></para></entry>
 <entry namest="COLSPEC5" nameend="COLSPEC6" valign="top"><para>Choose the
 type of background for the panel. The choices are as follows:</para><itemizedlist>
-<listitem><para><guilabel>Standard</guilabel>: The standard background type.
+<listitem><para><guilabel>Default</guilabel>: The default background type.
 The standard background depends on the settings in <menuchoice><guimenu>Applications
 </guimenu><guisubmenu>Desktop Preferences</guisubmenu><guimenuitem>
 Theme</guimenuitem></menuchoice>. </para></listitem>
 <listitem><para><guilabel>Color</guilabel>: Enables you to choose a color
 for the panel background.</para></listitem>
-<listitem><para><guilabel>Pixmap</guilabel>: Enables you to choose an image
+<listitem><para><guilabel>Image</guilabel>: Enables you to choose an image
 for the panel background. </para></listitem>
 </itemizedlist></entry></row>
-<row><entry valign="top"><para><guilabel>Color</guilabel></para></entry><entry
-namest="COLSPEC5" nameend="COLSPEC6" valign="top"><para>If <guilabel>Background
-Type</guilabel> is <guilabel>Color</guilabel>, click on the <guibutton>Color
-to use</guibutton> button to display the color selector dialog. Choose the
-color that you require from the color selector dialog. </para></entry></row>
+<row><entry valign="top"><para><guilabel>Background Color</guilabel></para></entry>
+<entry namest="COLSPEC5" nameend="COLSPEC6" valign="top"><para>If <guilabel>
+Background Type</guilabel> is <guilabel>Color</guilabel>, click on the <guibutton>
+Color to use</guibutton> button to display the color selector dialog. Choose
+the color that you require from the color selector dialog. </para></entry>
+</row>
 <row><entry morerows="4" valign="top"><para><guilabel>Image</guilabel></para></entry>
 <entry namest="COLSPEC5" nameend="COLSPEC6" valign="top"><para>If <guilabel>
-Background Type</guilabel> is <guilabel>Pixmap</guilabel>, choose the image
+Background Type</guilabel> is <guilabel>Image</guilabel>, choose the image
 to use on the background of the panel. Specify the following settings for
 the image background:</para></entry></row>
-<row><entry valign="top"><para><guilabel>Don't scale image to fit</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Do not scale image to fit</guilabel></para></entry>
 <entry valign="top"><para>Select this option to tile the background image
 to fit the panel background.</para></entry></row>
 <row><entry valign="top"><para><guilabel>Scale image</guilabel></para></entry>
@@ -430,10 +400,10 @@ of the panel. You can also drag pattern images from the <application>Nautilus
 <title>To Delete a Panel</title>
 <indexterm><primary>panels</primary><secondary>deleting</secondary></indexterm>
 <para>To delete a panel from the desktop, right-click on the panel that you
-want to delete. Choose <menuchoice><guimenuitem>Remove this panel</guimenuitem>
-</menuchoice> from the panel popup menu.</para>
+want to delete, then choose <menuchoice><guimenuitem>Delete This Panel</guimenuitem>
+</menuchoice>.</para>
 <note><para>You must always have at least one panel on your desktop. If you
-have only one panel on your desktop, you can not delete that panel.</para>
+have only one panel on your desktop, you cannot delete that panel.</para>
 </note>
 </sect2>
 </sect1>
@@ -472,8 +442,8 @@ information, see <xref linkend="gospanel-39"/>.</para>
 <itemizedlist>
 <listitem><para>From the panel popup menu</para>
 <para>Right-click on a vacant space on a panel to open the panel popup menu.
-The panel popup menu contains an <guisubmenu>Add to panel</guisubmenu> submenu.
-The <guisubmenu>Add to panel</guisubmenu> submenu enables you to add the following
+The panel popup menu contains an <guisubmenu>Add to Panel</guisubmenu> submenu.
+The <guisubmenu>Add to Panel</guisubmenu> submenu enables you to add the following
 objects to your panels: <itemizedlist>
 <listitem><para>Launchers</para></listitem>
 <listitem><para>Menus</para></listitem>
@@ -551,9 +521,8 @@ object anchors at the new location.</para>
 <para>Alternatively, you can use the panel object popup menu to move an object,
 as follows: </para>
 <orderedlist>
-<listitem><para>Right-click on the object to open the panel object popup menu. 
+<listitem><para>Right-click on the object, then choose <guimenuitem>Move</guimenuitem>.
 </para></listitem>
-<listitem><para>Choose <guimenuitem>Move</guimenuitem>. </para></listitem>
 <listitem><para>Point to the new location for the object, then click any mouse
 button to anchor the object to the new location. This location can be on any
 panel that is currently on your desktop. </para></listitem>
@@ -592,8 +561,8 @@ further along the panel. </para></entry></row>
 <title>To Remove a Panel Object</title>
 <indexterm><primary>panel objects</primary><secondary>removing</secondary>
 </indexterm><para>To remove an object from a panel right-click on the object
-to open the panel object popup menu, then choose <guimenuitem>Remove from
-panel</guimenuitem>. </para>
+to open the panel object popup menu, then choose <guimenuitem>Remove From
+Panel</guimenuitem>. </para>
 </sect2>
 </sect1>
 <sect1 id="gospanel-16">
@@ -605,14 +574,18 @@ one of the following actions: </para>
 <listitem><para>Start a particular application.</para></listitem>
 <listitem><para>Execute a command.</para></listitem>
 <listitem><para>Open a folder in a file manager window.</para></listitem>
-<listitem><para>Open a browser at a particular URL.</para></listitem>
+<listitem><para>Open a browser at a particular <glossterm>Uniform Resource
+Locator</glossterm> (<acronym>URL</acronym>). A URL is the address of a particular
+location on the Web.</para></listitem>
 </itemizedlist>
 <para>You can find launchers in the following places on the desktop:</para>
 <itemizedlist>
 <listitem><para>Panels: On panels, launchers are represented by icons.</para>
 </listitem>
-<listitem><para>Menus: On menus, launchers are represented by menu items with
-an icon.</para></listitem>
+<listitem><para>Menus: On menus, launchers are represented by menu items.
+The menu items usually have an icon beside the menu item.</para></listitem>
+<listitem><para>Desktop background: On the desktop background, launchers are
+represented by icons.</para></listitem>
 </itemizedlist>
 <para>You can modify the properties of a launcher. For example, the properties
 of a launcher include the name of the launcher, the icon that represents the
@@ -624,20 +597,20 @@ launcher, and how the launcher runs. </para>
 ways:</para>
 <itemizedlist>
 <listitem><para>From the panel popup menu</para>
-<para>To create a new launcher, right-click on any vacant space on the panel
-to open the panel popup menu. Choose <menuchoice><guimenu>Add to panel
-</guimenu><guimenuitem>Launcher</guimenuitem></menuchoice>. A <guilabel>Launcher
-Properties</guilabel> dialog is displayed. For more information on how to
-complete this dialog, see <xref linkend="gospanel-52"/>.</para>
+<para>To create a new launcher, right-click on any vacant space on the panel,
+then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>
+Launcher</guimenuitem></menuchoice>. A <guilabel>Create Launcher</guilabel>
+dialog is displayed. For more information on how to complete this dialog,
+see <xref linkend="gospanel-52"/>.</para>
 <para>Alternatively, to add an existing launcher to the panel, choose <menuchoice>
-<guimenu>Add to panel</guimenu><guimenuitem>Launcher from menu</guimenuitem>
-</menuchoice> from the panel popup menu. Choose the launcher that you want
+<guimenu>Add to Panel</guimenu><guimenuitem>Launcher from menu</guimenuitem>
+</menuchoice> from the panel popup men. Choose the launcher that you want
 to add from the menu.</para></listitem>
 <listitem><para>From any menu</para>
 <para>To add a launcher to a panel from any menu, perform one of the following
 steps:<itemizedlist>
-<listitem><para>From the panel where you want the launcher to reside, open
-the menu that contains the launcher. Right-click on the title of the launcher.
+<listitem><para>Open the menu that contains the launcher from the panel where
+you want the launcher to reside. Right-click on the title of the launcher.
 Choose <guimenuitem>Add this launcher to panel</guimenuitem>. </para></listitem>
 <listitem><para>Open a menu that contains the launcher. Drag the launcher
 on to the panel. </para></listitem>
@@ -649,27 +622,15 @@ launcher drag the <filename>.desktop</filename> file to the panel. </para>
 </listitem>
 </itemizedlist>
 <sect3 id="gospanel-52">
-<title>To Create a Launcher With the Launcher Properties Dialog</title>
-<para>To create a launcher with the <guilabel>Launcher Properties</guilabel>
-dialog perform the following steps: </para>
+<title>To Create a Launcher With the Create Launcher Dialog</title>
+<para>To create a launcher with the <guilabel>Create Launcher</guilabel> dialog
+perform the following steps: </para>
 <orderedlist>
 <listitem><para>Right-click on any part of a panel to open the panel popup
-menu. Choose <menuchoice><guimenu>Add to panel</guimenu><guimenuitem>
-Launcher</guimenuitem></menuchoice> to display the <guilabel>Launcher Properties
+menu. Choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>
+Launcher</guimenuitem></menuchoice> to display the <guilabel>Create Launcher
 </guilabel> dialog. The dialog displays the <guilabel>Basic</guilabel> tabbed
-section, as shown in the following figure:</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/launcherprop1_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Launcher Properties dialog, Basic tabbed section. Contains: Name, Generic name, Comment text boxes, Command field, Type drop-down list box, Icon icon selector button, Run in Terminal check box.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+section.</para></listitem>
 <listitem><para>Enter the properties of the launcher in the dialog. The following
 table describes the dialog elements on the <guilabel>Basic</guilabel> tabbed
 section: </para>
@@ -687,8 +648,11 @@ You can use the <guilabel>Advanced</guilabel> tab to add translations of the
 name. This name is the name that appears when you add the launcher to a menu
 or to the desktop. </para></entry></row>
 <row><entry colname="COLSPEC0"><para><guilabel>Generic name</guilabel></para></entry>
-<entry colname="COLSPEC1"><para>Information to be supplied in a future release.
-</para></entry></row>
+<entry colname="COLSPEC1"><para>Use this text box to specify the class of
+application to which the launcher belongs. For example, you might type <userinput>
+Text Editor</userinput> in this text box for a <application>gedit</application>
+launcher. You can use the <guilabel>Advanced</guilabel> tab to add translations
+of the generic name.</para></entry></row>
 <row><entry valign="top"><para><guilabel>Comment</guilabel></para></entry>
 <entry valign="top"><para>Use this text box to specify a short description
 of the launcher. The comment is displayed as a tooltip when you point to the
@@ -696,24 +660,14 @@ launcher icon on the panel. You can use the <guilabel>Advanced</guilabel>
 tabbed section to add translations of the comment. </para></entry></row>
 <row><entry valign="top"><para><guilabel>Command</guilabel></para></entry>
 <entry valign="top"><para>Use this field to specify a command to execute when
-you click on the launcher. </para><para>If the launcher type is <guilabel>
-URL</guilabel>, use this text box to specify a URL to access when you choose
-the launcher. </para></entry></row>
+you click on the launcher. </para></entry></row>
 <row><entry valign="top"><para><guilabel>Type</guilabel></para></entry><entry
 valign="top"><para>Use this drop-down combination box to specify the type
-of launcher. Choose from the following: </para><itemizedlist>
-<listitem><para><guilabel>Application</guilabel>: Choose this list item to
-create a launcher that starts an application.</para></listitem>
-<listitem><para><guilabel>FSDevice</guilabel>: Information to be supplied
-in a future release.</para></listitem>
-<listitem><para><guilabel>Link</guilabel>: Information to be supplied in a
-future release.</para></listitem>
-<listitem><para><guilabel>MimeType</guilabel>: Information to be supplied
-in a future release.</para></listitem>
-<listitem><para><guilabel>Service</guilabel>: Information to be supplied in
-a future release.</para></listitem>
-<listitem><para><guilabel>ServiceType</guilabel>: Information to be supplied
-in a future release.</para></listitem>
+of launcher. Select from the following: </para><itemizedlist>
+<listitem><para><guilabel>Application</guilabel>: Select this option to create
+a launcher that starts an application.</para></listitem>
+<listitem><para><guilabel>Link</guilabel>:  Select this option to create a
+launcher that links to a file, folder, or FTP site.</para></listitem>
 </itemizedlist></entry></row>
 <row><entry valign="top"><para><guilabel>Icon</guilabel></para></entry><entry
 valign="top"><para>Choose an icon to represent the launcher. To choose an
@@ -731,20 +685,7 @@ does not create a window in which to run.</para></entry></row>
 </listitem>
 <listitem><para>To set advanced properties for the launcher, click on the <guilabel>
 Advanced</guilabel> tab. The <guilabel>Launcher Properties</guilabel> dialog
-displays the <guilabel>Advanced</guilabel> tabbed section, as shown in the
-following figure.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/launcherprop2_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Launcher Properties dialog, Advanced tabbed section. Contains Try this before using, Documentation fields, Name/Comment translations table, Language, Name, Generic Name, and Comment translation fields, Add/Set and Remove buttons.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+displays the <guilabel>Advanced</guilabel> tabbed section.</para></listitem>
 <listitem><para>Enter the advanced properties of the launcher in the dialog.
 The following table describes the dialog elements on the top part of the <guilabel>
 Advanced</guilabel> tabbed section: </para>
@@ -767,13 +708,14 @@ on the panel.</para></entry></row>
 </tgroup>
 </informaltable>
 </listitem>
-<listitem><para>You can also add a translation of the <guilabel>Name</guilabel>
-and <guilabel>Comment</guilabel> fields from the <guilabel>Basic</guilabel>
-tabbed section. To add a translation, enter the details of the translation
-in the <guilabel>Name/Comment translations</guilabel> table as follows: </para>
+<listitem><para>You can also add a translation of the <guilabel>Name</guilabel>, <guilabel>
+Generic name</guilabel>, and <guilabel>Comment</guilabel> fields from the <guilabel>
+Basic</guilabel> tabbed section. To add a translation, enter the details of
+the translation in the <guilabel>Name/Comment translations</guilabel> table
+as follows: </para>
 <informaltable frame="topbot">
-<tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="20.78*"/><colspec
-colwidth="79.22*"/>
+<tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="20.78*"/>
+<colspec colname="COLSPEC1" colwidth="79.22*"/>
 <thead>
 <row rowsep="1"><entry valign="top"><para>Field</para></entry><entry valign="top"><para>
 Description </para></entry></row>
@@ -785,7 +727,10 @@ Enter the two-letter code for the language for which you want to add a translati
 <row><entry valign="top"><para>Second field</para></entry><entry valign="top"><para>
 Enter the translation of the <guilabel>Name</guilabel> of the launcher.</para></entry>
 </row>
-<row><entry valign="top"><para>Third field</para></entry><entry valign="top"><para>
+<row><entry colname="COLSPEC0"><para>Third field</para></entry><entry colname="COLSPEC1"><para>
+Enter the translation of the <guilabel>Generic name</guilabel> of the launcher.
+</para></entry></row>
+<row><entry valign="top"><para>Fourth field</para></entry><entry valign="top"><para>
 Enter the translation for the <guilabel>Comment</guilabel> for the launcher. 
 </para></entry></row>
 </tbody>
@@ -814,8 +759,8 @@ menu.</para></listitem>
 Launcher Properties</guilabel> dialog to modify the properties as required.
 For more information on the <guilabel>Launcher Properties</guilabel> dialog,
 see <xref linkend="gospanel-52"/>. </para></listitem>
-<listitem><para>Click <guibutton>OK</guibutton> to apply your changes, then
-  close the <guilabel>Launcher Properties</guilabel> dialog.</para></listitem>
+<listitem><para>Click <guibutton>Close</guibutton> to close the <guilabel>
+Launcher Properties</guilabel> dialog.</para></listitem>
 </orderedlist>
 </sect2>
 </sect1>
@@ -832,15 +777,14 @@ menu and <guimenu>Actions</guimenu> menu are system menus. To add a system
 menu to a panel, right-click on a launcher in the menu, then choose <menuchoice>
 <guimenu>Entire menu</guimenu><guimenuitem>Add this as menu to panel
 </guimenuitem></menuchoice>. </para></listitem>
-<listitem><para><guimenu>GNOME Menu</guimenu>: The <guimenu>GNOME Menu</guimenu>
-is your primary menu. You can access almost all of the applications, commands,
-and configuration options on your desktop from the <guimenu>GNOME Menu</guimenu>.
-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>.
-You can add as many <guimenu>GNOME Menu</guimenu> objects to your panels as
-you want. By default, the <guimenu>GNOME Menu</guimenu> is represented on
-panels by a stylized footprint icon, as follows:</para>
+<listitem><para><guimenu>GNOME Menu</guimenu>: You can access almost all of
+the applications, commands, and configuration options on your desktop from
+the <guimenu>GNOME Menu</guimenu>. To add a <guimenu>GNOME Menu</guimenu>
+to a panel, right-click on any vacant space on the panel, then choose <menuchoice>
+<guimenu>Add to Panel</guimenu><guimenuitem>GNOME Menu</guimenuitem>
+</menuchoice>. You can add as many <guimenu>GNOME Menu</guimenu> objects to
+your panels as you want. By default, the <guimenu>GNOME Menu</guimenu> is
+represented on panels by a stylized footprint icon, as follows:</para>
 <screenshot>
 <mediaobject>
   <imageobject>
@@ -869,14 +813,12 @@ linkend="gospanel-FIG-68"/> shows how menus typically appear on panels. </para>
 </mediaobject>
 </screenshot>
 </figure>
-<para>For more information on menus, see <xref linkend="goseditmainmenu-1"/>.
-</para>
 </sect1>
 <sect1 id="gospanel-17">
 <title>Applets</title>
 <indexterm><primary>applets</primary><secondary>introduction</secondary></indexterm>
 <indexterm><primary>panel objects</primary><secondary>applets</secondary>
-<see>applets</see></indexterm><para>A applet is a small application whose
+<see>applets</see></indexterm><para>An applet is a small application whose
 user interface resides within a panel. You use the applet panel object to
 interact with the applet. For example, the following figure shows the following
 applets, from left to right: </para>
@@ -902,13 +844,10 @@ control the volume of the speaker on your system.</para></listitem>
 <sect2 id="gospanel-40">
 <title>To Add an Applet to a Panel</title>
 <indexterm><primary>applets</primary><secondary>adding to panel</secondary>
-</indexterm><para>You can add an applet to a panel in the following ways: 
-</para>
-<itemizedlist>
-<listitem><para>From the panel popup menu</para>
-<para>Right-click on any vacant space on the panel to open the panel popup
-menu. Choose <guimenu>Add to panel</guimenu>, then choose the applet that
-you want to add from one of the following submenus:</para>
+</indexterm><para>You can add an applet to a panel from the panel popup menu.
+Right-click on any vacant space on the panel to open the panel popup menu.
+Choose <guimenu>Add to Panel</guimenu>, then choose the applet that you want
+to add from one of the following submenus:</para>
 <itemizedlist>
 <listitem><para><guimenu>Accessories</guimenu></para></listitem>
 <listitem><para><guimenu>Amusements</guimenu></para></listitem>
@@ -916,22 +855,17 @@ you want to add from one of the following submenus:</para>
 <listitem><para><guimenu>Multimedia</guimenu></para></listitem>
 <listitem><para><guimenu>Utility</guimenu></para></listitem>
 </itemizedlist>
-</listitem>
-<listitem><para>From any menu</para>
-<para>Open any menu that contains the applet, then drag the applet on to the
-panel. </para>
-
-</listitem>
-</itemizedlist>
+<para>Alternatively, drag the applet from the submenu on to the panel. </para>
 </sect2>
 <sect2 id="gospanel-39">
 <title>To Select an Applet</title>
 <indexterm><primary>applets</primary><secondary>selecting</secondary></indexterm>
 <para>To modify the properties of an applet, you must first right-click on
 the applet to display the panel object popup menu. To move an applet, you
-must middle-click on the applet. Some restrictions apply on where you can
-click on an applet in order to display the panel object popup menu or to move
-the applet, as follows: </para>
+must middle-click on the applet. </para>
+<para>Some restrictions apply on where you can click on an applet in order
+to display the panel object popup menu, or to move the applet, as follows: 
+</para>
 <itemizedlist>
 <listitem><para>Some applets have popup menus of applet-specific commands
 that open when you right-click on particular parts of the applet. For example,
@@ -942,7 +876,7 @@ applet, you must right-click on the handle. If you right-click on a button
 on the right side, a popup menu for the button opens.</para></listitem>
 <listitem><para>Some applets have areas that you cannot use to select the
 applet. For example, the <application>Command Line</application> applet has
-a field in which you enter commands. You can not middle-click or right-click
+a field in which you enter commands. You cannot middle-click or right-click
 on this field to select the applet. Instead, middle-click or right-click on
 another part of the applet. </para></listitem>
 </itemizedlist>
@@ -953,13 +887,12 @@ another part of the applet. </para></listitem>
 </indexterm><para>To modify the preferences for an applet perform the following
 steps: </para>
 <orderedlist>
-<listitem><para>Right-click on the applet to open the panel object popup menu. 
-</para></listitem>
-<listitem><para>Choose <guimenuitem>Preferences</guimenuitem>. Use the <guilabel>
-Preferences</guilabel> dialog to modify the preferences as required. The preferences
-for applets vary depending on the applet.</para></listitem>
-<listitem><para>Click <guibutton>OK</guibutton> to apply your changes, then
- close the <guilabel>Preferences</guilabel> dialog.</para></listitem>
+<listitem><para>Right-click on the applet, then choose <guimenuitem>Preferences
+</guimenuitem>. Use the <guilabel>Preferences</guilabel> dialog to modify
+the preferences as required. The preferences for applets vary depending on
+the applet.</para></listitem>
+<listitem><para>Click <guibutton>Close</guibutton> to close the <guilabel>
+Preferences</guilabel> dialog.</para></listitem>
 </orderedlist>
 </sect2>
 </sect1>
@@ -1006,9 +939,9 @@ a drawer in the following ways: </para>
 </para>
 <itemizedlist>
 <listitem><para>From the panel popup menu</para>
-<para>Right-click on any vacant space on the panel to open the panel popup
-menu. Choose <menuchoice><guimenu>Add to panel</guimenu><guimenuitem>
-Drawer</guimenuitem></menuchoice>. </para></listitem>
+<para>Right-click on any vacant space on the panel, then choose <menuchoice>
+<guimenu>Add to Panel</guimenu><guimenuitem>Drawer</guimenuitem></menuchoice>. 
+</para></listitem>
 <listitem><para>From any menu</para>
 <para>You can add a menu as a drawer object to a panel.</para>
 <para>To add a menu as a drawer to a panel, open the menu from the panel.
@@ -1019,7 +952,7 @@ Entire menu</guimenu><guimenuitem>Add this as drawer to panel</guimenuitem>
 </sect2>
 <sect2 id="gospanel-54">
 <title>To Add an Object to a Drawer</title>
-<indexterm><primary>drawers</primary><secondary>adding objects</secondary>
+<indexterm><primary>drawers</primary><secondary>adding objects to</secondary>
 </indexterm><para>You add an object to a drawer in the same way that you add
 objects to panels. For more information, see <xref linkend="gospanel-15"/>.
 </para>
@@ -1040,23 +973,9 @@ can change features for each drawer, such as the visual appearance of the
 drawer and whether the drawer has hide buttons.</para>
 <para>To modify properties for a drawer perform the following steps: </para>
 <orderedlist>
-<listitem><para>Right-click on the drawer to open the panel object popup menu. 
-</para></listitem>
-<listitem><para>Choose <guimenuitem>Properties</guimenuitem> to display the <guilabel>
-Panel Properties</guilabel> dialog. The dialog displays the <guilabel>Drawer
-</guilabel> tabbed section, as shown in the following figure.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/drawerprop_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows a Panel Properties dialog for a drawer. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+<listitem><para>Right-click on the drawer, then choose <guimenuitem>Properties
+</guimenuitem> to display the <guilabel>Panel Properties</guilabel> dialog.
+The dialog displays the <guilabel>Drawer</guilabel> tabbed section.</para></listitem>
 <listitem><para>Select the properties for the drawer in the dialog. The following
 table describes the elements on the <guilabel>Drawer</guilabel> tabbed section: 
 </para>
@@ -1068,26 +987,9 @@ table describes the elements on the <guilabel>Drawer</guilabel> tabbed section:
 valign="top"><para>Description </para></entry></row>
 </thead>
 <tbody>
-<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Panel size</guilabel></para></entry>
+<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Size</guilabel></para></entry>
 <entry colname="COLSPEC3" valign="top"><para>Select the size of the drawer.
 </para></entry></row>
-<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Panel window level
-</guilabel></para></entry><entry colname="COLSPEC3" valign="top"><para>Select
-the level or layer at which you want the drawer to appear. Select from one
-of the following options:</para><itemizedlist>
-<listitem><para><guilabel>Default (from global preferences)</guilabel>: Select
-this option to use the default setting that is specified in the <application>
-Desktop Preferences</application>. To view the default setting, choose <menuchoice>
-<guimenu>Applications</guimenu><guisubmenu>Desktop Preferences
-</guisubmenu><guisubmenu>Advanced</guisubmenu><guimenuitem>Panel</guimenuitem>
-</menuchoice>.</para></listitem>
-<listitem><para><guilabel>Below other windows</guilabel>: Select this option
-if you want the panel to appear below windows.</para></listitem>
-<listitem><para><guilabel>Normal</guilabel>: Select this option if you want
-the panel to appear at the same level as windows.</para></listitem>
-<listitem><para><guilabel>Above other windows</guilabel>: Select this option
-if you want the panel to appear above windows.</para></listitem>
-</itemizedlist></entry></row>
 <row><entry valign="top"><para><guilabel>Tooltip/Name</guilabel></para></entry>
 <entry valign="top"><para>Use this text box to specify a name for the drawer.
 The name appears as a tooltip when you point at the drawer on the panel.</para></entry>
@@ -1114,8 +1016,8 @@ Background</guilabel> tabbed section, see the step on this topic in <xref
 linkend="gospanel-28"/>. You can also drag a color or image on to a drawer
 to set the color or image as the background of the drawer. For more information,
  see <xref linkend="gospanel-61"/>.</para></listitem>
-<listitem><para>Click <guibutton>OK</guibutton> to apply your changes, then
-close the <guilabel>Panel Properties</guilabel> dialog.</para></listitem>
+<listitem><para>Click <guibutton>Close</guibutton> to close the <guilabel>
+Panel Properties</guilabel> dialog.</para></listitem>
 </orderedlist>
 </sect2>
 </sect1>
@@ -1124,15 +1026,15 @@ close the <guilabel>Panel Properties</guilabel> dialog.</para></listitem>
 <para>Your panels can include other panel objects that you can use to perform
 special tasks. You can add the following panel objects to your panels:</para>
 <itemizedlist>
-<listitem><para>Log Out button</para></listitem>
-<listitem><para>Lock Screen button</para></listitem>
+<listitem><para><guibutton>Log Out</guibutton> button</para></listitem>
+<listitem><para><guibutton>Lock</guibutton> button</para></listitem>
 </itemizedlist>
 <para>To add a panel object to a panel perform the following steps: </para>
 <orderedlist>
 <listitem><para>Right-click on any vacant space on the panel, then choose <menuchoice>
-<guimenuitem>Add to panel</guimenuitem></menuchoice> from the panel popup
-menu.</para></listitem>
-<listitem><para>Choose the object you want to add to the panel. </para></listitem>
+<guimenuitem>Add to Panel</guimenuitem></menuchoice>.</para></listitem>
+<listitem><para>Choose the object that you want to add to the panel. </para>
+</listitem>
 </orderedlist>
 <sect2 id="gospanel-20">
 <title>Log Out Button</title>
@@ -1154,26 +1056,26 @@ a GNOME session. </para>
 Log Out</guibutton> button. </para>
 </sect2>
 <sect2 id="gospanel-21">
-<title>Lock Screen Button</title>
+<title>Lock Button</title>
 <screenshot>
 <mediaobject>
   <imageobject>
     <imagedata fileref="figures/lockscreen_icon.png" format="PNG"/>
   </imageobject>
   <textobject>
-	<phrase>Shows Lock Screen icon.</phrase>
+	<phrase>Shows Lock icon.</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
-<indexterm><primary>panel objects</primary><secondary>Lock Screen button</secondary>
-</indexterm><indexterm><primary>Lock Screen button</primary></indexterm><indexterm>
-<primary>locking screen</primary></indexterm><para>The <guibutton>Lock Screen
-</guibutton> button locks your screen and starts a screensaver. To access
-your session again, you must enter your password. To lock your screen correctly,
-you must have a screensaver enabled.</para>
-<para>Right-click on the <guibutton>Lock Screen</guibutton> button to open
-a popup menu of screensaver-related commands. <xref linkend="gosstartsession-TBL-83"/>
-describes the commands that are available from the popup menu.</para>
+<indexterm><primary>panel objects</primary><secondary>Lock button</secondary>
+</indexterm><indexterm><primary>Lock button</primary></indexterm><indexterm>
+<primary>locking screen</primary></indexterm><para>The <guibutton>Lock</guibutton>
+button locks your screen and activates your screensaver. To access your session
+again, you must enter your password. To lock your screen correctly, you must
+have a screensaver enabled.</para>
+<para>Right-click on the <guibutton>Lock</guibutton> button to open a menu
+of screensaver-related commands. <xref linkend="gosstartsession-TBL-83"/>
+describes the commands that are available from the menu.</para>
 <table frame="topbot" id="gosstartsession-TBL-83">
 <title>Lock Screen Menu Items</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="43.55*"/>
@@ -1184,23 +1086,22 @@ Function</para></entry></row>
 </thead>
 <tbody>
 <row><entry valign="top"><para><guimenuitem>Activate Screensaver</guimenuitem></para></entry>
-<entry valign="top"><para>Starts the screensaver immediately, but does not
-lock the screen.</para></entry></row>
+<entry valign="top"><para>Activates the screensaver immediately, but does
+not lock the screen.</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Lock Screen</guimenuitem></para></entry>
 <entry valign="top"><para>Locks the screen immediately. This command performs
-the same function as when you click on the <guibutton>Lock Screen</guibutton>
-button.</para></entry></row>
+the same function as when you click on the <guibutton>Lock</guibutton> button.
+</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Kill Screensaver Daemon</guimenuitem></para></entry>
-<entry valign="top"><para>Kills the screensaver process. After you kill the
-screensaver process, you can not lock your screen.</para></entry></row>
+<entry valign="top"><para>Terminates the screensaver process. After you terminate
+the screensaver process, you cannot lock your screen.</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Restart Screensaver Daemon</guimenuitem></para></entry>
-<entry valign="top"><para>Kills and restarts the screensaver process. Use
-this command after you change your password. When you restart the screensaver
-process, to use your new password with the screensaver.</para></entry></row>
+<entry valign="top"><para>Terminates and restarts the screensaver process.
+Use this command after you change your password. When you restart the screensaver
+process, use your new password with the screensaver.</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Properties</guimenuitem></para></entry>
 <entry valign="top"><para>Displays an <guilabel>XScreenSaver</guilabel> dialog
-that you can use to configure the screensaver. For information on how to configure
-your screensaver, see <xref linkend="gosstartsession-3"/>.</para></entry></row>
+that you can use to configure the screensaver. </para></entry></row>
 </tbody>
 </tgroup>
 </table>