Index: gnome-system-monitor.xml
===================================================================
--- gnome-system-monitor.xml	(revision 2198)
+++ gnome-system-monitor.xml	(working copy)
@@ -139,17 +139,72 @@
   <sect1 id="gnome-system-monitor-intro">
     <title>Introduction</title>
     <para>
-      The <application>&app;</application> application enables you to monitor system processes and usage of system resources. You can also use <application>&app;</application> to modify the behavior of your system.
+      The <application>&app;</application> application enables you to display basic system information and monitor system processes, usage of system resources, and file systems. You can also use <application>&app;</application> to modify the behavior of your system.
     </para>
     <para>
-      The <application>&app;</application> window contains two tabbed sections:
+      The <application>&app;</application> window contains four tabbed sections:
     </para>
     <variablelist>
       <varlistentry>
         <term>
-          <guilabel>Process Listing</guilabel>
+          <guilabel>System</guilabel>
         </term>
         <listitem>
+          <para>Displays various basic information about the computer's hardware and software.</para>
+          <variablelist>
+            <varlistentry>
+              <term>
+                Distribution
+              </term>
+              <listitem>
+                <itemizedlist>
+                  <listitem>
+                    <para>Distribution version</para>
+                  </listitem>
+                  <listitem>
+                    <para>Linux Kernel version</para>
+                  </listitem>
+                  <listitem>
+                    <para>GNOME version</para>
+                  </listitem>
+                </itemizedlist>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>
+                Hardware
+              </term>
+              <listitem>
+                <itemizedlist>
+                  <listitem>
+                    <para>Installed memory</para>
+                  </listitem>
+                  <listitem>
+                    <para>Processors and speeds</para>
+                  </listitem>
+                </itemizedlist>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>
+                System Status
+              </term>
+              <listitem>
+                <itemizedlist>
+                  <listitem>
+                    <para>Currently available disk space</para>
+                  </listitem>
+                </itemizedlist>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <guilabel>Processes</guilabel>
+        </term>
+        <listitem>
           <para>
             Shows active processes, and how processes are related to each other. Provides detailed information about individual processes, and enables you to control active processes.  
           </para>
@@ -157,7 +212,7 @@
       </varlistentry>
       <varlistentry>
         <term>
-          <guilabel>Resource Monitor</guilabel>
+          <guilabel>Resources</guilabel>
         </term>
         <listitem>
           <para>
@@ -176,12 +231,22 @@
             </listitem>
             <listitem>
               <para>
-                Disk space on each device
+                Network usage
               </para>
             </listitem>
           </itemizedlist>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <guilabel>File Systems</guilabel>
+        </term>
+        <listitem>
+          <para>
+            Lists all mounted filesystems along with basic information about each.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </sect1>
 
@@ -195,10 +260,10 @@
       <para>You can start <application>&app;</application> in the following ways:</para>
       <variablelist>
         <varlistentry>
-          <term><guimenu>Applications</guimenu> menu</term>
+          <term><guimenu>System</guimenu> menu</term>
           <listitem>
             <para>
-              Choose <menuchoice><guimenu>System Tools</guimenu> <guimenuitem>System Monitor</guimenuitem></menuchoice>.
+              Choose <menuchoice><guimenu>Administration</guimenu> <guimenuitem>System Monitor</guimenuitem></menuchoice>.
             </para>
           </listitem>
         </varlistentry>
@@ -250,25 +315,36 @@
             <itemizedlist>
               <listitem>
                 <para>
-                  <guilabel>Process Listing</guilabel>
+                  <guilabel>System</guilabel>
                 </para>
                 <para>
-                  Contains a <guilabel>Search</guilabel> text box, a <guilabel>View</guilabel> drop-down list, a list of processes organized as a table, a <guilabel>More Info</guilabel> button, and an <guilabel>End Process</guilabel> button.
+                  Contains a list of basic system properties, such as system software versions and hardware specifications and status.
                 </para>
-                <note>
-                  <para>
-                    Do not confuse the <guilabel>View</guilabel> drop-down list on the <guilabel>Process Listing</guilabel> tabbed section with the <guilabel>View</guilabel> menu in the menubar.
-                  </para>
-                </note>
               </listitem>
               <listitem>
                 <para>
-                  <guilabel>Resource Monitor</guilabel>
+                  <guilabel>Processes</guilabel>
                 </para>
                 <para>
-                  Contains a <guilabel>CPU History</guilabel> graph, a <guilabel>Memory and Swap History</guilabel> graph, and a list of <guilabel>Devices</guilabel> organized as a table.
+                  Contains a list of processes organized as a table, a list of load averages over the past few minutes, and an "End Process" button.
                 </para>
               </listitem>
+              <listitem>
+                <para>
+                  <guilabel>Resources</guilabel>
+                </para>
+                <para>
+                  Contains a <guilabel>CPU History</guilabel> graph, a <guilabel>Memory and Swap History</guilabel> graph, and a <guilabel>Network History</guilabel> graph.
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <guilabel>File Systems</guilabel>
+                </para>
+                <para>
+                  Contains a table of currently mounted file systems.
+                </para>
+              </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
@@ -290,47 +366,54 @@
 
   <sect1 id="gnome-system-monitor-usage">
     <title>Usage</title>
-                                                                                
+
+    <sect2 id="gnome-system-monitor-display-basic-info">
+      <title>To Display Basic System Information</title>
+      <para>
+        To display basic system information, select the <guilabel>System</guilabel> tab.
+      </para>
+      <para>
+        In the <guilabel>System</guilabel> tab, information is organized into three groups, 
+      </para>
+    </sect2>
+
     <sect2 id="gnome-system-monitor-display-processlist">
       <title>To Display the Process List</title>
       <para>
-        To display the process list, select the <guilabel>Process Listing</guilabel> tab. The <guilabel>Process Listing</guilabel> tab is displayed by default when you start <application>&app;</application>.
+        To display the process list, select the <guilabel>Processes</guilabel> tab.
       </para>
       <para>
-        In the <guilabel>Process Listing</guilabel> tab, the processes are organized as a table. The rows of the table display information about the processes. The columns represent information fields for the processes, such as the name of the user who owns the process, the amount of memory currently being used by the process, and so on. From left to right, the <guilabel>Process Listing</guilabel> tab displays the following columns by default:
+        In the <guilabel>Processes</guilabel> tab, the processes are organized as a table. The rows of the table display information about the processes. The columns represent information fields for the processes, such as the name of the user who owns the process, the amount of memory currently being used by the process, and so on. From left to right, the <guilabel>Processes</guilabel> tab displays the following columns by default:
       </para>
       <itemizedlist>
           <listitem>
             <para>Process Name</para>
           </listitem>
           <listitem>
-            <para>User</para>
+            <para>Status</para>
           </listitem>
           <listitem>
-            <para>Memory</para>
+            <para>%CPU</para>
           </listitem>
           <listitem>
-            <para>X Server Memory</para>
-          </listitem>
-          <listitem>
             <para>Nice</para>
           </listitem>
           <listitem>
             <para>ID</para>
           </listitem>
+          <listitem>
+            <para>Memory</para>
+          </listitem>
       </itemizedlist>
         <para>
           For information about how to change the columns displayed in the process list, see <xref linkend="gnome-system-monitor-prefs-proclist"/>.
         </para>
 
       <sect3 id="gnome-system-monitor-display-processlist-child">
-        <title>Parent Processes, Child Processes, and Threads</title>
+        <title>Parent Processes and Child Processes</title>
         <para>
-          A parent process is a process that spawns another process. The spawned process is a child process of the original parent process. By default, <application>&app;</application> shows process dependencies. For information about how to change the default display behavior, see <xref linkend="gnome-system-monitor-modify-processlist-viewdeps"/>.
+          A parent process is a process that spawns another process. The spawned process is a child process of the original parent process. By default, <application>&app;</application> does not show process dependencies. For information about how to change the default display behavior, see <xref linkend="gnome-system-monitor-modify-processlist-viewdeps"/>.
         </para>
-        <para>
-          A thread is a portion of a process that can run independently of and concurrently with other portions of the process. By default, <application>&app;</application> does not show threads. For information about how to change the default display behavior, see <xref linkend="gnome-system-monitor-modify-processlist-viewthreads"/>.
-        </para>
       </sect3>
 
       <sect3 id="gnome-system-monitor-display-processlist-priority">
@@ -373,7 +456,7 @@
       <orderedlist>
         <listitem>
           <para>
-            Select the <guilabel>Process Listing</guilabel> tab to display the process list.
+            Select the <guilabel>Processes</guilabel> tab to display the process list.
           </para>
         </listitem>
         <listitem>
@@ -408,12 +491,12 @@
         <orderedlist>
           <listitem>
             <para>
-              Select the <guilabel>Process Listing</guilabel> tab to display the process list.
+              Select the <guilabel>Processes</guilabel> tab to display the process list.
             </para>
           </listitem>
           <listitem>
             <para>
-              Click on the <guilabel>View</guilabel> drop-down list, then select <guilabel>All Processes</guilabel>.
+              Choose <guimenu>View</guimenu><guimenuitem>All Processes</guimenuitem>.
             </para>
           </listitem>
         </orderedlist>
@@ -427,12 +510,12 @@
         <orderedlist>
           <listitem>
             <para>
-              Select the <guilabel>Process Listing</guilabel> tab to display the process list.
+              Select the <guilabel>Processes</guilabel> tab to display the process list.
             </para>
           </listitem>
           <listitem>
             <para>
-              Click on the <guilabel>View</guilabel> drop-down list, then select <guilabel>My Processes</guilabel>.
+              Choose <guimenu>View</guimenu><guimenuitem>My Processes</guimenuitem>.
             </para>
           </listitem>
         </orderedlist>
@@ -446,36 +529,36 @@
         <orderedlist>
           <listitem>
             <para>
-              Select the <guilabel>Process Listing</guilabel> tab to display the process list.
+              Select the <guilabel>Processes</guilabel> tab to display the process list.
             </para>
           </listitem>
           <listitem>
             <para>
-              Click on the <guilabel>View</guilabel> drop-down list, then select <guilabel>Active Processes</guilabel>.
+              Choose <guimenu>View</guimenu><guimenuitem>Active Processes</guimenuitem>.
             </para>
           </listitem>
         </orderedlist>
       </sect3>
 
       <sect3 id="gnome-system-monitor-modify-processlist-viewdeps">
-        <title>To Show Process Dependencies</title>
+        <title>To Show Dependencies</title>
         <para>
           To show process dependencies in the process list, perform the following steps:
         </para>
         <orderedlist>
           <listitem>
             <para>
-              Select the <guilabel>Process Listing</guilabel> tab to display the process list.
+              Select the <guilabel>Processes</guilabel> tab to display the process list.
             </para>
           </listitem>
           <listitem>
             <para>
-              Choose <menuchoice><guimenu>View</guimenu><guimenuitem>Process Dependencies</guimenuitem></menuchoice>.
+              Choose <menuchoice><guimenu>View</guimenu><guimenuitem>Dependencies</guimenuitem></menuchoice>.
             </para>
           </listitem>
         </orderedlist>
         <para>
-          If the <guimenuitem>Process Dependencies</guimenuitem> menu item is selected, the processes are listed as follows:
+          If the <guimenuitem>Dependencies</guimenuitem> menu item is selected, the processes are listed as follows:
         </para>
         <itemizedlist>
           <listitem>
@@ -490,7 +573,7 @@
           </listitem>
         </itemizedlist>
         <para>
-          If the <guimenuitem>Process Dependencies</guimenuitem> menu item is not selected: 
+          If the <guimenuitem>Dependencies</guimenuitem> menu item is not selected: 
         </para>
         <itemizedlist>
           <listitem>
@@ -506,217 +589,8 @@
         </itemizedlist>
       </sect3>
 
-      <sect3 id="gnome-system-monitor-modify-processlist-viewthreads">
-        <title>To Show Threads</title>
-        <para>
-          To show threads in the process list, perform the following steps:
-        </para>
-        <orderedlist>
-          <listitem>
-            <para>
-              Select the <guilabel>Process Listing</guilabel> tab to display the process list.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Choose <menuchoice><guimenu>View</guimenu><guimenuitem>Threads</guimenuitem></menuchoice>.
-            </para>
-          </listitem>
-        </orderedlist>
-      </sect3>
-
-      <sect3 id="gnome-system-monitor-modify-hide-process">
-        <title>To Hide a Process</title>
-        <para>
-          To hide a process, perform the following steps:
-        </para>
-        <orderedlist>
-          <listitem>
-            <para>
-              Select the <guilabel>Process Listing</guilabel> tab to display the process list.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Select the process that you want to hide.
-            </para>
-          </listitem>
-            <listitem>
-              <para>
-                Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Hide Process</guimenuitem></menuchoice>.
-              </para>
-              <para>
-                By default, a confirmation alert is displayed. For information about how to display or hide the confirmation alert, see <xref linkend="gnome-system-monitor-prefs-proclist"/>.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Click on the <guibutton>Hide Process</guibutton> button to confirm that you want to hide the process. 
-              </para>
-            </listitem>
-        </orderedlist>
-      </sect3>
-
-      <sect3 id="gnome-system-monitor-modify-processlist-hidden">
-        <title>To Re-Display Hidden Processes</title>
-        <para>
-          To re-display hidden processes in the process list, perform the following steps:
-        </para>
-        <orderedlist>
-          <listitem>
-            <para>
-              Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Hidden Processes</guimenuitem></menuchoice>. If no processes are currently hidden, an information alert is displayed. If any processes are currently hidden, the <guilabel>Manage Hidden Processes</guilabel> dialog is displayed. 
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Select the processes that you want to re-display in the process list.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click on the <guibutton>Remove From List</guibutton> button. The processes are no longer hidden, and are displayed in the process list.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Close</guibutton> to close the <guilabel>Manage Hidden Processes</guilabel> dialog.
-            </para>
-          </listitem>
-        </orderedlist>
-      </sect3>
-
     </sect2>
 
-    <sect2 id="gnome-system-monitor-find-process">
-      <title>To Find a Process</title>
-      <para>
-        To find a process in the process list, perform the following steps:
-      </para>
-      <orderedlist>
-        <listitem>
-          <para>
-            Select the <guilabel>Process Listing</guilabel> tab to display the process list.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Type the name of the process in the <guilabel>Search</guilabel> text box. Wildcards are not supported.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Press <keycap>Return</keycap>.
-          </para>
-          <para>
-            If the process exists, <application>&app;</application> highlights the process name in the process list. Press <keycap>Return</keycap> repeatedly to highlight other occurrences of the process name in the process list.
-          </para>
-          <para>
-            If the process does not exist, <application>&app;</application> displays an error dialog.
-          </para>
-        </listitem>
-      </orderedlist>
-    </sect2>
-
-    <sect2 id="gnome-system-monitor-show-info">
-      <title>To Show or Hide Additional Process Information</title>
-      <para>
-        To show additional information about a process, perform the following steps:
-      </para>
-      <orderedlist>
-        <listitem>
-          <para>
-            Select the <guilabel>Process Listing</guilabel> tab to display the process list.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Select the process in the process list. 
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Click on the <guibutton>More Info</guibutton> button.
-          </para>
-        </listitem>
-      </orderedlist>
-      <para>
-        <application>&app;</application> displays the following additional process information:
-      </para>
-      <variablelist>
-        <varlistentry>
-          <term><guilabel>Process Info</guilabel></term>
-          <listitem>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <guilabel>Command</guilabel>
-                </para>
-                <para>
-                  The name of the command that started the process.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <guilabel>Status</guilabel>
-                </para>
-                <para>
-                  The current status of the process: sleeping or running.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <guilabel>Priority</guilabel>
-                </para>
-                <para>
-                  The priority of the process, and the associated nice value.
-                </para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><guilabel>Memory Usage</guilabel></term>
-          <listitem>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <guilabel>Total</guilabel>
-                </para>
-                <para>
-                  The total amount of memory used by the process.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <guilabel>RSS</guilabel>
-                </para>
-                <para>
-                  The amount of RSS or physical memory used by the process.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <guilabel>Shared</guilabel>
-                </para>
-                <para>
-                  The amount of shared memory used by the process.
-                </para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-      <para>
-        To hide the additional process information, click on the <guibutton>Less Info</guibutton> button.
-      </para>
-      <tip>
-        <para>
-          You can also double-click on the process in the process list, to show or hide the additional process information. 
-        </para>
-      </tip>
-    </sect2>
-
     <sect2 id="gnome-system-monitor-memory-map">
       <title>To Display Memory Maps for a Process</title>
       <para>
@@ -725,7 +599,7 @@
       <orderedlist>
         <listitem>
           <para>
-            Select the <guilabel>Process Listing</guilabel> tab to display the process list.
+            Select the <guilabel>Processes</guilabel> tab to display the process list.
           </para>
         </listitem>
         <listitem>
@@ -866,7 +740,7 @@
       <orderedlist>
         <listitem>
           <para>
-            Select the <guilabel>Process Listing</guilabel> tab to display the process list.
+            Select the <guilabel>Processes</guilabel> tab to display the process list.
           </para>
         </listitem>
         <listitem>
@@ -907,7 +781,7 @@
       <orderedlist>
         <listitem>
           <para>
-            Select the <guilabel>Process Listing</guilabel> tab to display the process list.
+            Select the <guilabel>Processes</guilabel> tab to display the process list.
           </para>
         </listitem>
         <listitem>
@@ -942,7 +816,7 @@
       <orderedlist>
         <listitem>
           <para>
-            Select the <guilabel>Process Listing</guilabel> tab to display the process list.
+            Select the <guilabel>Processes</guilabel> tab to display the process list.
           </para>
         </listitem>
         <listitem>
@@ -972,7 +846,7 @@
     <sect2 id="gnome-system-monitor-cpu">
       <title>To Monitor CPU Usage</title>
       <para>
-        To monitor CPU usage, select the <guilabel>Resource Monitor</guilabel> tab.
+        To monitor CPU usage, select the <guilabel>Resources</guilabel> tab.
       </para>
       <para>
         <application>&app;</application> displays the CPU usage history in graphical format. Underneath the graph, <application>&app;</application> also displays the current CPU usage, as a percentage.
@@ -983,7 +857,7 @@
     <sect2 id="gnome-system-monitor-memory">
       <title>To Monitor Memory and Swap Usage</title>
       <para>
-        To monitor memory and swap usage, select the <guilabel>Resource Monitor</guilabel> tab.
+        To monitor memory and swap usage, select the <guilabel>Resources</guilabel> tab.
       </para>
       <para>
         <application>&app;</application> displays the memory usage history and the swap usage history in graphical format. Underneath the graph, <application>&app;</application> also displays the following numerical values: 
@@ -991,84 +865,112 @@
       <itemizedlist>
         <listitem>
           <para>
-            User memory
+            User memory out of total memory
           </para>
         </listitem>
         <listitem>
           <para>
-            Total memory
+            Used swap out of total swap
           </para>
         </listitem>
+      </itemizedlist>
+
+    </sect2>
+    
+    <sect2 id="gnome-system-monitor-network">
+      <title>To Monitor Network Activity</title>
+      <para>
+        To monitor network activity, select the <guilabel>Resources</guilabel> tab.
+      </para>
+      <para>
+        <application>&app;</application> displays the network history in graphical format. Underneath the graph, <application>&app;</application> also displays the following numerical values: 
+      </para>
+      <itemizedlist>
         <listitem>
           <para>
-            Used swap
+            Received data per second and total
           </para>
         </listitem>
         <listitem>
           <para>
-            Total swap
+            Sent data per second and total
           </para>
         </listitem>
       </itemizedlist>
-
     </sect2>
 
     <sect2 id="gnome-system-monitor-disk">
-      <title>To Monitor Disk Space Usage</title>
+      <title>To Monitor File Systems</title>
       <para>
-        To monitor disk space usage, select the <guilabel>Resource Monitor</guilabel> tab.
+        To monitor file systems, select the <guilabel>File Systems</guilabel> tab.
       </para>
       <para>
-        <application>&app;</application> displays the disk space usage information in tabular format. From left to right, the <guilabel>Devices</guilabel> table displays the following columns:
+        <application>&app;</application> displays mounted file systems in tabular format. From left to right, the table displays the following columns:
       </para>
       <variablelist>
         <varlistentry>
-          <term><guilabel>Name</guilabel></term>
+          <term>
+            Device
+          </term>
           <listitem>
-            <para>
-              The name of the device.
-            </para>
+            <para>Location of block file</para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><guilabel>Directory</guilabel></term>
+          <term>
+            Directory
+          </term>
           <listitem>
-            <para>
-              The location of the device.
-            </para>
+            <para>Mount point (directory to access) of device</para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><guilabel>Type</guilabel></term>
+          <term>
+            Type
+          </term>
           <listitem>
-            <para>
-              The type of the device.
-            </para>
+            <para>Filesystem type</para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><guilabel>Total</guilabel></term>
+          <term>
+            Total
+          </term>
           <listitem>
-            <para>
-              The total amount of disk space available on the device.
-            </para>
+            <para>Total capacity</para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><guilabel>Used</guilabel></term>
+          <term>
+            Free
+          </term>
           <listitem>
-            <para>
-              The amount of disk space currently used on the device, expressed in bytes and as a percentage.
-            </para>
+            <para>Amount of space not in use</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            Available
+          </term>
+          <listitem>
+            <para>Amount of space which can be used</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            Used
+          </term>
+          <listitem>
+            <para>Amount of space which is used (and percentage of Total)</para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </sect2>
 
     <sect2 id="gnome-system-monitor-customize">
-      <title>To Customize the Resource Monitor Tabbed Section</title>
+      <title>To Customize the Resources Tabbed Section</title>
       <para>
-        You can customize the <guilabel>Resource Monitor</guilabel> tabbed section in the following ways:
+        You can customize the <guilabel>Resources</guilabel> tabbed section in the following ways:
       </para>
       <itemizedlist>
         <listitem>
@@ -1102,7 +1004,7 @@
           </listitem>
           <listitem>
             <para>
-              Select the <guilabel>Resource Monitor</guilabel> tab in the <guilabel>Preferences</guilabel> dialog.
+              Select the <guilabel>Resources</guilabel> tab in the <guilabel>Preferences</guilabel> dialog.
             </para>
           </listitem>
           <listitem>
@@ -1141,7 +1043,7 @@
           </listitem>
           <listitem>
             <para>
-              Select the <guilabel>Resource Monitor</guilabel> tab in the <guilabel>Preferences</guilabel> dialog.
+              Select the <guilabel>Resources</guilabel> tab in the <guilabel>Preferences</guilabel> dialog.
             </para>
           </listitem>
           <listitem>
@@ -1175,7 +1077,7 @@
         <orderedlist>
           <listitem>
             <para>
-              Select the <guilabel>Resource Monitor</guilabel> tab in the <guilabel>System Monitor</guilabel> window, to display the graphs and table that provide information about the usage of system resources.
+              Select the <guilabel>Resources</guilabel> tab in the <guilabel>System Monitor</guilabel> window, to display the graphs and table that provide information about the usage of system resources.
             </para>
           </listitem>
           <listitem>
@@ -1204,7 +1106,7 @@
         <orderedlist>
           <listitem>
             <para>
-              Select the <guilabel>Resource Monitor</guilabel> tab in the <guilabel>System Monitor</guilabel> window, to display the graphs and table that provide information about the usage of system resources.
+              Select the <guilabel>Resources</guilabel> tab in the <guilabel>System Monitor</guilabel> window, to display the graphs and table that provide information about the usage of system resources.
             </para>
           </listitem>
           <listitem>
@@ -1243,7 +1145,7 @@
     </itemizedlist>
 
     <sect2 id="gnome-system-monitor-prefs-proclist">
-      <title>Process Listing</title>
+      <title>Processes</title>
         <variablelist>
           <varlistentry>
             <term>
@@ -1253,7 +1155,7 @@
               <itemizedlist>
                 <listitem>
                   <para>
-                    <guilabel>Update interval ... seconds</guilabel>
+                    <guilabel>Update interval in seconds</guilabel>
                   </para>
                   <para>
                     Use this spin box to specify the interval at which you want to update the process list. 
@@ -1261,18 +1163,26 @@
                 </listitem>
                 <listitem>
                   <para>
-                    <guilabel>Show warning dialog when ending or killing processes</guilabel>
+                    <guilabel>Enable smooth refresh</guilabel>
                   </para>
                   <para>
+                    Select this option to refresh smoothly.
+                  </para>
+                </listitem>
+                <listitem>
+                  <para>
+                    <guilabel>Alert before ending or killing processes</guilabel>
+                  </para>
+                  <para>
                     Select this option to display a confirmation alert when you end a process or terminate a process.
                   </para>
                 </listitem>
                 <listitem>
                   <para>
-                    <guilabel>Show warning dialog when hiding processes</guilabel>
+                    <guilabel>Solaris mode</guilabel>
                   </para>
                   <para>
-                    Select this option to display a confirmation alert when you hide a process.
+                    Select this to divide each process' CPU% in the Processes table by the number of CPUs.
                   </para>
                 </listitem>
               </itemizedlist>
@@ -1297,14 +1207,6 @@
                 </listitem>
                 <listitem>
                   <para>
-                    <guilabel>Arguments</guilabel>
-                  </para>
-                  <para>
-                    Select this option to display the name of the command, including arguments, that started the process.
-                  </para>
-                </listitem>
-                <listitem>
-                  <para>
                     <guilabel>User</guilabel>
                   </para>
                   <para>
@@ -1321,26 +1223,26 @@
                 </listitem>
                 <listitem>
                   <para>
-                    <guilabel>Memory</guilabel>
+                    <guilabel>Virtual Memory</guilabel>
                   </para>
                   <para>
-                    Select this option to display the amount of system memory that is currently being used by the process.
+                    Select this option to display the amount of virtual memory that is allocated to the process.
                   </para>
                 </listitem>
                 <listitem>
                   <para>
-                    <guilabel>VM Size</guilabel>
+                    <guilabel>Resident Memory</guilabel>
                   </para>
                   <para>
-                    Select this option to display the amount of virtual memory that is allocated to the process.
+                    Select this option to display the amount of physical memory that is allocated to the process.
                   </para>
                 </listitem>
                 <listitem>
                   <para>
-                    <guilabel>Resident Memory</guilabel>
+                    <guilabel>Writable Memory</guilabel>
                   </para>
                   <para>
-                    Select this option to display the amount of physical memory that is allocated to the process.
+                    Select this option to display the amount of memory that can be written by the process.
                   </para>
                 </listitem>
                 <listitem>
@@ -1353,30 +1255,38 @@
                 </listitem>
                 <listitem>
                   <para>
-                    <guilabel>RSS Memory</guilabel>
+                    <guilabel>X Server Memory</guilabel>
                   </para>
                   <para>
-                    Select this option to display the amount of physical memory, excluding swapped-out pages, that is used by the process.
+                    Select this option to display the amount of X server memory that is used by the process.
                   </para>
                 </listitem>
                 <listitem>
                   <para>
-                    <guilabel>X Server Memory</guilabel>
+                    <guilabel>% CPU</guilabel>
                   </para>
                   <para>
-                    Select this option to display the amount of X server memory that is used by the process.
+                    Select this option to display the percentage of CPU time currently being used by the process.
                   </para>
                 </listitem>
                 <listitem>
                   <para>
-                    <guilabel>% CPU</guilabel>
+                    <guilabel>CPU Time</guilabel>
                   </para>
                   <para>
-                    Select this option to display the percentage of CPU time currently being used by the process.
+                    Select this option to display the amount of CPU time that has been used by the process.
                   </para>
                 </listitem>
                 <listitem>
                   <para>
+                    <guilabel>Started</guilabel>
+                  </para>
+                  <para>
+                    Select this option to display when the process began running.
+                  </para>
+                </listitem>
+                <listitem>
+                  <para>
                     <guilabel>Nice</guilabel>
                   </para>
                   <para>
@@ -1391,6 +1301,30 @@
                     Select this option to display the process identifier, also known as the pid. The pid is a number that uniquely identifies the process. You can use the pid to manipulate the process on the command line.
                   </para>
                 </listitem>
+                <listitem>
+                  <para>
+                    <guilabel>Memory</guilabel>
+                  </para>
+                  <para>
+                    Select this option to display the amount of system memory that is currently being used by the process.
+                  </para>
+                </listitem>
+                <listitem>
+                  <para>
+                    <guilabel>Security Context</guilabel>
+                  </para>
+                  <para>
+                    Select this option to display the security context in which the process is running.
+                  </para>
+                </listitem>
+                <listitem>
+                  <para>
+                    <guilabel>Command Line</guilabel>
+                  </para>
+                  <para>
+                    Select this option to display the command line that was used to start the process, including arguments.
+                  </para>
+                </listitem>
               </itemizedlist>
             </listitem>
           </varlistentry>
@@ -1398,7 +1332,7 @@
     </sect2>
 
     <sect2 id="gnome-system-monitor-prefs-resmon">
-      <title>Resource Monitor</title>
+      <title>Resources</title>
         <variablelist>
           <varlistentry>
             <term><guilabel>Graphs</guilabel></term>
@@ -1406,7 +1340,7 @@
               <itemizedlist>
                 <listitem>
                   <para>
-                    <guilabel>Update interval ... seconds</guilabel>
+                    <guilabel>Update interval in seconds</guilabel>
                   </para>
                   <para>
                     Use this spin box to specify how often you want to update the <application>&app;</application> graphs.
@@ -1432,17 +1366,25 @@
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term><guilabel>Devices</guilabel></term>
+            <term><guilabel>File Systems</guilabel></term>
             <listitem>
               <itemizedlist>
                 <listitem>
                   <para>
-                    <guilabel>Update interval ... seconds</guilabel>
+                    <guilabel>Update interval in seconds</guilabel>
                   </para>
                   <para>
-                    Use this spin box to specify how often you want to update the <guilabel>Devices</guilabel> table.
+                    Use this spin box to specify how often you want to update the <guilabel>File Systems</guilabel> table.
                   </para>
                 </listitem>
+                <listitem>
+                  <para>
+                    <guilabel>Show all filesystems</guilabel>
+                  </para>
+                  <para>
+                    Select this option to show all filesystems, including temporary and system ones.
+                  </para>
+                </listitem>
               </itemizedlist>
             </listitem>
           </varlistentry>
