gnome-user-docs r1077 - in trunk/gnome2-user-guide: . C



Author: shaunm
Date: Sun Feb  8 02:05:46 2009
New Revision: 1077
URL: http://svn.gnome.org/viewvc/gnome-user-docs?rev=1077&view=rev

Log:
* C/gospanel.xml:
- Updates from Phil Bull


Modified:
   trunk/gnome2-user-guide/C/gospanel.xml
   trunk/gnome2-user-guide/ChangeLog

Modified: trunk/gnome2-user-guide/C/gospanel.xml
==============================================================================
--- trunk/gnome2-user-guide/C/gospanel.xml	(original)
+++ trunk/gnome2-user-guide/C/gospanel.xml	Sun Feb  8 02:05:46 2009
@@ -7,35 +7,6 @@
   <!-- Desktop Overview / Panels -->
   <anchor id="gosoverview-502"/>
 
-<!--
-        <para>By default, the top edge panel contains the <application>Menu
-        Bar</application>, which provides access to your applications and
-        folders.  The <application>Menu Bar</application> provides the
-        following menus:</para>
-
-        <itemizedlist>
-          <listitem><para>The <guimenu>Applications</guimenu> menu allows you
-          to access all of the applications installed on your system.  The
-          applications are categorized for easier access.  For example, the
-          <application>Sound Juicer CD Ripper</application> is located under
-          the <guimenu>Multimedia</guimenu> submenu.</para>
-          <para>The <guimenu>Applications</guimenu> also provides access to
-          the <application>Run Application</application> dialog.  This dialog
-          allows you to run any program installed on your system, regardless
-          of whether it appears in the menus.  See <xref linkend="tools-run-app"/>
-          for more information.</para></listitem>
-
-            <listitem><para><guimenu>Actions</guimenu> menu: Contains various
-            commands that perform various functions, for example
-            <guimenuitem>Search for Files</guimenuitem> and <guimenuitem>Log
-            Out</guimenuitem>.</para></listitem>
-          </itemizedlist>
-          <para>Click on the <guibutton>Window Selector</guibutton> icon at the
-          extreme right of the top edge panel to display a list of all open
-          windows.</para>
-        </listitem>
-      </varlistentry>
--->
   <highlights>
     <para>This chapter describes how to use the panels at the top and bottom of the GNOME Desktop, how to customize the objects that appear on them, and how to add new panels to the desktop.</para>
   </highlights>
@@ -76,11 +47,11 @@
       <variablelist>
       	<varlistentry>
       		<term><application>Menu Bar</application> applet</term>
-      		<listitem><para>The panel menubar contains the <guimenu>Applications</guimenu>, the <guimenu>Places</guimenu>, and the <guimenu>System</guimenu> menu. For more on the menu bar, see <xref linkend="menubar"/>.</para></listitem>
+      		<listitem><para>The Menu Bar contains the <guimenu>Applications</guimenu>, <guimenu>Places</guimenu>, and <guimenu>System</guimenu> menus. For more on the menu bar, see <xref linkend="menubar"/>.</para></listitem>
       	</varlistentry>
       	<varlistentry>
       	  <term>A set of application launcher icons</term>
-          <listitem><para>The exact number of icons depends on your GNOME distribution, but in general you'll find at least a launcher for the <application>Web Browser</application>, a <application>Groupware suite</application> and the <application>Help Browser</application>. Click on any launcher icon to open the corresponding application.</para></listitem>
+          <listitem><para>The exact number of icons depends on your GNOME distribution, but in general you will find at least a launcher for the <application>Web Browser</application>, an <application>Email client</application> and the <application>Help Browser</application>. Click on any launcher icon to open the corresponding application.</para></listitem>
         </varlistentry>
       	<varlistentry>
       	  <term><application>Notification Area</application> applet</term>
@@ -92,13 +63,13 @@
          
         <varlistentry>
           <term><application>Clock</application> applet</term>
-          <listitem><para><application>Clock</application> shows the current
-      time. Click on the time to open a small calendar. For more on this, see the <ulink type="help" url="ghelp:clock">Clock Applet Manual</ulink>.</para></listitem>
+          <listitem><para>The <application>Clock</application> shows the current
+      time. Click on the time to open a small calendar. You can also view a world map by clicking the <guilabel>Locations</guilabel> expansion label. For more on this, see the <ulink type="help" url="ghelp:clock">Clock Applet Manual</ulink>.</para></listitem>
         </varlistentry>
         <varlistentry>
           <term><application>Volume Control</application>
       applet</term>
-          <listitem><para><application>Volume Control</application> enables you to control the volume of the speaker on your system. For more on this, see the <ulink type="help" url="ghelp:gnome-volume-control">Volume Control Manual</ulink>.</para></listitem>
+          <listitem><para>The <application>Volume Control</application> enables you to control the volume of the speakers on your system. For more on this, see the <ulink type="help" url="ghelp:gnome-volume-control">Volume Control Manual</ulink>.</para></listitem>
         </varlistentry>
         <varlistentry>
           <term>
@@ -107,7 +78,7 @@
             <secondary>window list icon</secondary>
           </indexterm>
           <application>Window Selector</application> icon</term>
-          <listitem><para><application>Window Selector</application> lists all your
+          <listitem><para>The <application>Window Selector</application> lists all of your
       open windows. To give focus to a window, click on the window selector icon
       at the extreme right of the top edge panel, then select the window. For more on this, see <xref linkend="windows-focus"/>.</para></listitem>
         </varlistentry>
@@ -135,11 +106,11 @@
       <variablelist>
       	<varlistentry>
       		<term><guibutton>Show Desktop</guibutton> button</term>
-      		<listitem><para>Click on this button to minimize all open windows and show the desktop.</para></listitem>
+      		<listitem><para>Click on this button to minimize all open windows and show the desktop. Click it again to restore all of the windows to their previous state.</para></listitem>
       	</varlistentry>
       	<varlistentry>
       		<term><application>Window List</application> applet</term>
-      		<listitem><para>Displays a button for each window that is open. <application>Window List</application> enables you to minimize and restore windows. For more on this, see <xref linkend="windowlist"/>.</para></listitem>
+      		<listitem><para>Displays a button for each window that is open. The <application>Window List</application> enables you to minimize and restore windows. For more on this, see <xref linkend="windowlist"/>.</para></listitem>
       	</varlistentry>
       	<varlistentry>
       		<term><application>Workspace Switcher</application> applet</term>
@@ -159,10 +130,7 @@
       <secondary>managing</secondary>
     </indexterm>
     <para>The following sections describe how to manage your panels.</para>
-    <para>To interact with a panel, you must click on the vacant space on the panel, rather than any of the objects it holds. You can also middle-click or
-right-click on one of the hide buttons to select the panel, if the panel has
-no vacant space. If the hide buttons are not visible on a panel, modify the
-properties of the panel so that the hide buttons are visible. </para>
+    <para>To interact with a panel, you must click on a vacant space on the panel rather than on any of the objects it holds. If the hide buttons are visible on the panel, you can also middle-click or right-click on one of them to select the panel.</para>
     <section id="gospanel-12">
       <title>Moving a Panel</title>
       <indexterm>
@@ -242,7 +210,7 @@
                   </para>
                 </entry>
                 <entry valign="top">
-                  <para>Select this option if you want the panel to only be fully visible when the mouse pointer is over it. The panel hides off-screen along its principal edge, leaving a narrow part along the edge of the desktop. Move the mouse pointer over the visible part of the panel to make it move fully into the screen.</para>
+                  <para>Select this option if you want the panel to only be fully visible when the mouse pointer is over it. The panel hides off-screen along its longest edge, leaving a narrow part visible along the edge of the desktop. Move the mouse pointer over the visible part of the panel to make it move back into view.</para>
                 </entry>
               </row>
               <row>
@@ -259,7 +227,7 @@
               <row>
                 <entry valign="top">
                   <para>
-                    <guilabel>Arrows on hide button</guilabel>
+                    <guilabel>Arrows on hide buttons</guilabel>
                   </para>
                 </entry>
                 <entry valign="top">
@@ -297,7 +265,7 @@
                   </para>
                 </entry>
                 <entry valign="top">
-                  <para>Select this option to have the panel use the settings in the <link linkend="prefs-theme"><application>Theme</application> preference tool</link>. This keeps your panel's background looking the same as the rest of the desktop and applications.</para>
+                  <para>Select this option to have the panel use the settings in the <link linkend="prefs-theme"><application>Appearance</application> preference tool</link>. This keeps your panel's background looking the same as the rest of the desktop and applications.</para>
                 </entry>
               </row>
               <row>
@@ -324,7 +292,7 @@
                 </entry>
                 <entry valign="top">
                   <para>Select this option to specify an image for the panel
-background. Click on the button to browse for the file. When you have selected the file, click <guibutton>OK</guibutton>. </para>
+background. Click on the button to browse for an image file. When you have selected the file, click <guibutton>OK</guibutton>. </para>
                 </entry>
               </row>
             </tbody>
@@ -364,7 +332,7 @@
         <primary>panels</primary>
         <secondary>hiding</secondary>
       </indexterm>
-      <para>You can hide or show panels. To hide a panel, use a hide button. If
+      <para>You can hide or show a panel if it has hide buttons. If
 the hide buttons are not visible on 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
@@ -379,7 +347,7 @@
           </textobject>
         </mediaobject>
       </screenshot>
-      <para>To hide a panel, click on one of the hide buttons. The panel reduces
+      <para>To hide a panel, click on one of the hide buttons. The panel shrinks
 in the direction of the arrow on the hide button. The hide button at the other
 end of the panel remains visible.</para>
       <para>To show a hidden panel again, click on the visible hide button. The
@@ -388,7 +356,7 @@
       <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 properties of the panel.</para>
+panel to autohide, <link linkend="panel-properties">modify the properties</link> of the panel.</para>
     </section>    
     <section id="gospanel-10">
       <title>Adding a New Panel</title>
@@ -428,7 +396,7 @@
       <see>panel objects</see>
     </indexterm>
     <para>This section describes the objects that
-you can add to your panels, and use from your panels.</para>
+you can add to and use from your panels.</para>
     <section id="gospanel-100">
       <title>Interacting With Panel Objects</title>
       <indexterm>
@@ -524,7 +492,7 @@
       <para>You can add also add any item in the <guimenu>Applications</guimenu> menu to the panel: right-click the menu item and choose <guimenuitem>Add this launcher to panel</guimenuitem>.</para>
 
       <para>Each launcher corresponds to a <filename>.desktop</filename> file. You
-can drag the <filename>.desktop</filename> file on to your panels to add the
+can drag a <filename>.desktop</filename> file on to your panels to add the
 launcher to the panel. </para>
 <!--Each menu corresponds to a directory. You can drag the directory on to your panels to add the directory to the panel as a menu object. Is this still true?-->
 
@@ -540,7 +508,7 @@
       <para>Some panel objects, such as launchers and drawers,
 have a set of associated properties. The properties are different for each
 type of object. The properties specify details such as the following: <itemizedlist><listitem><para>The command that starts a launcher application.</para></listitem><listitem><para>The location of the source files for a menu.</para></listitem><listitem><para>The icon that represents the object.</para></listitem></itemizedlist></para>
-      <para>To modify the properties of an object perform the following steps: </para>
+      <para>To modify the properties of an object, perform the following steps: </para>
       <orderedlist>
         <listitem>
           <indexterm>
@@ -568,8 +536,7 @@
 in step 1. </para>
         </listitem>
         <listitem>
-          <para>Click <guibutton>OK</guibutton> to apply the changes, then
-close the <guilabel>Properties</guilabel> dialog.</para>
+          <para>Close the <guilabel>Properties</guilabel> dialog.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -671,8 +638,8 @@
       <para>You can lock panel objects so that the objects stay in the same position
 on the panel. Use this if you do not want some panel objects
 to change position when you move other panel objects.</para>
-      <para>To lock an object to the current location of the object in the panel,
-right-click on the object to open the panel object popup menu, then select  <guimenuitem>Lock on Panel</guimenuitem>. Deselect this to unlock the object.</para>
+      <para>To lock an object to its current location in the panel,
+right-click on the object to open the panel object popup menu, then select  <guimenuitem>Lock To Panel</guimenuitem>. Deselect this to unlock the object.</para>
     </section>
     <section id="gospanel-33">
       <title>Removing a Panel Object</title>
@@ -680,8 +647,8 @@
         <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
+      <para>To remove an object from a panel, right-click on the object
+to open the panel object popup menu and then choose <guimenuitem>Remove From
 Panel</guimenuitem>. </para>
     </section>
   </section>
@@ -703,8 +670,7 @@
       <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
+user interface resides within a panel. The following figure shows the following
 applets, from left to right: </para>
     <itemizedlist>
       <listitem>
@@ -792,14 +758,13 @@
         </listitem>
         <listitem>
           <para>From any menu</para>
-          <para>To add a launcher to a panel from any menu, perform one of the following
+          <para>To add a launcher to a panel from a menu, perform one of the following
 steps:</para>
           <itemizedlist>
             <listitem><para>Open a menu that contains the launcher. Drag the launcher
 on to the panel. </para></listitem>
-            <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 the menu that contains the launcher and right-click on the title of the launcher.
+Choose <guimenuitem>Add this launcher to panel</guimenuitem>. This method will only work if the launcher is on a sub-menu of the menu that you opened.</para></listitem>
           </itemizedlist>
         </listitem>
         <listitem>
@@ -845,7 +810,7 @@
       <variablelist>
         <varlistentry><term>Type</term>
           <listitem>
-            <para>Use the drop-down list to specify whether this launcher starts an application or opens a document: </para>
+            <para>Use the drop-down list to specify whether this launcher starts an application or opens a location: </para>
             <variablelist>
               <varlistentry><term>Application</term>
                 <listitem>
@@ -854,20 +819,23 @@
               </varlistentry>
               <varlistentry><term>Application in Terminal</term>
                 <listitem>
-                  <para>The launcher starts an application in a terminal.</para>
+                  <para>The launcher starts an application through a terminal window.</para>
                 </listitem>     
               </varlistentry>
-              <varlistentry><term>File</term>
+              <varlistentry><term>Location</term>
                 <listitem>
-                  <para>The launcher opens a file.</para>
-                </listitem>     
+                  <para>The launcher opens a file, web page or other location.</para>
+                </listitem>
               </varlistentry>
             </variablelist>
-          </listitem>     
+            <para>If you are editing a location launcher, this drop-down list 
+          will not be displayed. If you are editing an application launcher, 
+          the <guilabel>Location</guilabel> option will not be available.</para>
+          </listitem>
         </varlistentry>
         <varlistentry><term>Name</term>
           <listitem>
-            <para>This is displayed when you add the launcher to a menu
+            <para>This is the name that is displayed if you add the launcher to a menu
 or to the desktop.</para>
           </listitem>     
         </varlistentry>
@@ -879,31 +847,31 @@
         </varlistentry>
         <varlistentry><term>Location</term>
           <listitem>
-            <para>For a file launcher, specify the location of the file.</para>
+            <para>For a location launcher, specify the location to be opened. 
+            Click <guibutton>Browse</guibutton> to select a location on your 
+            computer, or type a web address to launch a web page. For sample 
+            locations, see <xref linkend="launchers-properties-commands"/></para>
           </listitem>     
         </varlistentry>
         <varlistentry><term>Comment</term>
           <listitem>
             <para>This is displayed  as a tooltip when you point to the
-launcher icon on the panel.  </para>
+launcher icon on the panel.</para>
           </listitem>     
         </varlistentry>
       </variablelist>
       
-      <para>To choose an icon for the launcher, click on the <guibutton>No Icon</guibutton> button. An icon selector dialog is displayed. Choose an icon from the dialog. </para>
+      <para>To choose an icon for the launcher, click on the icon button, which displays a generic icon by default. An icon selector dialog is displayed. Choose an icon from the dialog. </para>
       <para>To change the icon for the launcher, click on the button showing the current icon. An icon selector dialog is displayed. Choose an icon from the dialog. </para>
-      
   
       <section id="launchers-properties-commands">
-        <title>Launcher Commands</title>
+        <title>Launcher Commands and Locations</title>
         <!-- Maintained for backwards compatibility: 2.14 -->
         <anchor id="gospanel-556"/>        
-        <para>The type of commands that you can enter in the <guilabel>Command</guilabel>
-field depend on the option that you choose from the <guilabel>Type</guilabel>
-drop-down combination box. If you choose <guilabel>Application</guilabel>
-from the <guilabel>Type</guilabel> drop-down combination box, you can enter
-a normal command. The following table shows some sample commands and the actions
-that the commands perform:</para>
+        <para>Examples of commands and locations that you can use in the <guilabel>Launcher Properties</guilabel> dialog can be found below.</para>
+        
+        <para>If you choose <guilabel>Application</guilabel> or <guilabel>Application in Terminal</guilabel>
+from the <guilabel>Type</guilabel> drop-down box, the <guilabel>Command</guilabel> text box will be displayed. The following table shows some sample commands and the actions that the commands perform:</para>
         <informaltable frame="topbot">
           <tgroup cols="2" colsep="0" rowsep="0">
             <colspec colname="colspec0" colwidth="47.36*"/>
@@ -932,30 +900,29 @@
               <row>
                 <entry valign="top">
                   <para>
-                    <command>gedit /user123/loremipsum.txt</command>
+                    <command>gedit /home/user/loremipsum.txt</command>
                   </para>
                 </entry>
                 <entry valign="top">
-                  <para>Opens the file <filename>/user123/loremipsum.txt</filename> in the <application>gedit</application> text editor application.</para>
+                  <para>Opens the file <filename>/home/user/loremipsum.txt</filename> in the <application>gedit</application> text editor application.</para>
                 </entry>
               </row>
               <row>
                 <entry colname="colspec0" valign="top">
                   <para>
-                    <command>nautilus /user123/Projects</command>
+                    <command>nautilus /home/user/Projects</command>
                   </para>
                 </entry>
                 <entry colname="colspec1" valign="top">
-                  <para>Opens
-the folder <filename>/user123/Projects</filename> in a file object window.</para>
+                  <para>Opens the folder <filename>/home/user/Projects</filename> in a File Browser window.</para>
                 </entry>
               </row>
             </tbody>
           </tgroup>
         </informaltable>
-        <para>If you choose <guilabel>Link</guilabel> from the <guilabel>Type</guilabel>
-drop-down combination box, you can enter a link command. The following table
-shows some sample link commands and the actions that the commands perform:<indexterm><primary>special URIs</primary><secondary>launchers</secondary></indexterm></para>
+        <para>If you choose <guilabel>Location</guilabel> from the <guilabel>Type</guilabel>
+drop-down box, the <guilabel>Location</guilabel> text box will be displayed. The following table
+shows some sample locations and the actions that will happen if you click on the launcher:<indexterm><primary>special URIs</primary><secondary>launchers</secondary></indexterm></para>
         <informaltable frame="topbot">
           <tgroup cols="2" colsep="0" rowsep="0">
             <colspec colname="colspec0" colwidth="47.36*"/>
@@ -963,7 +930,7 @@
             <thead>
               <row rowsep="1">
                 <entry>
-                  <para>Sample Link Command</para>
+                  <para>Sample Location</para>
                 </entry>
                 <entry>
                   <para>Action</para>
@@ -974,120 +941,47 @@
               <row>
                 <entry colname="colspec0" valign="top">
                   <para>
-                    <command>http://www.gnome.org</command>
+                    <command>file:///home/user/loremipsum.txt</command>
                   </para>
                 </entry>
                 <entry colname="colspec1" valign="top">
-                  <para>Opens
-the GNOME website in your default browser.</para>
-                </entry>
-              </row>
-              <row>
-                <entry valign="top">
-                  <para>
-                    <command>ftp://ftp.gnome.org</command>
-                  </para>
-                </entry>
-                <entry valign="top">
-                  <para>Opens the GNOME FTP site in your default browser. </para>
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable>
-
-        <!-- This table is mostly copied from http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html. Last update is from 1.1-draft specification. -->        
-        <para>The command can contain the following special codes which will be replaced with the value specified in the following table:</para>
-        <informaltable>
-          <tgroup cols="2" colsep="0" rowsep="0">
-            <colspec colname="colspec0" colwidth="47.36*"/>
-            <colspec colname="colspec1" colwidth="52.64*"/>
-            <thead>
-              <row rowsep="1">
-                <entry>
-                  <para>Code</para>
-                </entry>
-                <entry>
-                  <para>Meaning</para>
-                </entry>
-              </row>        
-            </thead>
-            <tbody>
-              <row>
-                <entry valign="top">
-                  <para>
-                    <command>%f</command>
-                  </para>
-                </entry>
-                <entry valign="top">
-                  <para>A single file name, even if multiple files are selected. If the program in question cannot handle multiple file arguments, the system reading the desktop entry will probably spawn and execute multiple copies of the program for each selected file.</para> 
-                  <para>If files are not on the local file system (i.e. are on HTTP or FTP locations), the files will be copied to the local file system and %f will be expanded to point at the temporary file. Used for programs that do not understand the URL syntax.</para>
-                </entry>
-              </row>
-              <row>
-                <entry valign="top">
-                  <para>
-                    <command>%F</command>
-                  </para>
-                </entry>
-                <entry valign="top">
-                  <para>A list of files. Use for applications that can open several local files at once. Each file is passed as a separate argument to the executable program. </para>
-                </entry>
-              </row>
-              <row>
-                <entry valign="top">
-                  <para>
-                    <command>%u</command>
-                  </para>
-                </entry>
-                <entry valign="top">
-                  <para>A single URL. Local files may either be passed as file: URLs or as file path.</para>
-                </entry>
-              </row>
-              <row>
-                <entry valign="top">
-                  <para>
-                    <command>%U</command>
-                  </para>
-                </entry>
-                <entry valign="top">
-                  <para>A list of URLs. Each URL is passed as a separate argument to the executable program. Local files may either be passed as file: URLs or as file path.</para>
+                  <para>Opens the file <filename>/home/user/loremipsum.txt</filename> 
+                  in the default viewer for its file type.</para>
                 </entry>
               </row>
               <row>
                 <entry valign="top">
                   <para>
-                    <command>%i</command>
+                    <command>file:///home/user/Projects</command>
                   </para>
                 </entry>
                 <entry valign="top">
-                  <para>The Icon key of the desktop entry expanded as two arguments, first --icon and then the value of the Icon key. It does not expand to any arguments if the Icon key is empty or missing.</para>
+                  <para>Opens the folder <filename>/home/user/Projects</filename> in a File Browser window.</para>
                 </entry>
               </row>
               <row>
                 <entry valign="top">
                   <para>
-                    <command>%c</command>
+                    <command>http://www.gnome.org</command>
                   </para>
                 </entry>
                 <entry valign="top">
-                  <para>The translated name of the application as listed in the appropriate Name key in the desktop entry.</para>
+                  <para>Opens the GNOME website in your default browser.</para>
                 </entry>
               </row>
               <row>
                 <entry valign="top">
                   <para>
-                    <command>%k</command>
+                    <command>ftp://ftp.gnome.org</command>
                   </para>
                 </entry>
                 <entry valign="top">
-                  <para>The location of the desktop file as either a URI (if for example gotten from the vfolder system) or a local filename or empty if no location is known.</para>
+                  <para>Opens the GNOME FTP site in your default browser. </para>
                 </entry>
               </row>
-            </tbody>  
-          </tgroup>                  
+            </tbody>
+          </tgroup>
         </informaltable>
-        <para>These are as defined by freedesktop.org's <ulink type="http" url="http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html";>Desktop Entry Specification</ulink>.</para>
       </section>
     </section>    
   </section>
@@ -1133,12 +1027,18 @@
           </textobject>
         </mediaobject>
       </screenshot>
-      <para>The <guibutton>Force Quit</guibutton> button enables you to select a
-window to terminate an application. This button is useful if you want to terminate
-an application that does not respond to your commands. </para>
+      <para>The <guibutton>Force Quit</guibutton> button allows you to click on 
+      a window to force an application to quit. This button is useful if you 
+      want to terminate an application that does not respond to your commands, 
+      if the application has frozen or crashed, for example.</para>
+      <para>To add a <guibutton>Force Quit</guibutton> button to a panel, right-click
+on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then 
+choose <application>Force Quit</application> from the Add to Panel dialog. 
+See <xref linkend="panels-addobject"/> for more on this.</para>
       <para>To terminate an application, click on the <guibutton>Force Quit</guibutton>
 button, then click on a window from the application that you want to terminate.
-If you do not want to terminate an application after you click on the <guibutton>Force Quit</guibutton> button, press <keycap>Esc</keycap>.</para>
+If you do not want to terminate an application after you have clicked on the 
+<guibutton>Force Quit</guibutton> button, press <keycap>Esc</keycap>.</para>
     </section>
     <section id="panel-lock-screen">
       <title>Lock Screen Button</title>
@@ -1168,8 +1068,8 @@
       <indexterm>
         <primary>locking screen</primary>
       </indexterm>
-      <para>The <guibutton>Lock Screen</guibutton>
-button locks your screen and activates your screensaver. To access your session
+      <para>The <guibutton>Lock Screen</guibutton> button locks your screen 
+      and activates your screensaver when you click on it. To access your session
 again, you must enter your password.</para>
       <para>To add a <guibutton>Lock Screen</guibutton> button to a panel, right-click
 on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then choose <application>Lock Screen</application> from the Add to Panel dialog. See <xref linkend="panels-addobject"/> for more on this.</para>
@@ -1252,11 +1152,15 @@
       <indexterm>
         <primary>Log Out button</primary>
       </indexterm>
-      <para>The <guibutton>Log Out</guibutton> button begins the process to log out of
-a GNOME session. </para>
+      <para>The <guibutton>Log Out</guibutton> button allows you to log out of
+a GNOME session or switch to a different user account.</para>
       <para>To add a <guibutton>Log Out</guibutton> button to a panel, right-click
-on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Log Out</guimenuitem></menuchoice>. To log out of your session or shut down your system, click
-on the <guibutton>Log Out</guibutton> button. </para>
+on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then 
+choose <application>Log Out</application> from the Add to Panel dialog. 
+See <xref linkend="panels-addobject"/> for more on this.</para>
+      <para>To log out of your session or switch users, click on the 
+      <guibutton>Log Out</guibutton> button and then click on the appropriate 
+      button in the dialog that appears. </para>
     </section>
     <section id="gospanel-555">
       <title>Run Button</title>
@@ -1281,44 +1185,17 @@
       <indexterm>
         <primary>Run button</primary>
       </indexterm>
-      <para>You
-can use the <guibutton>Run</guibutton> button to open the <guilabel>Run Application</guilabel> dialog. </para>
-      <para>To add a <guibutton>Run</guibutton> button to a panel, right-click on
-any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Run</guimenuitem></menuchoice>. To open the <guilabel>Run Application</guilabel> dialog, click
-on the <guibutton>Run</guibutton> button. </para>
+      <para>The <guibutton>Run</guibutton> button opens the 
+      <guilabel>Run Application</guilabel> dialog, which allows you to start an 
+      application by choosing it from a list. </para>
+      <para>To add a <guibutton>Run</guibutton> button to a panel, right-click
+on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then 
+choose <application>Run Application</application> from the Add to Panel dialog. 
+See <xref linkend="panels-addobject"/> for more on this.</para>
+      <para>To open the <application>Run Application</application> dialog, click 
+      on the <guibutton>Run</guibutton> button. </para>
       <para>For more information on the <guilabel>Run Application</guilabel> dialog,
-see <citetitle>Working With Menus</citetitle>.</para>
-    </section>
-    <section id="gospanel-553">
-      <title>Screenshot Button</title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/screenshot_button.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Screenshot icon.</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-      <indexterm>
-        <primary>buttons</primary>
-        <secondary>Screenshot</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>panel objects</primary>
-        <secondary>Screenshot button</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>Screenshot button</primary>
-      </indexterm>
-      <para>You can use the <guibutton>Screenshot</guibutton> button to take a screenshot
-of your screen. </para>
-      <para>To add a <guibutton>Screenshot</guibutton> button to a panel, right-click
-on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Screenshot</guimenuitem></menuchoice>. To take a screenshot of your screen, click on
-the <guibutton>Screenshot</guibutton> button.</para>
-      <para>For more information on how to take screenshots, see <citetitle>Working
-With Menus</citetitle>.</para>
+see <xref linkend="gospanel-23"/>.</para>
     </section>
     <section id="gospanel-554">
       <title>Search Button</title>
@@ -1343,27 +1220,29 @@
       <indexterm>
         <primary>Search button</primary>
       </indexterm>
-      <para>You can use the <guibutton>Search</guibutton> button to open the <application>Search Tool</application>. </para>
+      <para>The <guibutton>Search</guibutton> button opens the 
+      <application>Search Tool</application>, which allows you to search for 
+      files on your computer. </para>
       <para>To add a <guibutton>Search</guibutton> button to a panel, right-click
-on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Search</guimenuitem></menuchoice>. To open the <application>Search Tool</application>, click on
+on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then choose <application>Search for Files</application> from the Add to Panel dialog. See <xref linkend="panels-addobject"/> for more on this.</para>
+      <para>To open the <application>Search Tool</application>, click on
 the <guibutton>Search</guibutton> button. </para>
       <para>For more information on the <application>Search Tool</application>,
 see the <ulink type="help" url="ghelp:gnome-search-tool">Search Tool Manual</ulink>.</para>
     </section>
     <section id="gospanel-564">
-      <title>Show Desktop 
-Button</title>
+      <title>Show Desktop Button</title>
       <indexterm>
         <primary>buttons</primary>
-        <secondary>Minimise Windows</secondary>
+        <secondary>Minimize Windows</secondary>
       </indexterm>
       <indexterm>
         <primary>panel objects</primary>
-        <secondary>Minimise
+        <secondary>Minimize
 Windows button</secondary>
       </indexterm>
       <indexterm>
-        <primary>Minimise Windows
+        <primary>Minimize Windows
 button</primary>
       </indexterm>
       <screenshot>
@@ -1377,9 +1256,13 @@
         </mediaobject>
       </screenshot>
       <para>You can use the <guibutton>Show Desktop</guibutton> button to minimize all open windows and show the desktop.</para>
-      <para>To add a <guibutton>Show Desktop</guibutton> button to a panel, right-click on any vacant
-space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Show Desktop</guimenuitem></menuchoice>. To minimize all windows and show the desktop,
-click on the <guibutton>Show Desktop</guibutton> button. </para>
+      <para>To add a <guibutton>Show Desktop</guibutton> button to a panel, right-click
+on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then 
+choose <application>Show Desktop</application> from the Add to Panel dialog. 
+See <xref linkend="panels-addobject"/> for more on this.</para>
+      <para>To minimize all windows and show the desktop, click on the 
+      <guibutton>Show Desktop</guibutton> button. To restore all windows to 
+      their previous state, click it again.</para>
     </section>
   </section>
   <section id="panel-menus">
@@ -1399,25 +1282,30 @@
     <para>You can add the following types of menu to your panels: </para>
     <itemizedlist>
       <listitem>
-        <para><guimenu>Main Menu</guimenu>: You can access almost all of
-the standard applications, commands, and configuration options from the <guimenu>Main Menu</guimenu>. To add a <guimenu>Main Menu</guimenu> to a panel, right-click
-on any vacant space on the panel, then choose <menuchoice><guimenu>Add to
-Panel</guimenu><guimenuitem>Main Menu</guimenuitem></menuchoice>.
-You can add as many <guimenu>Main Menu</guimenu> objects to your panels as
-you want. </para>
+        <para><guimenu>Menu Bar</guimenu>: You can access almost
+all of the standard applications, commands, and configuration options from
+the menus in the Menu Bar. It contains the <guimenu>Applications</guimenu>, 
+<guimenu>Places</guimenu>, and <guimenu>System</guimenu> menus.</para>
+        <para>To add a <guimenu>Menu Bar</guimenu> to a panel, right-click
+on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then 
+choose <application>Menu Bar</application> from the Add to Panel dialog. 
+See <xref linkend="panels-addobject"/> for more on this.</para>
       </listitem>
       <listitem>
-        <para><application>Menu Bar</application>: You can access almost
-all of the standard applications, commands, and configuration options from
-the menus in the <application>Menu Bar</application>. The <application>Menu
-Bar</application> contains the <guimenu>Applications</guimenu> menu and the <guimenu>Actions</guimenu> menu. To add a <application>Menu Bar</application> to a
-panel, right-click on any vacant space on the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Menu Bar</guimenuitem></menuchoice>. You can add as many <application>Menu Bar</application> objects
-to your panels as you want. </para>
+        <para><guimenu>Main Menu</guimenu>: The Main Menu contains the same 
+        items as the Menu Bar, but organizes them into one menu instead of three. 
+        It takes up less space on the panels as a result.</para>
+        <para>To add a <guimenu>Main Menu</guimenu> to a panel, right-click
+on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then 
+choose <application>Main Menu</application> from the Add to Panel dialog. 
+See <xref linkend="panels-addobject"/> for more on this.</para>
       </listitem>
       <listitem>
-        <para>System menus: System menus contain the standard applications
-and tools that you can use in the GNOME Desktop. The <guimenu>Applications</guimenu> 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>
+        <para><guimenu>Submenus</guimenu>: You can add a submenu of the Menu Bar 
+        or Main Menu directly to the panel. For example, you can add the <guimenu>Games</guimenu> 
+        submenu of the <guimenu>Applications</guimenu> menu to the panel.</para>
+        <para>To add a submenu to a panel, open the submenu, right-click on a launcher, then choose 
+<menuchoice><guimenu>Entire menu</guimenu><guimenuitem>Add this as menu to panel</guimenuitem></menuchoice>. </para>
       </listitem>
     </itemizedlist>
 
@@ -1431,8 +1319,8 @@
     </indexterm>
     <para>A drawer is an extension of a panel. You
 can open and close a drawer in the same way that you can show and hide a panel.
-A drawer can contain all panel objects, including launchers, menus, applets,
-other panel objects, and other drawers. When you open a drawer, you can use
+A drawer can contain all panel objects, including launchers, menus, applets, 
+and other drawers. When you open a drawer, you can use
 the objects in the same way that you use objects on a panel. </para>
     <para>The following figure shows an open drawer that contains two panel objects. </para>
     <screenshot>
@@ -1445,7 +1333,7 @@
         </textobject>
       </mediaobject>
     </screenshot>
-    <para>The arrow on the drawer icon indicates that the icon represents a drawer
+    <para>The arrow on the icon indicates that it represents a drawer
 or menu.</para>
     <para>You can add, move, and remove objects from drawers in the same way that
 you add, move, and remove objects from panels. </para>
@@ -1505,13 +1393,14 @@
         <primary>drawers</primary>
         <secondary>modifying properties</secondary>
       </indexterm>
-      <para>You can modify properties for each individual drawer. You
-can change features for each drawer, such as the visual appearance of the
-drawer and whether the drawer has hide buttons.</para>
+      <para>You can modify the properties of each drawer individually. For 
+      example, you can change the visual appearance of the drawer and whether 
+      it has hide buttons.</para>
       <para>To modify properties for a drawer perform the following steps: </para>
       <orderedlist>
         <listitem>
-          <para>Right-click on the drawer, then choose <guimenuitem>Properties</guimenuitem> to display the <guilabel>Panel Properties</guilabel> dialog.
+          <para>Right-click on the drawer, then choose 
+          <guimenuitem>Properties</guimenuitem> to display the <guilabel>Drawer Properties</guilabel> dialog.
 The dialog displays the <guilabel>General</guilabel> tabbed section.</para>
         </listitem>
         <listitem>
@@ -1535,22 +1424,11 @@
                 <row>
                   <entry colname="colspec0">
                     <para>
-                      <guilabel>Name</guilabel>
-                    </para>
-                  </entry>
-                  <entry colname="colspec1">
-                    <para>Type a name for the panel. When you use shortcut
-keys to switch between your panels and the desktop, this panel name is displayed.</para>
-                  </entry>
-                </row>
-                <row>
-                  <entry valign="top">
-                    <para>
                       <guilabel>Size</guilabel>
                     </para>
                   </entry>
-                  <entry valign="top">
-                    <para>Select the size of the panel.</para>
+                  <entry colname="colspec1">
+                    <para>Specify the width of the drawer when it is open.</para>
                   </entry>
                 </row>
                 <row>
@@ -1562,8 +1440,7 @@
                   <entry colname="colspec1">
                     <para>Choose an icon to represent the drawer. Click
 on the <guibutton>Icon</guibutton> button to display an icon selector dialog.
-Choose an icon from the dialog. Alternatively, click <guibutton>Browse</guibutton>
-to choose an icon from another directory. When you choose an icon, click <guibutton>OK</guibutton>.</para>
+Choose an icon from the dialog and click <guibutton>OK</guibutton> to confirm your choice.</para>
                   </entry>
                 </row>
                 <row>
@@ -1574,18 +1451,18 @@
                   </entry>
                   <entry valign="top">
                     <para>Select this option to display hide buttons on your
-panel.</para>
+drawer. When you click one of the buttons, the drawer will close.</para>
                   </entry>
                 </row>
                 <row>
                   <entry valign="top">
                     <para>
-                      <guilabel>Arrows on hide button</guilabel>
+                      <guilabel>Arrows on hide buttons</guilabel>
                     </para>
                   </entry>
                   <entry valign="top">
                     <para>Select this option to display arrows on the hide
-buttons, if the hide button is enabled.</para>
+buttons, if the hide buttons are enabled.</para>
                   </entry>
                 </row>
               </tbody>
@@ -1594,12 +1471,12 @@
         </listitem>
         <listitem>
           <para>You can use the <guilabel>Background</guilabel> tabbed section
-to set the background for the drawer. For information on how to complete the <guilabel>Background</guilabel> tabbed section, see the step on this topic in <xref linkend="panel-properties"/>. You can also drag a color or image on to a drawer
+to set the background for the drawer. For information on how to complete the <guilabel>Background</guilabel> tabbed section, see <xref linkend="panel-properties"/>. 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="panel-properties-background"/>.</para>
         </listitem>
         <listitem>
-          <para>Click <guibutton>Close</guibutton> to close the <guilabel>Panel Properties</guilabel> dialog.</para>
+          <para>Click <guibutton>Close</guibutton> to close the <guilabel>Drawer Properties</guilabel> dialog.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -1638,7 +1515,7 @@
       </screenshot>
       <para>To give focus to a window, select the window from the <application>Window Selector</application> applet.</para>
       <para>The <application>Window Selector</application> lists the windows in
-all workspaces. The windows in all workspaces other than the current workspace,
+all workspaces. The windows in all workspaces other than the current workspace 
 are listed under a separator line.</para>
     </section>  
 
@@ -1674,40 +1551,10 @@
 a CD, a CD icon is displayed in the <application>Notification Area</application>
 applet. The graphic above illustrates the CD icon in the <application>Notification
 Area</application> applet. </para>
-      <para>To add a <application>Notification Area</application> applet to a panel,
-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 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>System</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 <guimenuitem>Add to Panel</guimenuitem> and choose <guilabel>Main Menu</guilabel> from the <link linkend="panels-addobject"><guilabel>Add to Panel</guilabel></link> dialog.</para>
-      </section>
-    </section>
     <section id="goseditmainmenu-65">
-      <title>Menu Bar panel object</title>
+      <title>Menu Bar</title>
       <screenshot>
         <mediaobject>
           <imageobject>
@@ -1718,30 +1565,20 @@
           </textobject>
         </mediaobject>
       </screenshot>
-      <para>The <application>Menu Bar</application> provides access to the panel menubar, which contains the <guimenu>Applications</guimenu>, <guimenu>Places</guimenu>, and <guimenu>System</guimenu> menus. You can access
+      <para>The <application>Menu Bar</application> contains the 
+      <guimenu>Applications</guimenu>, <guimenu>Places</guimenu>, and 
+      <guimenu>System</guimenu> menus. You can access
   almost all of the standard applications, commands, and configuration options
-  from the <application>Menu Bar</application>. For more on using the panel menubar, see <xref linkend="menubar"/>.</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 <guimenuitem>Add to Panel</guimenuitem> and choose <guilabel>Menu Bar</guilabel> from the <link linkend="panels-addobject"><guilabel>Add to Panel</guilabel></link> dialog.</para>
-      </section>
+  from the <application>Menu Bar</application>. For more on using the Menu Bar, see <xref linkend="menubar"/>.</para>
     </section>
 
-
-
 <!-- This has been pasted from the Window List manual so that the Window List applet help is integrated into the GUG. -->
 <!-- This section needs gross refactoring (making task-based for starters) -->
 
  <section id="windowlist">
   <title>Window List</title>
 
-	 <para>The <application>Window List</application> applet enables you to manage the windows that are open on the GNOME desktop. <application>Window List</application> uses a button to represent each window or group of windows that is open. The state of the buttons in the applet varies depending on the state of the window that the button represents. The following table explains the possible states of the <application>Window List</application> buttons.</para>
+	 <para>The <application>Window List</application> applet enables you to manage the windows that are open on the GNOME desktop. Window List uses a button to represent each window or group of windows that is open. The state of the buttons in the applet varies depending on the state of the window that the button represents. The following table explains the possible states of the <application>Window List</application> buttons.</para>
 	<informaltable>
 	<tgroup cols="2">
 	<colspec colname="col1"/>
@@ -1754,15 +1591,15 @@
 	</thead>
 	<tbody>
 	<row valign="top">
-	<entry colname="col1"><para>Button is pressed in.</para></entry>
+	<entry colname="col1"><para>The button is pressed in.</para></entry>
 	<entry colname="col2"><para>The window has focus.</para></entry>
 	</row>
 	<row valign="top">
-	<entry colname="col1"><para>The button appears faded.</para></entry>
+	<entry colname="col1"><para>The button appears faded. The button text is surrounded by square brackets.</para></entry>
 	<entry colname="col2"><para>The window is minimized.</para></entry>
 	</row> 
 	<row valign="top">
-	<entry colname="col1"><para>Button is not pressed in, and is not faded.</para></entry>
+	<entry colname="col1"><para>The button is not pressed in, and is not faded.</para></entry>
 	<entry colname="col2"><para>The window is displayed on the desktop and is not minimized.</para></entry>
 	</row>
 	<row valign="top">
@@ -1773,8 +1610,6 @@
 	</tgroup>
 	</informaltable>
 
-
-
 <!-- ================ Usage ================================ -->
   <section id="windowlist-usage"> 
 	 <title>Usage</title> 
@@ -1782,29 +1617,36 @@
 	<itemizedlist>
 	<listitem>
 	<para>To give focus to a window</para>
-	<para>If you click on the <application>Window List</application> button that represents a window that is on the desktop but does not have focus, the applet gives focus to the window. </para>
+	<para>If you click on the Window List button that represents a window that is on the desktop but does not have focus, the applet gives focus to the window. </para>
 	</listitem>
 	<listitem>
 	<para>To minimize a window</para>
-	<para>If you click on the <application>Window List</application> button that represents the window that has focus, the applet minimizes the window. </para>
+	<para>If you click on the Window List button that represents the window that has focus, the applet minimizes the window. </para>
 	</listitem>
 	<listitem>
 	<para>To restore a minimized window</para>
-	<para>If you click on the <application>Window List</application> button that represents a minimized window, the applet restores the window.</para>
+	<para>If you click on the Window List button that represents a minimized window, the applet restores the window.</para>
 	</listitem>
 	</itemizedlist>
+	
+	<para>You can change the order of the Window List buttons by dragging a button to a different location on the Window List.</para>
+	
   </section>
 <!-- ============= Preferences ============================= -->
   <section id="windowlist-prefs"> 
 	 <title>Preferences</title> 
-	 <para>To configure <application>Window List</application>, right-click on the handle on the left of the buttons, then choose <guimenuitem>Preferences</guimenuitem>. The <guilabel>Window List Preferences</guilabel> dialog contains two tabbed sections.</para>
-
-  <section id="windowlist-prefs-behavior"> 
-	 <title>Behavior</title> 
+	 <para>To configure the <application>Window List</application>, right-click 
+	 on the handle to the left of the window buttons, then choose <guimenuitem>Preferences</guimenuitem>. 
+	 The following preferences can be changed:</para>
+    
+    <!-- Maintained for compatibility -->
+    <anchor id="windowlist-prefs-behavior"/>
+    <anchor id="windowlist-prefs-size"/>
+    
 	 <variablelist>
 	 <varlistentry><term><guilabel>Window List Content</guilabel> </term>
 	 <listitem>
-	 <para>To specify which windows to display in <application>Window List</application>, select one of the following options: </para>
+	 <para>To specify which windows to display in the Window List, select one of the following options: </para>
 	 	<itemizedlist>
 	 	<listitem>
 	 	<para><guilabel>Show windows from current workspace</guilabel></para>
@@ -1816,62 +1658,44 @@
 	 	</itemizedlist>
 	 </listitem>
 	 </varlistentry>
+	 
 	 <varlistentry><term><guilabel>Window Grouping</guilabel> </term>
 	 <listitem>
-	 <para>To specify when <application>Window List</application> groups windows that belong to the same process, select one of the following options: </para>
+	 <para>To specify when the Window List should group windows that belong to the same application, select one of the following options: </para>
 		<itemizedlist>
 	 	<listitem>
 	 	<para><guilabel>Never group windows</guilabel></para>
-	 	<para>Select this option to never group windows of the same process under one <application>Window List</application> button.</para>
+	 	<para>Select this option to never group windows of the same application under one button.</para>
 		</listitem>
 	 	<listitem>
 	 	<para><guilabel>Group windows when space is limited</guilabel></para>
-	 	<para>Select this option to group windows of the same process under one <application>Window List</application> button when the space on the panel is restricted.</para>
+	 	<para>Select this option to group windows of the same application under one button when the space on the panel is restricted.</para>
 		</listitem>
 	 	<listitem>
 	 	<para><guilabel>Always group windows</guilabel></para>
-	 	<para>Select this option to always group windows of the same process under one <application>Window List</application> button.</para>
+	 	<para>Select this option to always group windows of the same application under one button.</para>
 		</listitem>
 		</itemizedlist>
 	 </listitem>
 	 </varlistentry>
+	 
 	 <varlistentry><term><guilabel>Restoring Minimized Windows</guilabel> </term>
 	 <listitem>
-	 <para>To define how <application>Window List</application> behaves when you restore windows, select one of the following options: </para>
+	 <para>To define how the Window List behaves when you restore windows, select one of the following options.</para>
 	 	<itemizedlist>
 	 	<listitem>
 	 	<para><guilabel>Restore to current workspace</guilabel></para>
 	 	<para>Select this option to restore a window from the applet to the current workspace, even if the window did not previously reside in the current workspace.</para>
 	 	</listitem>
 	 	<listitem><para><guilabel>Restore to native workspace</guilabel></para>
-	 	<para>Select this option to switch to the native workspace in which a window resides when you restore the window from the applet. </para>
+	 	<para>Select this option to switch to the workspace in which a window originally resided when you restore the window from the applet. </para>
 	 	</listitem>
 	 	</itemizedlist>
+	 <para>These options are only available if <guilabel>Show windows from all workspaces</guilabel> is selected in the <guilabel>Window List Content</guilabel> section of the dialog.</para>
 	 </listitem>
 	 </varlistentry>
 	 </variablelist>
-  </section>
 
-  <section id="windowlist-prefs-size"> 
-	 <title>Size</title> 
-	 <variablelist>
-	 <varlistentry><term><guilabel>Window List Size</guilabel> </term>
-	 <listitem>
-	 <para>The size of the <application>Window List</application> applet varies depending on the size of the panel in which the applet resides. Use the following spin boxes to set limitations on the size of the applet:</para>
-		<itemizedlist>
-	 	<listitem>
-	 	<para><guilabel>Minimum size ... pixels</guilabel></para>
-	 	<para>Use the spin box to specify the minimum size of the applet. If the panel is smaller than the minimum size specified, the panel adjusts in size to fit the applet.</para>
-		</listitem>
-	 	<listitem>
-	 	<para><guilabel>Maximum size ... pixels</guilabel></para>
-	 	<para>Use the spin box to specify the maximum size of the applet.</para>
-		</listitem>
-		</itemizedlist>
-	 </listitem>
-	 </varlistentry>
-	 </variablelist>
-  </section>
   </section>
  </section>
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]