added section on the desktop, using material from the wiki by Nigel Tao

* gosoverview.xml:
added section on the desktop, using material from the wiki by Nigel Tao
* gosnautilus.xml:
updated a section id
moved id "nautilus-desktop" to gosoverview.xml for new section
* goscustdesk.xml:
cleaned up desktop background prefs
* user-guide.xml:
added Nigel Tao to the author list

5 files changed, 67 insertions, 16 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 160cfb6..28f06ca 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,15 @@
+2006-02-27 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* gosoverview.xml:
+	added section on the desktop, using material from the wiki by Nigel Tao
+	* gosnautilus.xml:
+	updated a section id
+	moved id "nautilus-desktop" to gosoverview.xml for new section
+	* goscustdesk.xml:	
+	cleaned up desktop background prefs
+	* user-guide.xml:
+	added Nigel Tao to the author list
+	
 2006-02-26 Joachim Noreiko <jnoreiko@yahoo.com>
 
 	* gosnautilus.xml:
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 1c82798..95b7c45 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -211,8 +211,10 @@ database in the <guilabel>Port</guilabel> field.</para>
       </tgroup>
     </table>
   </sect1>   
-  <sect1 id="goscustdesk-7">
+  <sect1 id="prefs-desktopbackground">
     <title>Desktop Background Preferences</title>
+    <!-- preserve id for backwards compatibility: 2.12 -->
+    <anchor id="goscustdesk-7"/>       
     <indexterm>
       <primary>desktop</primary>
       <secondary>customizing background</secondary>
@@ -229,8 +231,9 @@ database in the <guilabel>Port</guilabel> field.</para>
       <primary>backgrounds</primary>
       <secondary>customizing desktop background</secondary>
     </indexterm>
-    <para>The desktop background is the image or color that is applied to your
-desktop. You can customize the desktop background in the following ways:</para>
+    <para>The <link linkend="overview-desktop">desktop</link> background is the image or color that is applied to your
+desktop. You can open <application>Desktop Background Preferences</application> by right-clicking on the desktop and choosing <guimenuitem>Change Desktop Background</guimenuitem>, as well as from the <menuchoice><guimenu>Desktop</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> menu.</para>
+    <para>You can customize the desktop background in the following ways:</para>
     <itemizedlist>
       <listitem>
         <para>Select an image for the desktop background. The image is superimposed
@@ -244,8 +247,8 @@ a solid color, or create a gradient effect with two colors. A gradient effect
 is a visual effect where one color blends gradually into another color. </para>
       </listitem>
     </itemizedlist>
-    <para>You can also change the appearance of your desktop background from within
-the <application>Nautilus</application> file manager.</para>
+    <tip><para>You can also drag a color or a pattern to the desktop from the <link linkend="nautilus-backgrounds-and-emblems"><guilabel>Backgrounds
+and Emblems</guilabel> dialog</link> in the <application>Nautilus</application> file manager.</para></tip>
     <para><xref linkend="goscustdesk-TBL-14"/> lists the background preferences
 that you can modify.</para>
     <table frame="topbot" id="goscustdesk-TBL-14">
diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index f657d40..075b4a2 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -324,7 +324,6 @@ If want to close all folders on the screen, choose <menuchoice><guimenu>File</gu
   <sect1 id="nautilus-browser-mode">
     <title>Browser Mode</title>
     <!-- Viewing Files in a File Browser Window -->
-    <anchor id="nautilus-desktop"/><!-- TODO move me to a proper section id! -->
     <anchor id="gosnautilus-210"/>   
     <anchor id="gosnautilus-447"/>
     <indexterm>
@@ -2699,8 +2698,10 @@ of the dialog. Click <guilabel>Delete</guilabel>. </para>
         </orderedlist>
       </sect3>
     </sect2>
-    <sect2 id="gosnautilus-44">
+    <sect2 id="nautilus-trash">
       <title>Using Trash</title>
+      <!-- preserve id for backwards compatibility: 2.12 -->
+      <anchor id="gosnautilus-44"/>         
       <screenshot>
         <mediaobject>
           <imageobject>
diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index 801c682..e3a2ab1 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -40,10 +40,17 @@
   you should see a default startup screen, with panels, windows,
   and various icons.</para>
   
-  <para>The major components of the desktop are as follows:</para>
+  <para>The major components of the GNOME Desktop are as follows:</para>
 
   <variablelist>
     <varlistentry>
+      <term>Desktop</term>
+      <listitem><para>The desktop itself is behind all of the other components on the
+      desktop.  You can place objects on the desktop to access your files and
+      directories quickly, or to start applications that you use often.  See
+      <xref linkend="overview-desktop"/> for more information.</para></listitem>
+    </varlistentry>  
+    <varlistentry>
       <term>Panels</term>
       <listitem><para>The <firstterm>panels</firstterm> are the two bars that run along the top and bottom of the screen. By default, the top panel shows you the GNOME main menu bar, the date and time, and the launcher for the GNOME help system, and the bottom panel shows you the list of open windows and the workspace switcher.</para>
       <para>Panels can be customized to contain a variety of tools, such as other menus and launchers, and small utility applications, called
@@ -64,14 +71,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Desktop</term>
-      <listitem><para>The desktop is behind all of the other components on the
-      desktop.  You can place objects on the desktop to access your files and
-      directories quickly, or to start applications that you use often.  See
-      <xref linkend="nautilus-desktop"/> for more information.</para></listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Workspaces</term>
       <listitem><para>You can subdivide your desktop into separate
       <firstterm>workspaces</firstterm>.  Each workspace can contain
@@ -107,6 +106,34 @@
   to using the various components of your desktop.</para>
 </section>
 
+<section id="overview-desktop">
+  <title>The Desktop</title>
+  <anchor id="nautilus-desktop"/>
+  
+  <para>The desktop lies behind all other components on your screen. When no windows are visible, the desktop is that part of the screen between the top and bottom panels. You can place files and folders on the desktop that you want to have easy access to.</para>
+  <para>The desktop also has several special objects on it:</para>
+    <itemizedlist>
+	    <listitem><para>The <interface>Computer</interface> icon gives you access to CDs, removable media such as floppy disks, and also the entire filesystem (also known as the root filesystem). By default, you do not have the security permissions to read other users' files or edit system files, but you may need to do so something such as configure a web server on the computer.</para></listitem>
+	    <listitem><para>Your Home Folder, labelled <interface><replaceable>username</replaceable>'s Home</interface><!-- translators, change this example as required for your locale -->, where all of your personal files are kept. You can also open this folder from the <guimenu>Places</guimenu> menu.</para></listitem>
+	    <listitem><para>The <interface>Trash</interface> is a special folder in which to place files and folders you no longer need. For more on this, see <xref linkend="nautilus-trash"/>.</para></listitem>
+	    <listitem><para>When you insert a CD, a flashdrive, or other removable media, or a device containing files such as a music player or a digital camera, an icon representing this device will appear on the desktop.</para></listitem>
+    </itemizedlist>
+    
+    <para>As you work with your computer, the desktop becomes obscured by the windows you are working with. To quickly reveal the desktop by minimizing all windows, you can do one of the following:</para>
+    
+    <itemizedlist>
+	    <listitem><para>Click on the <guibutton>Show Desktop</guibutton> button at the far left of the <link linkend="bottom-panel">bottom panel</link>.</para></listitem>
+	    <listitem><para>Press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>D</keycap></keycombo>.</para></listitem>
+    </itemizedlist>
+ 
+    <para>Either action will also restore your windows to their previous state. Alternatively, you can switch to another workspace to see the desktop.</para>
+    
+    <para>You can change the colour of the desktop background or the image displayed there. For more on this, see <xref linkend="prefs-desktopbackground"/>.</para>
+
+    <note><para>The files and folders you put on the desktop are stored in a special folder within your Home Folder, called <filename>Desktop</filename>. Like any other folder, you can put files (and other folders) directly into it, they will just also happen to show up on desktop itself.</para></note>
+  
+</section>
+
 <section id="overview-windows">
   <title>Windows</title>
 
diff --git a/gnome2-user-guide/C/user-guide.xml b/gnome2-user-guide/C/user-guide.xml
index 371a90d..492a8aa 100644
--- a/gnome2-user-guide/C/user-guide.xml
+++ b/gnome2-user-guide/C/user-guide.xml
@@ -102,6 +102,14 @@
         </affiliation>
         <email>john dot stowers at gmail dot com</email>
       </author>
+      <author>
+        <firstname>Nigel</firstname>
+        <surname>Tao</surname>
+        <affiliation>
+          <orgname>GNOME Documentation Project</orgname>
+        </affiliation>
+        <email>nigel dot tao at myrealbox dot com</email>
+      </author>      
       </authorgroup>
 
     <revhistory>