Makefile.am, and removed references to goscustdesk-remotedesktop.xml

* Makefile.am, and
* user-guide.xml:
removed references to goscustdesk-remotedesktop.xml
* goscustdesk.xml:
copied in material from goscustdesk-remotedesktop.xml
removed section 'Customizing Your Panels', prefs tool no longer exists
rearranged order of sections to match the menu

1 files changed, 10 insertions, 4 deletions

diff --git a/gnome2-user-guide/C/user-guide.xml b/gnome2-user-guide/C/user-guide.xml
index fcaabb4..8ae0305 100644
--- a/gnome2-user-guide/C/user-guide.xml
+++ b/gnome2-user-guide/C/user-guide.xml
@@ -10,8 +10,7 @@
   <!ENTITY gospanel SYSTEM          "gospanel.xml">                   <!-- Panels -->
   <!ENTITY goseditmainmenu SYSTEM   "goseditmainmenu.xml">            <!-- Menus -->
   <!ENTITY gosnautilus SYSTEM       "gosnautilus.xml">                <!-- Nautilus -->  
-  <!ENTITY gosremotedesktop SYSTEM  "goscustdesk-remotedesktop.xml">  <!-- Remote sessions ?? -->
-  <!ENTITY gostools SYSTEM          "gostools.xml">                   <!-- Tools and utilities -->
+  <!ENTITY gostools SYSTEM          "gostools.xml">                   <!-- Tools and utilities ?? -->
   <!ENTITY goscustdesk SYSTEM       "goscustdesk.xml">                <!-- Preferences -->
   <!ENTITY gloss SYSTEM             "glossary.xml">                   <!-- Glossary -->
 ]>
@@ -80,7 +79,15 @@
         </affiliation>
         <email>jnoreiko at yahoo dot com</email>
       </author>
-    </authorgroup>
+      <author>
+        <firstname>Joachim</firstname>
+        <surname>Noreiko</surname>
+        <affiliation>
+          <orgname>GNOME Documentation Project</orgname>
+        </affiliation>
+        <email>jnoreiko at yahoo dot com</email>
+      </author>
+      </authorgroup>
 
     <revhistory>
       <revision>
@@ -190,7 +197,6 @@
 &gospanel;
 &goseditmainmenu;
 &gosnautilus;
-&gosremotedesktop;
 &gostools;
 &goscustdesk;
 &gloss;