slightly updated gnome-intro; updated screenshot

2 files changed, 159 insertions, 100 deletions

diff --git a/introduction-to-gnome/C/figures/desktop.png b/introduction-to-gnome/C/figures/desktop.png
index 59db0c8..796a512 100644
--- a/introduction-to-gnome/C/figures/desktop.png
+++ b/introduction-to-gnome/C/figures/desktop.png
diff --git a/introduction-to-gnome/C/gnome-intro.sgml b/introduction-to-gnome/C/gnome-intro.sgml
index db3ecba..16236c8 100755
--- a/introduction-to-gnome/C/gnome-intro.sgml
+++ b/introduction-to-gnome/C/gnome-intro.sgml
@@ -71,13 +71,13 @@
       the Internet; they are distributed under the terms of <ulink
       type="gnome-help" url="gnome-help:gpl"> GNU General Public
       License</ulink> (and its cousins, <ulink type="gnome-help"
-      url="gnome-help:lgpl">Lesser General Public License</ulink> and <ulink
-      type="gnome-help" url="gnome-help:fdl">Free Documentation License</ulink>
-      for libraries and documentation respectively). In particular,
-      this means that everyone is free to use, copy or distribute
-      Gnome. If you would like to learn more about the Gnome project
-      please visit the <ulink url="http://www.gnome.org"
-      type="http">Gnome web site</ulink>.
+      url="gnome-help:lgpl">Lesser General Public License</ulink> and
+      <ulink type="gnome-help" url="gnome-help:fdl">Free Documentation
+      License</ulink> for libraries and documentation
+      respectively). In particular, this means that everyone is free
+      to use, copy or distribute Gnome. If you would like to learn
+      more about the Gnome project please visit the <ulink
+      url="http://www.gnome.org" type="http">Gnome web site</ulink>.
    </para>
    <para>
       Gnome is highly configurable, enabling you to set your desktop
@@ -88,12 +88,15 @@
    </para>
 
    <para>
-    Gnome comes from the acronym for the GNU Network Object Model Environment
-    (GNOME).  Gnome is a part of the larger GNU project, started in 1984 to
-    develop a completely free UNIX-like operating system.  For more information,
-    visit the <ulink url="http://www.gnu.org" type="http">GNU Website</ulink>.
-   </para>
-
+    Gnome comes from the acronym for the GNU Network Object Model
+    Environment (GNOME).  Gnome is a part of the larger GNU project,
+    started in 1984 to develop a completely free UNIX-like operating
+    system.  For more information, visit the <ulink
+    url="http://www.gnu.org" type="http">GNU Website</ulink>.  
+    </para>
+    <para>
+      This guide describes Gnome 1.4 which the latest (as of February
+      2001) release of Gnome. 
   </sect1>
 
 <!-- ==================Section: ======================== -->
@@ -102,12 +105,13 @@
     <para>
       This guide gives you a short introduction to Gnome. It is not
       intended to cover all details of Gnome; if you need more
-      information, you should read  detailed manuals listed in <xref
-      linkend="otherinfo">. Also, this guide assumes  you already
-      have Gnome installed; if you need help  installing Gnome,
-      please check the instructions on <ulink
-      url="http://www.gnome.org" type="http">Gnome Website</ulink>
+      information, you should read detailed manuals listed in <xref
+      linkend="otherinfo">. Also, this guide assumes you already have
+      Gnome installed; if you need help installing Gnome, please check
+      the instructions on <ulink url="http://www.gnome.org"
+      type="http">Gnome Website</ulink>.
     </para>
+ 
     <para> 
       This guide was written by the members of Gnome
       Documentation Project (GDP). If you have any comments or
@@ -195,7 +199,7 @@
       <title>Panel</title>
       <para>
 	The long bar at the bottom of <xref linkend="desktop-fig"> is
-	a Gnome Panel. It contain a number of useful things, such as 
+	a Gnome Panel. It contains a number of useful things, such as 
 	<itemizedlist>
 	  <listitem>
 	    <para>The <guibutton>Main 	Menu</guibutton>: this is the
@@ -207,12 +211,9 @@
 	  <listitem> 
 	    <para>
 	      Application launchers: these are buttons that start
-	      various programs. In this example the toolbox button
+	      various programs. For example,  the toolbox button
 	      starts the <application>Gnome Control Center</application>
-	      (for configuring your system), and the button with a
-	      computer screen starts <application>Gnome
-	      Terminal</application>, for those who need to use
-	      command line. 
+	      (for configuring your system).
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -277,9 +278,10 @@
 	  <para>
 	    If it is a directory, the File Manager will start and show
 	    the contents of that directory. Your desktop will probably
-	    have a folder icon labeled <guilabel>Home
-	    directory</guilabel>. Double-clicking on it will start the
-	    File Manager at your home directory.
+	    have a icon showing a house and labeled
+	    <guilabel><replaceable>yourname</replaceable>'s
+	    Home</guilabel>. Double-clicking on this icon will start
+	    the File Manager at your home directory.
 	  </para>
 	</listitem>
       </itemizedlist>
@@ -624,13 +626,14 @@
 
       <para>
 	As most modern graphic file managers,
-        <application>Nautilus</application> shows the contents of a selected
-        directory using icons to represent files and subdirectories. Clicking
-        on any file or directory opens it (for data files, it starts
-        the appropriate application which opens this file). Right-clicking
-        on a file or directory produces a <guimenu>pop-up</guimenu> menu.
-        Using this menu, you can delete or rename the file, view and change
-        file properties or permissions, and more.
+        <application>Nautilus</application> shows the contents of a
+        selected directory using icons to represent files and
+        subdirectories. Double-clicking on any file or directory opens
+        it (for data files, it starts the appropriate application
+        which opens this file). Right-clicking on a file or directory
+        produces a <guimenu>pop-up</guimenu> menu.  Using this menu,
+        you can delete or rename the file, view and change file
+        properties or permissions, and more.
       </para>
       <para> <application>Nautilus</application> also provides an easy
 	way to move files between directories. To move move a file
@@ -639,10 +642,7 @@
         <guimenuitem>New window</guimenuitem> from the
         <application>Nautilus</application> <guimenu>File</guimenu> menu.
         Select the file you need, and drag it from one window into another
-        using the mouse. You can also drag the file to the desktop. In this
-	case, the file remains in its old location, and an icon will
-	be created on your desktop which acts as a link
-	(<quote>shortcut</quote>) to it.
+        using the mouse. You can also drag a file or directory to the desktop.
       </para>
       <para> <application>Nautilus</application> provides many more
 	tools to manipulate your files. It is also highly
@@ -663,8 +663,8 @@
 	UNIX-style manual pages (manpages), GNU info pages
 	(documentation format used GNU project utilities), and other
 	types of documentation. To view the list of all documentation
-	installed on your system, click on the <guilabel>Help
-	contents</guilabel> tab in the left panel of
+	installed on your system, click on the
+	<guilabel>Help</guilabel> tab in the left panel of
 	<application>Nautilus</application>.
       </para>
     </sect2>
@@ -691,7 +691,9 @@
       used options of the <application>Gnome Control
       Center</application>. 
     </para>
-    <itemizedlist>
+    <variablelist>
+      <varlistentry>
+	<term>Background</term>
       <listitem> 
 	<para>
 	  You can change the desktop background by selecting
@@ -704,6 +706,10 @@
 	  menu).
 	</para>
       </listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><guilabel>Theme Selector</guilabel>
+	</term>
       <listitem> 
 	<para>
 	 <guilabel>Theme Selector</guilabel> allows you to change the
@@ -715,9 +721,13 @@
 	 thing they do is switching to another one.  
 	</para>
       </listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><guilabel>Sawfish window manager</guilabel>
+	  </term>
       <listitem> 
 	<para>
-	  <guilabel>Sawfish window manager</guilabel>: this section
+	  This section
 	  allows you to change settings for the window manager. In
 	  particular, in the <guilabel>Appearance</guilabel>
 	  subsection you can change the frame style (theme), which
@@ -727,15 +737,20 @@
 	  other settings. 
 	</para>
       </listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><guilabel>Session</guilabel>
+	  </term>
       <listitem> 
 	<para>
-	  <guilabel>Session</guilabel>: in this section you can define
+	  In this section you can define
 	  the startup programs (that is, programs that are run every
 	  time you log in), enable or disable login hints and logout
 	  confirmation dialog. 
 	</para>
       </listitem>
-    </itemizedlist>
+      </varlistentry>
+    </variablelist>
     <para>
       In addition, you can change properties of various items &mdash;
       most notably, panels and icons on your desktop &mdash; by
@@ -745,7 +760,7 @@
       caption of an icon, size and background color (or even
       background image) of the Panel, and much more.
     </para>
-    <note>
+<!--    <note>
       <title>NOTE</title>
       <para>
 	Desktop icons corresponding to various drives and devices of
@@ -753,7 +768,7 @@
 	complicated nature, so you can not change their caption using
 	the <guimenuitem>Properties</guimenuitem> dialog. 
       </para>
-    </note>
+    </note> -->
     <para>
       Almost every Gnome application has its own
       preferences settings (look for 
@@ -782,45 +797,81 @@
 	</term>     
 	<listitem>
 	  <para> These include office and productivity applications
-	    such as <application>Gnumeric</application>
-	    &mdash; a full-featured Excel-compatible spreadsheet;
-	    <application>AbiWord</application> &mdash; a lightweight
-	    word processing application;
-	    <application>Evolution</application> &mdash; e-mail,
-	    calendar, address book and contact manager. In addition,
-	    here you will find the <quote>Swiss army knife of text
-	    editors</quote>, <application>emacs</application> (which
-	    is not a Gnome appication).
-	  </para>
+	    such as </para>
+	  <itemizedlist>
+	    <listitem><para>
+		<application>Gnumeric</application>
+	         &mdash; a full-featured Excel-compatible spreadsheet
+	      </para>
+	    </listitem>
+	    <listitem><para>
+		<application>AbiWord</application> &mdash; a lightweight
+	    word processing application
+	      </para>
+	    </listitem>
+	    <listitem><para>
+		<application>Gnome Calendar</application> to help 
+		you manage your busy schedule
+	      </para>
+	    </listitem>
+	    <listitem><para> Several text editors, from simple and
+		easy to use <application>gedit</application> to the
+		(arguably) the most powerful text editor ever created,
+		<application>Emacs</application> (which is not a Gnome
+		appication)
+	      </para>
+	    </listitem>
+
+	  </itemizedlist>
 	</listitem>
       </varlistentry>
        <varlistentry>
 	<term><guisubmenu>Graphics</guisubmenu>
 	</term>     
 	<listitem>
-	  <para>Here you will find the famous
-	    <application>Gimp</application> &mdash; image editing
-	    program for serious users which rivals
-	    <application>Photoshop</application>. This menu also
-	    contains image viewers such as <application>Eye of
-	    Gnome</application> and <application>xv</application>.
-	  </para>
+	  <itemizedlist>
+	    <listitem><para> 
+		<application>Gimp</application> &mdash;
+		image editing program for power users; rivals
+		<application>Photoshop</application>
+	      </para>
+	    </listitem>
+	    <listitem><para>Image viewers such as <application>Eye of
+	    Gnome</application>, <application>GQview</application> and
+	    <application>xv</application>   
+	      </para>
+	    </listitem>
+	  </itemizedlist>
 	</listitem>
       </varlistentry>
        <varlistentry>
 	<term><guisubmenu>Utilities</guisubmenu>
 	</term>     
 	<listitem>
-	  <para>Among other things, here is a
-	    <application>Calculator</application>, <application>Gnome
-	    Search tool</application> which you can use to find a file
-	    on your system, <application>gfloppy</application> which
-	    lets you format a floppy disk, <application>Bug reporting
-	    tool</application>, and a nice utility called
-	    <application>GDict</application> which allows you to look
-	    up a word in one of the many dictionaries freely available
-	    on the Internet.
-	  </para>
+	  <para>Among other things, here you will find </para>
+	    <itemizedlist>
+	      <listitem><para>
+		  <application>Calculator</application>
+		</para>
+	      </listitem>
+	      <listitem><para> 
+		  <application>Gnome Search
+		  tool</application> which you can use to find a file
+		  on your system
+		</para>
+	      </listitem>
+	      <listitem><para>
+		  <application>gfloppy</application> for formatting 
+		  floppy disks
+		</para>
+	      </listitem>
+	      <listitem><para> 
+		  <application>GDict</application>for
+		  looking up a word in one of the many dictionaries
+		  freely available on the Internet
+		</para>
+	      </listitem>
+	    </itemizedlist>
 	</listitem>
       </varlistentry>       
       <varlistentry>
@@ -914,7 +965,7 @@
 
 <!-- ==================Section: ======================== -->
 <sect1 id="trouble">
-    <title>Help &mdash; I Am in Trouble!</title>
+    <title>Help -  I Am in Trouble!</title>
     <para>
       Everyone runs into trouble sooner or later. Here is some
       advice on how to handle the  most common problems:
@@ -927,17 +978,13 @@
 	does not respond to your mouse clicks and keyboard commands,
 	you can either wait and hope that it wakes up, or kill it. If
 	you decide to kill it (NOTE: You will lose all unsaved data),
-        click on the button with small triangle in the left side of the
-        window title bar to invoke the
-	<guimenu>window operations</guimenu> menu, and select
-	<guimenuitem>Destroy</guimenuitem>. Another way to kill the
-	application is to start the <application>Gnome System
-	monitor</application> (from <guisubmenu>System</guisubmenu>
-	submenu of the <guimenu>Main Menu</guimenu>), right-click
-	on the frozen application name, and select
-	<guimenuitem>Kill now</guimenuitem>. Using <application>Gnome
-	System monitor</application> also allows you to find and kill
-	all helper processes started by this application.
+	start the <application>Gnome System monitor</application>
+	(from <guisubmenu>System</guisubmenu> submenu of the
+	<guimenu>Main Menu</guimenu>), right-click on the frozen
+	application name, and select <guimenuitem>Kill
+	now</guimenuitem>. Using <application>Gnome System
+	monitor</application> also allows you to find and kill all
+	helper processes started by this application.
 	</para>
       <para>
 	If a Gnome application freezes or crashes (unexpectedly dies)
@@ -955,8 +1002,9 @@
       known for stability), but just the graphical part, X Window
       System. In this case, you can try to restart X Window System by
       simultaneously pressing
-      <keycombo><keycap>CTRL</keycap><keycap>ALT</keycap>
-      <keycap>Backspace</keycap> </keycombo>.  This should work for
+ <!--      <keycombo>-->
+    <keycap>CTRL</keycap>-<keycap>ALT</keycap>-<keycap>Backspace</keycap>. 
+ <!--   </keycombo>-->  This should work for
       the implementation of X Window system used on Linux and *BSD,
       XFree86 &mdash; unless it was disabled by your system
       administrator. Of course, in this way you also lose all unsaved
@@ -965,7 +1013,7 @@
       </para>
     </sect2>
 
-    <sect2 id="icons-messedup">
+<!--    <sect2 id="icons-messedup">
       <title>My Gnome Desktop Icons Are All Messed up!</title>
       <para> 
 	This sometimes happens when upgrading from an older version of
@@ -974,7 +1022,7 @@
 	<filename>~</filename> is your home directory, then log out and
 	login again. If this didn't help, read on.
       </para>
-    </sect2>
+    </sect2> -->
 
     <sect2 id="Gnome-messedup">
       <title>My Whole Gnome Configuration is Messed Up!</title>
@@ -1075,6 +1123,17 @@
 	    </para>
 	  </listitem>
 	</varlistentry>
+	<varlistentry>
+	  <term><ulink type="help" url="gnome-help:glossary">
+	      <citetitle>Glossary</citetitle></ulink>
+	    </term>
+	  <listitem>
+	    <para>Gives brief explanation of some of computer-related
+	    terms you may  see in Gnome documentation, from ASCII to X
+	    Window System.
+	    </para>
+	  </listitem>
+	</varlistentry>
       </variablelist>
     </sect2>
     <sect2 id="gnome-www"> 
@@ -1147,17 +1206,17 @@
       <email>docs@gnome.org</email>.
     </para>
     <para>
-      If you find a bug in one of Gnome applications, please report it!
-      The developers do read these reports and try to fix all reported bugs.
-      The easiest way to send a bug report is to use <application>Gnome
-      Bug Report Tool</application>, found in the
-      <guisubmenu>Utilities</guisubmenu> submenu of the
-      <guimenu>Main Menu</guimenu>. This tool will be automatically
-      started if a Gnome application crashes. It should also be used
-      for submitting suggestions or requests for new features for
-      Gnome applications: just select <guilabel>Severity:
-      wishlist</guilabel> in the appropriate window of
-      <application>Gnome Bug Report Tool</application>.
+      If you find a bug in one of Gnome applications, please report
+      it!  The developers do read these reports and try to fix all
+      reported bugs.  The easiest way to send a bug report is to use
+      <application>Gnome Bug Report Tool</application>, found in the
+      <guisubmenu>Utilities</guisubmenu> submenu of the <guimenu>Main
+      Menu</guimenu>. This tool will be automatically started if a
+      Gnome application crashes. It should also be used for submitting
+      suggestions or requests for new features for Gnome applications:
+      just select <guilabel>Severity: enhancement</guilabel> in the
+      appropriate window of <application>Gnome Bug Report
+      Tool</application>.
     </para>
     <para>
       If you have questions  about Gnome, or want to discuss Gnome