2.0.1 updates.

1 files changed, 102 insertions, 124 deletions

diff --git a/gnome2-user-guide/C/gosdeskback.xml b/gnome2-user-guide/C/gosdeskback.xml
index c36aaf4..daab51a 100644
--- a/gnome2-user-guide/C/gosdeskback.xml
+++ b/gnome2-user-guide/C/gosdeskback.xml
@@ -20,10 +20,10 @@ background:</para>
 <listitem><para>Start your applications, and open your files and folders. 
 </para>
 <para>You can add desktop background objects for convenient access to files,
-folders, and applications that you use frequently. For example, you can create
-a symbolic link to a file that you use often, then add this link to your desktop
-background. You can also store files and folders on the desktop background.
-</para></listitem>
+folders, and applications that you use frequently. For example, you can add
+an application launcher to the desktop background. You can create a symbolic
+link to a file that you use often, then add this link to your desktop background.
+You can also store files and folders on the desktop background.</para></listitem>
 <listitem><para>Open the <guimenu>Desktop Background</guimenu> menu.</para>
 <para>Right-click on the desktop background to open the <guimenu>Desktop Background
 </guimenu> menu. You can use the <guimenu>Desktop Background</guimenu> menu
@@ -35,24 +35,10 @@ Trash</guilabel>.</para></listitem>
 <para>You can customize the pattern or color of the desktop background.</para>
 </listitem>
 </itemizedlist>
-<para>By default, your desktop background contains three objects. <xref linkend="gosdeskback-fig-12"/>
+<para>By default, your desktop background contains three objects. The following figure 
 shows the desktop background with the default objects.</para>
-<figure id="gosdeskback-fig-12">
-<title>Desktop Background with Default Objects</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_desktop.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows desktop with default desktop background objects.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="gosdeskback-tbl-84"/> describes the functions of the default
-objects on the desktop background.</para>
+<para><xref linkend="gosdeskback-tbl-84"/> describes the functions
+of the default objects on the desktop background.</para>
 <table frame="topbot" id="gosdeskback-tbl-84">
 <title>Functions of Default Desktop Background Objects</title>
 <tgroup cols="3" colsep="0" rowsep="0"><colspec colname="colspec2" colwidth="35.94*"/>
@@ -75,7 +61,7 @@ Shows Nautilus home location icon.</phrase>
   </textobject>
 </mediaobject>
 </screenshot></entry><entry valign="top"><para><guilabel>
-Home</guilabel> location</para></entry><entry valign="top"><para>Opens a <application>
+Home</guilabel></para></entry><entry valign="top"><para>Opens a <application>
 Nautilus</application> window, and displays your home location in the view
 pane.</para></entry></row>
 <row><entry colname="colspec2" valign="top"><screenshot>
@@ -91,8 +77,7 @@ Shows Nautilus Start Here icon.</phrase>
 </screenshot></entry><entry colname="colspec0"
 valign="top"><para><guilabel>Start Here</guilabel></para></entry><entry colname="colspec1"
 valign="top"><para>Provides an access point to some of the key features of
-the GNOME desktop. For more information, see <xref linkend="gosnautilus-445"/>.
-</para></entry></row>
+the GNOME desktop. </para></entry></row>
 <row><entry colname="colspec2" valign="top"><screenshot>
 <mediaobject>
   <imageobject>
@@ -142,11 +127,11 @@ manages the desktop background perform the following steps:</para>
 </application> window is displayed. </para></listitem>
 <listitem><para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
 Preferences</guimenuitem></menuchoice>. A <guilabel>Preferences</guilabel>
-dialog is displayed. Choose <guilabel>Windows &amp; Desktop</guilabel> from
+dialog is displayed. Choose <guilabel>Desktop &amp; Trash</guilabel> from
 the <guilabel>Preferences</guilabel> dialog.</para></listitem>
 <listitem><para>Select the <guilabel>Use Nautilus to draw the desktop</guilabel>
 option.</para></listitem>
-<listitem><para>Click <guibutton>OK</guibutton> to close the dialog.</para>
+<listitem><para>Click <guibutton>Close</guibutton> to close the dialog.</para>
 </listitem>
 </orderedlist>
 <para>To set up <application>Nautilus</application> so that <application>
@@ -172,15 +157,13 @@ objects</secondary></indexterm><para>A desktop background object is an icon
 on your desktop background that you can use to open your files, folders, and
 applications. All objects on your desktop background reside in the desktop
 background directory. When you move objects to the desktop background, the
-objects are moved to this directory. By default, the desktop background directory
-is <filename>/.nautilus/desktop</filename>. You can also use your home directory
-as the desktop background directory. For more information, see <xref linkend="gosnautilus-55"/>.
-</para>
+objects are moved to this directory. You can also use your home directory
+as the desktop background directory. </para>
 <para>By default, your desktop background contains three objects. You can
 also add objects to your desktop background to provide convenient access to
 files, folders, and applications that you use frequently. For example, you
-can add a symbolic link to your desktop background to enable you to open a
-particular folder that you use often. </para>
+can add a launcher to your desktop background to enable you to open a particular
+application that you use often. </para>
 <para><xref linkend="gosdeskback-tbl-86"/> describes the types of object that
 you can add to your desktop.</para>
 <table frame="topbot" id="gosdeskback-tbl-86">
@@ -199,14 +182,13 @@ the file or folder that the symbolic link points to is opened. You can move
 or copy a symbolic link to the desktop background.</para><para>You can identify
 symbolic links by the default arrow emblem that appears on all symbolic links.
 </para></entry></row>
-<row><entry colname="colspec0" valign="top"><para>Nautilus link</para></entry>
-<entry valign="top"><para>A Nautilus link is a file that contains the following
-information:</para><itemizedlist>
-<listitem><para>A command to run when the object is chosen.</para></listitem>
-<listitem><para>An icon that represents the object.</para></listitem>
-</itemizedlist><para>When you choose a Nautilus link from the desktop background,
-the command specified in the Nautilus link file is executed.</para></entry>
-</row>
+<row><entry colname="colspec0" valign="top"><para>Launcher</para></entry>
+<entry valign="top"><para>You can add the following types of launcher to the
+desktop background:</para><itemizedlist>
+<listitem><para>Application: Starts a particular application.</para></listitem>
+<listitem><para>Link: Links to  a particular file, folder, or URL.</para>
+</listitem>
+</itemizedlist></entry></row>
 <row><entry colname="colspec0" valign="top"><para>File</para></entry><entry
 valign="top"><para>You can add files to your desktop background. Files on
 your desktop background reside in your desktop background directory. </para></entry>
@@ -228,8 +210,6 @@ on your desktop background reside in your desktop background directory.</para></
 <listitem><para>Resize the icon that represents the object.</para></listitem>
 <listitem><para>Add an emblem to the object.</para></listitem>
 </itemizedlist>
-<para>For more information on how to modify desktop background objects, see <xref
-linkend="gosnautilus-1"/>.</para>
 <para>The following sections describe how to work with objects on the desktop
 background.</para>
 <sect2 id="gosdeskback-30">
@@ -237,15 +217,15 @@ background.</para>
 <indexterm><primary>desktop background</primary><secondary>selecting objects
 </secondary></indexterm><indexterm><primary>desktop background objects</primary>
 <secondary>selecting</secondary></indexterm><para>To select an object on the
-desktop background, click on the object. To select multiple objects, press <keycap>
+desktop background, click on the object. To select multiple objects, press-and-hold <keycap>
 Ctrl</keycap>, then click on the objects that you want to select.</para>
 <para>You can also select an area on the desktop background to select all
 objects within that area. Click-and-hold on the desktop background, then drag
 over the area that contains the objects that you want to select. When you
-click-and-hold on the desktop background and drag, a grey rectangle appears
-to mark the area that you select.</para>
-<para>To select multiple areas, press <keycap>Ctrl</keycap>, then drag over
-the areas that you want to select. </para>
+click-and-hold then drag, a grey rectangle appears to mark the area that you
+select.</para>
+<para>To select multiple areas, press-and-hold <keycap>Ctrl</keycap>, then
+drag over the areas that you want to select. </para>
 </sect2>
 <sect2 id="gosdeskback-29">
 <title>To Open an Object from the Desktop Background</title>
@@ -268,12 +248,56 @@ Programs</application> desktop preference tool:</para>
 <itemizedlist>
 <listitem><para><guilabel>Default action</guilabel> drop-down list box in
 the <guilabel>Edit file type</guilabel> dialog</para></listitem>
-<listitem><para><guilabel>Viewing component</guilabel> drop-down list box
-in the <guilabel>Edit file type</guilabel> dialog</para></listitem>
+<listitem><para><guilabel>Viewer Component</guilabel> drop-down list box in
+the <guilabel>Edit file type</guilabel> dialog</para></listitem>
 </itemizedlist>
 <para>You can set your preferences in a <application>Nautilus</application>
 window so that you click once on a file to execute the default action.</para>
 </sect2>
+<sect2 id="gosdeskback-3">
+<title>To Add a Launcher to the Desktop Background</title>
+<indexterm><primary>desktop background</primary><secondary>adding launchers
+</secondary></indexterm><indexterm><primary>desktop background objects</primary>
+<secondary>launchers</secondary></indexterm><para>A desktop background launcher
+can start an application or link to  a particular file, folder, or FTP site.
+</para>
+<para>To add a launcher to your desktop background, perform the following
+steps:</para>
+<orderedlist>
+<listitem><para>Right-click on the desktop background, then choose <guimenuitem>
+New Launcher</guimenuitem>. A <guilabel>Create Launcher</guilabel> dialog
+is displayed.</para></listitem>
+<listitem><para>For information on how to enter the properties of the launcher
+in the <guilabel>Create Launcher</guilabel> dialog, see the panels chapter.
+</para>
+<para>The command that you enter for the launcher is the command that is executed
+when you use the desktop background object. 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*"/>
+<colspec colname="colspec1" colwidth="52.64*"/>
+<thead>
+<row rowsep="1"><entry valign="top"><para>Sample Command</para></entry><entry
+valign="top"><para>Action</para></entry></row>
+</thead>
+<tbody>
+<row><entry colname="colspec0" valign="top"><para><command>gedit</command></para></entry>
+<entry colname="colspec1" valign="top"><para>Starts the <application>gedit
+</application> application.</para></entry></row>
+<row><entry valign="top"><para><command>gedit /user123/loremipsum.txt</command></para></entry>
+<entry valign="top"><para>Opens the file <filename>/user123/loremipsum.txt
+</filename> in the <application>gedit</application> application.</para></entry>
+</row>
+<row><entry colname="colspec0" valign="top"><para><command>nautilus /user123/Projects
+</command></para></entry><entry colname="colspec1" valign="top"><para>Opens
+the folder <filename>/user123/Projects</filename> in a <application>Nautilus
+</application> window.</para></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+</listitem>
+</orderedlist>
+</sect2>
 <sect2 id="gosdeskback-20">
 <title>To Add a Symbolic Link to the Desktop Background</title>
 <indexterm><primary>desktop background</primary><secondary>adding symbolic
@@ -295,7 +319,7 @@ steps:</para>
 symbolic link in a <application>Nautilus</application> window.</para></listitem>
 <listitem><para>Create a symbolic link to the file or folder. To create a
 symbolic link to a file or folder, select the file or folder to which you
-want to create a link. Choose <menuchoice><guimenu>File</guimenu>
+want to create a link. Choose <menuchoice><guimenu>Edit</guimenu>
 <guimenuitem>Make Link</guimenuitem></menuchoice>. A link to the file or folder
 is added to the current folder. You can identify symbolic links by the default
 arrow emblem that appears on all symbolic links. The following figure shows
@@ -316,53 +340,6 @@ a symbolic link to a file:</para>
 for the object is moved to the desktop background. </para></listitem>
 </orderedlist>
 </sect2>
-<sect2 id="gosdeskback-3">
-<title>To Add a Nautilus Link to the Desktop Background</title>
-<indexterm><primary>desktop background</primary><secondary>adding Nautilus
-links</secondary></indexterm><indexterm><primary>desktop background objects
-</primary><secondary>Nautilus links</secondary></indexterm><para>When you
-choose a Nautilus link on the desktop background, the command in the Nautilus
-link file is executed. To add a Nautilus link to your desktop background,
-you must first create an application launcher for the object in a menu.</para>
-<para>To add a Nautilus link to your desktop background, perform the following
-steps:</para>
-<orderedlist>
-<listitem><para>Create an application launcher in a menu for the object that
-you want to add to your desktop background. The command that you enter for
-the launcher is the command that is executed when you use the desktop background
-object. 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*"/>
-<colspec colname="colspec1" colwidth="52.64*"/>
-<thead>
-<row rowsep="1"><entry valign="top"><para>Sample Command</para></entry><entry
-valign="top"><para>Action</para></entry></row>
-</thead>
-<tbody>
-<row><entry colname="colspec0" valign="top"><para><command>gedit</command></para></entry>
-<entry colname="colspec1" valign="top"><para>Starts the <application>gedit
-</application> application.</para></entry></row>
-<row><entry valign="top"><para><command>gedit /user123/loremipsum.txt</command></para></entry>
-<entry valign="top"><para>Opens the file <filename>/user123/loremipsum.txt
-</filename> in the <application>gedit</application> application.</para></entry>
-</row>
-<row><entry colname="colspec0" valign="top"><para><command>nautilus /user123/Personal
-</command></para></entry><entry colname="colspec1" valign="top"><para>Opens
-the folder <filename>/user123/Personal</filename> in a <application>Nautilus
-</application> window.</para></entry></row>
-</tbody>
-</tgroup>
-</informaltable>
-<para>For more information on how to add launchers to menus, see <xref linkend="goseditmainmenu-1"/>.
-</para></listitem>
-<listitem><para>Drag the launcher from the menu to the desktop background.
-An icon for the object is added to the desktop background. </para>
-<para>If you want, you can remove the menu item that you created in step 1.
-</para></listitem>
-</orderedlist>
-
-</sect2>
 <sect2 id="gosdeskback-16">
 <title>Adding a File or Folder to the Desktop Background</title>
 <indexterm><primary>desktop background</primary><secondary>adding a file or
@@ -386,14 +363,11 @@ to move.</para></listitem>
 for the file or folder is moved to the desktop background. The file or folder
 is moved to your desktop background directory.</para>
 <para>Alternatively, select the file or folder, then choose <menuchoice><guimenu>
-File</guimenu><guimenuitem>Cut Files</guimenuitem></menuchoice>. Right-click
+Edit</guimenu><guimenuitem>Cut Files</guimenuitem></menuchoice>. Right-click
 on any desktop background object, then choose <guimenuitem>Paste Files</guimenuitem>.
 </para></listitem>
 </orderedlist>
 
-<para>What about Cut, Copy and Paste solely in reference to the desktop background.
-Eg, to create a copy of a file by copying it from the desktop background,
-then pasting it?</para>
 </sect3>
 <sect3 id="gosdeskback-17">
 <title>To Copy a File or Folder to the Desktop Background</title>
@@ -407,12 +381,12 @@ copy a file or folder to the desktop background, perform the following steps:
 </listitem>
 <listitem><para>In the view pane, display the file or folder that you want
 to move.</para></listitem>
-<listitem><para>Press <keycap>Ctrl</keycap>, then drag the file or folder
-to the desktop background. An icon for the file or folder is added to the
-desktop background. The file or folder is copied to your desktop background
+<listitem><para>Press-and-hold <keycap>Ctrl</keycap>, then drag the file or
+folder to the desktop background. An icon for the file or folder is added
+to the desktop background. The file or folder is copied to your desktop background
 directory.</para>
 <para>Alternatively, select the file or folder, then choose <menuchoice><guimenu>
-File</guimenu><guimenuitem>Copy Files</guimenuitem></menuchoice>.
+Edit</guimenu><guimenuitem>Copy Files</guimenuitem></menuchoice>.
 Right-click on any desktop background object, then choose <guimenuitem>Paste
 Files</guimenuitem>.</para></listitem>
 </orderedlist>
@@ -447,8 +421,7 @@ Trash</guilabel>, but is immediately deleted from the desktop background.
 The <guimenuitem>Delete</guimenuitem> menu item is only available if you select
 the <guilabel>Include a Delete command that bypasses Trash</guilabel> option
 in the <application>Nautilus</application> <guilabel>Preferences</guilabel>
-dialog. For more information on this option, see <xref linkend="gosnautilus-55"/>.
-</para>
+dialog. </para>
 <para>To delete an object from the desktop background right-click on the object,
 then choose <guimenuitem>Delete</guimenuitem>. </para>
 </sect2>
@@ -491,9 +464,9 @@ ways:</para>
 background. The contents of <guilabel>Trash</guilabel> are displayed in a <application>
 Nautilus</application> window.</para></listitem>
 <listitem><para>From a <application>Nautilus</application> window</para>
-<para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Show
-Trash</guimenuitem></menuchoice>. The contents of <guilabel>Trash</guilabel>
-are displayed in the window.</para></listitem>
+<para>Choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Trash</guimenuitem>
+</menuchoice>. The contents of <guilabel>Trash</guilabel> are displayed in
+the window.</para></listitem>
 </itemizedlist>
 </sect2>
 <sect2 id="gosdeskback-10">
@@ -515,8 +488,8 @@ Trash</guimenuitem></menuchoice>.</para></listitem>
 <title>Using the Desktop Background Menu</title>
 <indexterm><primary>desktop background</primary><secondary>using Desktop Background
 menu</secondary></indexterm><indexterm><primary>Desktop Background menu</primary>
-<secondary>description</secondary></indexterm><para>You can open the following
-menus from the desktop background:</para>
+<secondary>description</secondary></indexterm><indexterm><primary>menus</primary>
+<secondary>Desktop Background menu</secondary></indexterm>
 <screenshot>
 <mediaobject>
   <imageobject>
@@ -554,17 +527,23 @@ in your desktop background directory.</para></entry></row>
 <row><entry colname="colspec0" valign="top"><para><guimenuitem>New Terminal
 </guimenuitem></para></entry><entry colname="colspec1" valign="top"><para>
 Starts a <application>GNOME Terminal</application>.</para></entry></row>
+<row><entry colname="colspec0"><para><guimenuitem>New Launcher</guimenuitem></para></entry>
+<entry colname="colspec1"><para>Creates a launcher on your desktop background.
+For more information, see <xref linkend="gosdeskback-3"/>.</para></entry></row>
+<row><entry colname="colspec0"><para><guisubmenu>Scripts</guisubmenu></para></entry>
+<entry colname="colspec1"><para>Opens a submenu of scripts that you can run.
+</para></entry></row>
 <row><entry colname="colspec0" valign="top"><para><guimenuitem>Clean Up By
 Name</guimenuitem></para></entry><entry colname="colspec1" valign="top"><para>
 Arranges the objects on the desktop background alphabetically by name.</para></entry>
 </row>
 <row><entry colname="colspec0"><para><guimenuitem>Cut Files</guimenuitem></para></entry>
 <entry colname="colspec1"><para>Deletes the selected file or files from the
-folder or desktop background and places the file or files in buffer.</para></entry>
+folder or desktop background, and places the file or files in buffer.</para></entry>
 </row>
 <row><entry colname="colspec0"><para><guimenuitem>Copy Files</guimenuitem></para></entry>
 <entry colname="colspec1"><para>Copies the selected file or files from the
-folder or desktop background and places the file or files in buffer.</para></entry>
+folder or desktop background, and places the file or files in buffer.</para></entry>
 </row>
 <row><entry colname="colspec0"><para><guimenuitem>Paste Files</guimenuitem></para></entry>
 <entry colname="colspec1"><para>Puts the file or files in the buffer into
@@ -572,15 +551,15 @@ the selected folder or the desktop background.</para></entry></row>
 <row><entry colname="colspec0" valign="top"><para><guimenuitem>Disks</guimenuitem></para></entry>
 <entry colname="colspec1" valign="top"><para>Enables you to mount diskettes
 and CD-ROMs.</para></entry></row>
+<row><entry colname="colspec0"><para><guimenuitem>Change Desktop Background
+</guimenuitem></para></entry><entry colname="colspec1"><para>Starts the <application>
+Background</application> desktop preference tool to enable you to change the
+desktop background.</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Use Default Background </guimenuitem></para></entry>
 <entry valign="top"><para>Resets the desktop background to the last pattern
 that you chose from the <guilabel>Backgrounds and Emblems</guilabel> dialog.
 You can access the <guilabel>Backgrounds and Emblems</guilabel> dialog from <application>
 Nautilus</application> windows.</para></entry></row>
-<row><entry valign="top"><para><guimenuitem>Change Desktop Background</guimenuitem></para></entry>
-<entry valign="top"><para>Starts the <application>Background</application>
-desktop preference tool to enable you to change the desktop background.</para></entry>
-</row>
 </tbody>
 </tgroup>
 </table>
@@ -608,11 +587,10 @@ opposite edge of the screen.</para>
 panel on the screen edge. If there is an edge panel on the screen edge, you
 must hide the panel before you drag the color.</para></listitem>
 <listitem><para>Use the <application>Background</application> desktop preference
-tool. For more information, see <xref linkend="goscustdesk-7"/>.</para></listitem>
-<listitem><para>Use a <application>Nautilus</application> window to choose
-a background pattern or color from the <guilabel>Backgrounds and Emblems</guilabel>
-dialog. To change the pattern or color of the desktop background, perform
-the following steps:</para>
+tool. </para></listitem>
+<listitem><para>Choose a pattern or color for the background from the <guilabel>
+Backgrounds and Emblems</guilabel> dialog. To change the pattern or color
+of the desktop background, perform the following steps:</para>
 <orderedlist>
 <listitem><para>Open a <application>Nautilus</application> window.</para>
 </listitem>
@@ -625,7 +603,7 @@ use, click on the <guibutton>Colors</guibutton> button.</para></listitem>
 <listitem><para>To change the desktop background to a pattern, drag the pattern
 to the desktop background. To change the desktop background to a color, drag
 the color to the desktop background.</para></listitem>
-<listitem><para>Click <guibutton>Done</guibutton> to close the dialog.</para>
+<listitem><para>Click <guibutton>Close</guibutton> to close the dialog.</para>
 </listitem>
 </orderedlist>
 </listitem>