Updated files for GNOME 2.2 System Admin Guide V2.1.

7 files changed, 406 insertions, 188 deletions

diff --git a/gnome2-system-admin-guide/C/ChangeLog b/gnome2-system-admin-guide/C/ChangeLog
index d257016..0448044 100644
--- a/gnome2-system-admin-guide/C/ChangeLog
+++ b/gnome2-system-admin-guide/C/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-24 Eugene O'Connor <eugene.oconnor@sun.com>
+
+   * Updated System Administration Guide for GNOME 2.2.
+
 2002-12-19 Eugene O'Connor <eugene.oconnor@sun.com>
 
    * Added PDF of System Administration Guide.
diff --git a/gnome2-system-admin-guide/C/gconf.xml b/gnome2-system-admin-guide/C/gconf.xml
index 71d0964..6226414 100644
--- a/gnome2-system-admin-guide/C/gconf.xml
+++ b/gnome2-system-admin-guide/C/gconf.xml
@@ -1,6 +1,4 @@
-<!-- converted from Solbook 2.2 SGML to Docbook 4.2 XML
-# Generator: s2d v1.4 2002-09-19
--->
+<?xml version="1.0" encoding="utf-8"?>
 <chapter id="gconf-0">
   <title>Using GConf</title>
   <highlights>
@@ -209,9 +207,22 @@ source in the home directory, in a file that is called <filename>.gconf.path</fi
         <primary>GConf</primary>
         <secondary>schema objects</secondary>
       </indexterm>
-      <para>A <firstterm>GConf schema</firstterm> is a collective term for a <firstterm>GConf schema key</firstterm> and a <firstterm>GConf schema object</firstterm>.
-The following table describes schema keys and schema objects and the relationship
-of these items to preference keys:</para>
+      <indexterm>
+        <primary>schemas</primary>
+        <secondary>description</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>schemas</primary>
+        <secondary>schema keys</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>schemas</primary>
+        <secondary>schema objects</secondary>
+      </indexterm>
+      <para>A <firstterm>GConf schema</firstterm> is a collective term
+for a <firstterm>GConf schema key</firstterm> and a <firstterm>GConf schema
+object</firstterm>. The following table describes schema keys and schema objects
+and the relationship of these items to preference keys:</para>
       <informaltable frame="topbot">
         <tgroup cols="2" colsep="0" rowsep="0">
           <colspec colname="colspec0" colwidth="24.31*"/>
@@ -347,9 +358,15 @@ configuration source are associated with schema keys.</para>
         <secondary>schema definition files</secondary>
         <tertiary>introduction</tertiary>
       </indexterm>
-      <para>Schemas are generated from <firstterm>schema definition files</firstterm>. A schema definition file defines the
-characteristics of all of the keys in a particular application. Schema definition
-files have a <filename>.schemas</filename> extension.</para>
+      <indexterm>
+        <primary>schemas</primary>
+        <secondary>schema definition files</secondary>
+        <tertiary>introduction</tertiary>
+      </indexterm>
+      <para>Schemas are generated from <firstterm>schema definition
+files</firstterm>. A schema definition file defines the characteristics of
+all of the keys in a particular application. Schema definition files have
+a <filename>.schemas</filename> extension.</para>
       <para>The schema definition files are included in the <filename>/etc/gconf/schemas</filename> directory. You can use the schema definition files to create a
 new configuration source.</para>
       <para>Some schema definition files correspond closely to a part of the GNOME
@@ -415,11 +432,15 @@ command:</para>
   <sect1 id="gconf-6">
     <title>GConf Command Line Tool</title>
     <indexterm>
+      <primary>gconftool-2</primary>
+      <see>GConf command line tool</see>
+    </indexterm>
+    <indexterm>
       <primary>GConf</primary>
       <secondary>command line tool</secondary>
     </indexterm>
-    <para><application>GConf</application> includes a command line
-tool, <command>gconftool-2</command>. You can use the <command>gconftool&ndash;2</command> command to perform the following tasks: </para>
+    <para><application>GConf</application> includes a
+command line tool, <command>gconftool-2</command>. You can use the <command>gconftool&ndash;2</command> command to perform the following tasks: </para>
     <itemizedlist>
       <listitem>
         <para>Set the values of keys.</para>
@@ -733,13 +754,17 @@ can use with the <command>gconftool-2</command> command.</para>
     <title>To Set Preference Values</title>
     <indexterm>
       <primary>GConf</primary>
-      <secondary>setting preference values</secondary>
+      <secondary>preference values, setting</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>preference values</primary>
+      <secondary>setting
+with GConf</secondary>
     </indexterm>
-    <para>You can set a mandatory value or a default value for a preference
-key. Before you change mandatory preference values or default preference values
-for users, you must ensure that the <application>GConf</application> daemon
-is not running for any user. Ensure that all users are logged out before you
-change preference values for users.</para>
+    <para>You can set a mandatory value or a
+default value for a preference key. Before you change mandatory preference
+values or default preference values for users, you must ensure that the <application>GConf</application> daemon is not running for any user. Ensure that all users
+are logged out before you change preference values for users.</para>
     <para>To set a mandatory value or a default value for a preference key, use
 the <command>gconftool-2</command> command, as follows:</para>
     <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source <replaceable>configuration_source</replaceable> --type <replaceable>data_type</replaceable>
@@ -770,12 +795,17 @@ to general preferences.</para>
       <title>To Set HTTP Proxy Preferences</title>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting HTTP proxy</secondary>
+        <secondary>HTTP proxy, setting</secondary>
       </indexterm>
-      <para>To set HTTP proxy preferences, you modify the values of
-the preference keys in the <filename>/system/http_proxy/</filename> location.
-For example, to set a mandatory value for the HTTP proxy host, run the following
-command:</para>
+      <indexterm>
+        <primary>HTTP proxy</primary>
+        <secondary>setting with
+GConf</secondary>
+      </indexterm>
+      <para>To set HTTP proxy preferences, you modify
+the values of the preference keys in the <filename>/system/http_proxy/</filename>
+location. For example, to set a mandatory value for the HTTP proxy host, run
+the following command:</para>
       <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source
 xml:readwrite:/etc/gconf/gconf.xml.mandatory --type string --set /system/http_proxy/host <replaceable>proxy_name</replaceable></userinput></para>
       <para>To set a default value for the HTTP proxy host, run the following command: </para>
@@ -792,11 +822,15 @@ if you do not want users to view the print jobs of other users, set a mandatory
 value as follows: </para>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting print manager</secondary>
+        <secondary>print manager, setting</secondary>
       </indexterm>
-      <para><computeroutput>#</computeroutput> <userinput>gconftool-2
---direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory --type
-bool --set /apps/gnome-print-manager/show_all_jobs false</userinput></para>
+      <indexterm>
+        <primary>print manager</primary>
+        <secondary>setting
+with GConf</secondary>
+      </indexterm>
+      <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory
+--type bool --set /apps/gnome-print-manager/show_all_jobs false</userinput></para>
       <para>To set a default value for this preference, run the following command:</para>
       <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source
 xml:readwrite:/etc/gconf/gconf.xml.defaults --type bool --set /apps/gnome-print-manager/show_all_jobs
@@ -808,10 +842,14 @@ the other print manager preferences, see the <filename>gnome-print-manager.schem
       <title>To Set the Number of Workspaces</title>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting number of workspaces</secondary>
+        <secondary>number of workspaces, setting</secondary>
       </indexterm>
-      <para>To set a mandatory number of workspaces, use
-the following command:</para>
+      <indexterm>
+        <primary>workspaces</primary>
+        <secondary>setting number with GConf</secondary>
+      </indexterm>
+      <para>To set a mandatory
+number of workspaces, use the following command:</para>
       <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source
 xml:readwrite:/etc/gconf/gconf.xml.mandatory --type int --set /apps/metacity/general/num_workspaces <replaceable>integer</replaceable></userinput></para>
       <para>To set a default number of workspaces, use the following command:</para>
@@ -825,11 +863,16 @@ schema definition file.</para>
       <title>To Set Keyboard Accessibility Preferences</title>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting keyboard accessibility</secondary>
+        <secondary>keyboard accessibility, setting</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>keyboard</primary>
+        <secondary>setting accessibility preferences with GConf</secondary>
       </indexterm>
-      <para>To set keyboard accessibility preferences, you
-modify the values of the preference keys in the <filename>/desktop/gnome/accessibility/keyboard</filename> location. For example, if you want to set a mandatory value so
-that keyboard accessibility features are enabled, run the following command:</para>
+      <para>To set keyboard accessibility preferences, you modify the values of the preference
+keys in the <filename>/desktop/gnome/accessibility/keyboard</filename> location.
+For example, if you want to set a mandatory value so that keyboard accessibility
+features are enabled, run the following command:</para>
       <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source
 xml:readwrite:/etc/gconf/gconf.xml.mandatory --type bool --set /desktop/gnome/accessibility/keyboard/enable
 true</userinput></para>
@@ -844,11 +887,16 @@ on the other keyboard accessibility preferences, see the <filename>desktop_gnome
       <title>To Set Keyboard Shortcut Preferences</title>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting keyboard shortcuts</secondary>
+        <secondary>keyboard shortcuts, setting</secondary>
       </indexterm>
-      <para>To set keyboard shortcut preferences, you modify the values
-of preference keys in two locations. The following table shows the locations
-to modify, and the part of the user interface to which the locations correspond:</para>
+      <indexterm>
+        <primary>keyboard</primary>
+        <secondary>setting shortcut preferences with GConf</secondary>
+      </indexterm>
+      <para>To set
+keyboard shortcut preferences, you modify the values of preference keys in
+two locations. The following table shows the locations to modify, and the
+part of the user interface to which the locations correspond:</para>
       <informaltable frame="topbot">
         <tgroup cols="2" colsep="0" rowsep="0">
           <colspec colwidth="50*"/>
@@ -907,12 +955,16 @@ on the other keyboard shortcut preferences, see the <filename>panel-global-confi
       <title>To Set Global Panel Preferences</title>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting global panel preferences</secondary>
+        <secondary>global panel preferences, setting</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>panels</primary>
+        <secondary>setting
+global preferences with GConf</secondary>
       </indexterm>
-      <para>To set global preferences for panels, you modify
-the values of the preference keys in the <filename>/apps/panel/global</filename>
-location. For example, if you do not want users to ever use panel animation,
-set a mandatory value as follows:</para>
+      <para>To set global preferences
+for panels, you modify the values of the preference keys in the <filename>/apps/panel/global</filename> location. For example, if you do not want users
+to ever use panel animation, set a mandatory value as follows:</para>
       <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source
 xml:readwrite:/etc/gconf/gconf.xml.mandatory --type bool --set /apps/panel/global/enable_animations
 false</userinput></para>
@@ -927,15 +979,20 @@ the other global panel preferences, see the <filename>panel-global-config.schema
       <title>To Set Preferences for Individual Panels and Panel Objects</title>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting panel object preferences</secondary>
+        <secondary>panel object preferences, setting</secondary>
       </indexterm>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting
-individual panel preferences</secondary>
+        <secondary>panel
+preferences, setting individual </secondary>
+      </indexterm>
+      <indexterm>
+        <primary>panels</primary>
+        <secondary>preferences, individual, setting with GConf</secondary>
       </indexterm>
-      <para>The <filename>panel-per-panel-config.schemas</filename> schema definition file specifies the following details of the
-panels on the desktop:</para>
+      <para>The <filename>panel-per-panel-config.schemas</filename>
+schema definition file specifies the following details of the panels on the
+desktop:</para>
       <itemizedlist>
         <listitem>
           <para>Number of panels.</para>
@@ -965,12 +1022,16 @@ script that sets preferences for a panel and objects on the panel, see <xref lin
           <secondary>schema definition files</secondary>
           <tertiary>panel and panel object</tertiary>
         </indexterm>
-        <para>The schema definition
-file <filename>panel-per-panel-config.schemas</filename> contains sections
-that specify panels and panel contents for small, medium, and large screens.
-The section for small screens and the section for large screens are not functional
-at the time of publication of this guide. To learn about preference keys for
-panels or panel objects, read the section for medium screens only. </para>
+        <indexterm>
+          <primary>schemas</primary>
+          <secondary>schema definition files</secondary>
+          <tertiary>panel and panel object</tertiary>
+        </indexterm>
+        <para>The schema definition file <filename>panel-per-panel-config.schemas</filename> contains sections that specify panels
+and panel contents for small, medium, and large screens. The section for small
+screens and the section for large screens are not functional at the time of
+publication of this guide. To learn about preference keys for panels or panel
+objects, read the section for medium screens only. </para>
         <para>The medium section of the file <filename>panel-per-panel-config.schemas</filename> is structured as follows:</para>
         <orderedlist>
           <listitem>
@@ -1178,11 +1239,15 @@ to look-and-feel preferences.</para>
       <title>To Set Font Preferences</title>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting fonts</secondary>
+        <secondary>fonts, setting</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>fonts</primary>
+        <secondary>setting with GConf</secondary>
       </indexterm>
-      <para>To set font preferences, you modify the values of two preference keys.
-The following table shows the keys to modify, and the part of the user interface
-to which the keys correspond:</para>
+      <para>To set font preferences, you modify the values of two preference
+keys. The following table shows the keys to modify, and the part of the user
+interface to which the keys correspond:</para>
       <informaltable frame="topbot">
         <tgroup cols="2" colsep="0" rowsep="0">
           <colspec colwidth="50*"/>
@@ -1222,8 +1287,13 @@ font, run the following command:</para>
       <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source
 xml:readwrite:/etc/gconf/gconf.xml.mandatory --type string --set /desktop/gnome/interface/font_name &ldquo;Sans
 12&rdquo;</userinput></para>
-      <para>To set <literal>palatino 12</literal> as the default desktop background
-object font, run the following command:</para>
+      <indexterm>
+        <primary>desktop background</primary>
+        <secondary>font preferences,
+setting with GConf</secondary>
+      </indexterm>
+      <para>To set <literal>palatino 12</literal> as the default desktop background object font, run the following
+command:</para>
       <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source
 xml:readwrite:/etc/gconf/gconf.xml.defaults --type string --set /apps/nautilus/preferences/desktop_font &ldquo;palatino
 12&rdquo;</userinput></para>
@@ -1232,12 +1302,15 @@ xml:readwrite:/etc/gconf/gconf.xml.defaults --type string --set /apps/nautilus/p
       <title>To Set Desktop Background Preferences</title>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting desktop background</secondary>
+        <secondary>desktop background, setting</secondary>
       </indexterm>
-      <para>To set desktop background preferences, you modify the values
-of the preference keys in the <filename>/desktop/gnome/background</filename>
-location. For example, to set a mandatory image for the desktop background,
-run the following command:</para>
+      <indexterm>
+        <primary>desktop background</primary>
+        <secondary>preferences, setting with GConf</secondary>
+      </indexterm>
+      <para>To set desktop
+background preferences, you modify the values of the preference keys in the <filename>/desktop/gnome/background</filename> location. For example, to set a mandatory
+image for the desktop background, run the following command:</para>
       <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source
 xml:readwrite:/etc/gconf/gconf.xml.mandatory --type string --set /desktop/gnome/background/picture_filename <replaceable>filename.png</replaceable></userinput></para>
       <para>To set a default value for this preference, run the following command:</para>
@@ -1250,12 +1323,16 @@ on the other desktop background preferences, see the <filename>desktop_gnome_bac
       <title>To Set Splash Image Preferences</title>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>setting splash image</secondary>
+        <secondary>splash image, setting</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>splash screen</primary>
+        <secondary>image, setting
+with GConf</secondary>
       </indexterm>
-      <para>To set splash image preferences, you modify the value of
-the preference keys in the <filename>/apps/gnome-session/options/</filename>
-location. For example, if you do not want users ever to see a splash image,
-set a mandatory value as follows:</para>
+      <para>To set splash image preferences, you
+modify the value of the preference keys in the <filename>/apps/gnome-session/options/</filename> location. For example, if you do not want users ever to see a
+splash image, set a mandatory value as follows:</para>
       <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source
 xml:readwrite:/etc/gconf/gconf.xml.mandatory --type bool --set /apps/gnome-session/options/show_splash_screen
 false</userinput></para>
@@ -1274,24 +1351,17 @@ the other splash image preferences, see the <filename>gnome-session.schemas</fil
       <secondary>restoring default preference
 values</secondary>
     </indexterm>
-    <para>To restore the default preference values
-for a user, perform the following steps:</para>
-    <orderedlist>
-      <listitem>
-        <para>Log in as the user whose default preference values you want
-to restore.</para>
-      </listitem>
-      <listitem>
-        <para>Run the following command:</para>
-        <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --recursive-unset</userinput></para>
-        <para>This command resets the values of all preference keys, in all subdirectories,
+    <indexterm>
+      <primary>preference values</primary>
+      <secondary>restoring to default with GConf</secondary>
+    </indexterm>
+    <para>To
+restore the default preference values for a user, run the following command:</para>
+    <para><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct --config-source <replaceable>user_configuration_source</replaceable> --recursive-unset</userinput></para>
+    <para>Replace <replaceable>user_configuration_source</replaceable> with the
+configuration source in the <filename>.gconf</filename> directory in the home
+directory of the user. </para>
+    <para>This command resets the values of all preference keys, in all subdirectories,
 from the user setting to the setting in the default configuration source.</para>
-      </listitem>
-      <listitem>
-        <para>Log out from the user account.</para>
-      </listitem>
-    </orderedlist>
   </sect1>
 </chapter>
-
-
diff --git a/gnome2-system-admin-guide/C/glossary.xml b/gnome2-system-admin-guide/C/glossary.xml
index 98b5b9d..6c9ddf9 100644
--- a/gnome2-system-admin-guide/C/glossary.xml
+++ b/gnome2-system-admin-guide/C/glossary.xml
@@ -1,6 +1,4 @@
-<!-- converted from Solbook 2.2 SGML to Docbook 4.2 XML
-# Generator: s2d v1.4 2002-09-19
--->
+<?xml version="1.0" encoding="utf-8"?>
 <glossary id="glossary-1">
   <title>Glossary</title>
   <glossentry id="glossary-13">
@@ -11,13 +9,21 @@
     <glossterm><filename>.directory</filename> file</glossterm>
     <glosssee otherterm="glossary-12"/>
   </glossentry>
+  <glossentry id="glossary-18">
+    <glossterm>application registry</glossterm>
+    <glossdef>
+      <para>The application registry is a location that contains text
+files which register applications. The location of the application registry
+for the GNOME desktop is <filename>/usr/share/gnome/application-registry</filename>.</para>
+    </glossdef>
+  </glossentry>
   <glossentry id="glossary-11">
     <glossterm>desktop entry file</glossterm>
     <glossdef>
       <para>A data file that provides information about an item in a menu.
-The desktop entry file specifies details such as a name for the item, the
-command for the item to run, an icon to represent the item, and so on. Desktop
-entry files have a <filename>.desktop</filename> file extension.</para>
+The desktop entry file specifies the details for the item such as a name,
+a command to run, an icon, and so on. Desktop entry files have
+a <filename>.desktop</filename> file extension.</para>
     </glossdef>
   </glossentry>
   <glossentry id="glossary-12">
@@ -28,6 +34,15 @@ entry file specifies details such as a name for the menu, a tooltip for the
 menu, and an icon to represent the menu. Directory entry files have a <filename>.directory</filename> file extension.</para>
     </glossdef>
   </glossentry>
+  <glossentry id="glossary-23">
+    <glossterm>file content sniffer</glossterm>
+    <glossdef>
+      <para>A file content sniffer specifies a pattern to search for in
+a file. A file content sniffer associates the pattern with a MIME type. If
+a match for the pattern is found, the MIME type associated with the pattern
+is the MIME type of the file.</para>
+    </glossdef>
+  </glossentry>
   <glossentry id="glossary-5">
     <glossterm>GConf configuration source</glossterm>
     <glossdef>
@@ -83,6 +98,88 @@ about a preference key. The schema object contains information such as a default
 value for the preference key, and documentation on the preference key. </para>
     </glossdef>
   </glossentry>
+  <glossentry id="glossary-26">
+    <glossterm>Interoperable Object Reference</glossterm>
+    <glossdef>
+      <para>An Interoperable Object Reference (IOR) is a string reference
+to a  CORBA object. An IOR encodes a hostname and port to which messages can
+be sent to control the object. The IOR also contains an object key to identify
+the object.</para>
+    </glossdef>
+  </glossentry>
+  <glossentry id="glossary-27">
+    <glossterm>MIME</glossterm>
+    <glossdef>
+      <para>Multipurpose Internet Mail Extension.</para>
+    </glossdef>
+  </glossentry>
+  <glossentry id="glossary-20">
+    <glossterm>MIME information file</glossterm>
+    <glossdef>
+      <para>A MIME information file is a text file that associates MIME
+types with filename extensions and filename patterns. MIME information files
+have a <filename>.mime</filename> file extension.</para>
+    </glossdef>
+  </glossentry>
+  <glossentry id="glossary-21">
+    <glossterm>MIME keys file</glossterm>
+    <glossdef>
+      <para>A MIME keys file provides information about a MIME type that
+is used in the user interface. For example, the MIME keys file specifies an
+icon to represent files of that MIME type. MIME keys files have a <filename>.keys</filename> file extension.</para>
+    </glossdef>
+  </glossentry>
+  <glossentry id="glossary-16">
+    <glossterm>MIME type</glossterm>
+    <glossdef>
+      <para>A MIME type identifies the format of a file. The MIME type
+enables applications to read the file. For example, an email application can
+use the MIME type to detect what type of file is in a file attached to an
+email. </para>
+    </glossdef>
+  </glossentry>
+  <glossentry id="glossary-22">
+    <glossterm>MIME type registry</glossterm>
+    <glossdef>
+      <para>The MIME type registry is a location that contains text files
+which register MIME types for the GNOME desktop. The location of the MIME
+type registry for the GNOME desktop is <filename>/usr/gnome/share/mime-info</filename>.</para>
+    </glossdef>
+  </glossentry>
+  <glossentry id="glossary-24">
+    <glossterm>Netscape color palette</glossterm>
+    <glossdef>
+      <para>The <application>Netscape</application> color palette is a
+general-purpose palette of 216 colors. The <application>Netscape</application>
+color palette is designed to optimize the use of color on systems that support
+8-bit color. The <application>Netscape</application> color palette is also
+called the <emphasis>websafe color palette</emphasis> and the <emphasis>Netscape
+color cube</emphasis>.</para>
+    </glossdef>
+  </glossentry>
+  <glossentry id="glossary-25">
+    <glossterm>pattern mask</glossterm>
+    <glossdef>
+      <para>A pattern mask is a series of hexadecimal characters in a
+file content sniffer. The pattern mask identifies bits in the pattern to ignore
+when searching for a pattern in a file. </para>
+    </glossdef>
+  </glossentry>
+  <glossentry id="glossary-28">
+    <glossterm>screensaver</glossterm>
+    <glossdef>
+      <para>A screensaver is an application that replaces the image on
+a screen when the screen is not in use. The screensaver application for the
+GNOME desktop is <application>XScreenSaver</application>. </para>
+    </glossdef>
+  </glossentry>
+  <glossentry id="glossary-29">
+    <glossterm>screensaver display</glossterm>
+    <glossdef>
+      <para>A screensaver display is an application that displays images
+on the screen of the user when the screen is not in use. </para>
+    </glossdef>
+  </glossentry>
   <glossentry id="glossary-15">
     <glossterm>Uniform Resource Identifier</glossterm>
     <glossdef>
@@ -104,10 +201,8 @@ several directories.</para>
   <glossentry id="glossary-10">
     <glossterm>vfolder information file</glossterm>
     <glossdef>
-      <para>A description of a vfolder, in XML format. Vfolder information
+      <para>An XML file that describes a vfolder. Vfolder information
 files specify the structure of your menus.</para>
     </glossdef>
   </glossentry>
 </glossary>
-
-
diff --git a/gnome2-system-admin-guide/C/l10n-readme.txt b/gnome2-system-admin-guide/C/l10n-readme.txt
index 80a7b29..c44bde3 100644
--- a/gnome2-system-admin-guide/C/l10n-readme.txt
+++ b/gnome2-system-admin-guide/C/l10n-readme.txt
@@ -1 +1,37 @@
-This is the first release of this Guide.
\ No newline at end of file
+___________________________________________________________
+GNOME 2.2 Desktop System Administration Guide - L10n readme
+Written by: Eugene O'Connor (eugene.oconnor@sun.com)
+Manual revision: 2.1
+Date: 24 January 2003
+
+Changes between Version 2.0 and 2.1
+===================================
+gconf: Updated To Restore Default Preference Values section. Removed numbered list and replaced with one command.
+menustructure: Updated Icon row in tables in Desktop Entry Files and Directory Entry Files. Updated tables in Vfolders, Desktop Entry 
+Files, and Directory Entry Files to use "Specifies" rather than "Enter" for consistency with rest of book.
+glossary: New terms added.
+
+New chapters: 
+themes
+mimetypes
+screensavers
+sessions
+performance
+appendixa
+
+
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Manual revision: 2.0
+Date: December 2002
+
+First version.
+
+
+________________________________________________________________________
+GNOME 2.0 Desktop  System Administration Guide - Screenshot Instructions
+Written by: Eugene O'Connor (eugene.oconnor@sun.com)
+Manual revision: 2.1
+Date: 14 January 2003
+
+There are no screenshots in this manual.
\ No newline at end of file
diff --git a/gnome2-system-admin-guide/C/menustructure.xml b/gnome2-system-admin-guide/C/menustructure.xml
index 9b64ff8..f576c73 100644
--- a/gnome2-system-admin-guide/C/menustructure.xml
+++ b/gnome2-system-admin-guide/C/menustructure.xml
@@ -1,6 +1,4 @@
-<!-- converted from Solbook 2.2 SGML to Docbook 4.2 XML
-# Generator: s2d v1.4 2002-09-19
--->
+<?xml version="1.0" encoding="utf-8"?>
 <chapter id="menustructure-0">
   <title>Customizing Menus</title>
   <highlights>
@@ -113,23 +111,26 @@ for all users</para>
     </indexterm>
     <indexterm>
       <primary>vfolders</primary>
-      <see>menus, vfolders</see>
     </indexterm>
-    <para>In general terms, a <firstterm>vfolder</firstterm> is a virtual representation
-of items that reside in a physical location or physical locations on your
-system. For example, a vfolder might represent the contents of several directories.
-A vfolder is an abstraction from one or more physical locations. In terms
-of menus in the GNOME desktop, a vfolder is a representation in a menu of
-items that might be physically located in several directories. </para>
+    <para>In general terms,
+a <firstterm>vfolder</firstterm> is a virtual representation of items that
+reside in a physical location or physical locations on your system. For example,
+a vfolder might represent the contents of several directories. A vfolder is
+an abstraction from one or more physical locations. In terms of menus in the
+GNOME desktop, a vfolder is a representation in a menu of items that might
+be physically located in several directories. </para>
     <indexterm>
       <primary>menus</primary>
       <secondary>vfolder information files</secondary>
     </indexterm>
-    <para>A <firstterm>vfolder information file</firstterm> is an
-XML file that describes a vfolder. Vfolder information files specify the structure
-of your menus. Vfolder information files specify the names of your menus,
-and the order in which applications appear in your menus. Vfolder information
-files have a <filename>.vfolder-info</filename> file extension. </para>
+    <indexterm>
+      <primary>vfolder information files</primary>
+    </indexterm>
+    <para>A <firstterm>vfolder information file</firstterm> is an XML file that
+describes a vfolder. Vfolder information files specify the structure of your
+menus. Vfolder information files specify the names of your menus, and the
+order in which applications appear in your menus. Vfolder information files
+have a <filename>.vfolder-info</filename> file extension. </para>
     <para>The following is an excerpt from a vfolder information file:</para>
     <literallayout>&lt;?xml version=&quot;1.0&quot;?&gt;
 &lt;VFolderInfo&gt;
@@ -191,7 +192,7 @@ the name, content, and structure of the menu.</para>
               </para>
             </entry>
             <entry colname="colspec3" valign="top">
-              <para>The name of the menu.</para>
+              <para>Specifies the name of the menu.</para>
             </entry>
           </row>
           <row>
@@ -201,8 +202,8 @@ the name, content, and structure of the menu.</para>
               </para>
             </entry>
             <entry colname="colspec3" valign="top">
-              <para>The name of the directory entry
-file that specifies the name, comment, and icon for the menu.</para>
+              <para>Specifies the name of the directory
+entry file that specifies the name, comment, and icon for the menu.</para>
             </entry>
           </row>
           <row>
@@ -212,9 +213,9 @@ file that specifies the name, comment, and icon for the menu.</para>
               </para>
             </entry>
             <entry colname="colspec3" valign="top">
-              <para>A query to run on desktop entry
-files. If a desktop entry file matches the requirements in the query, the
-menu item is displayed in the menu. </para>
+              <para>Specifies a query to run on desktop
+entry files. If a desktop entry file matches the requirements in the query,
+the menu item is displayed in the menu. </para>
               <para>The query in the excerpt
 searches for desktop entry files that contain the keywords <literal>Application</literal> and <literal>Utility</literal> in the <literal>Categories</literal>
 key. Desktop entry files that match are displayed in the <guimenu>Applications</guimenu> menu.</para>
@@ -241,24 +242,17 @@ any items.</para>
   <sect1 id="menustructure-6">
     <title>Desktop Entry Files</title>
     <indexterm>
-      <primary>menus</primary>
-      <secondary>desktop entry files</secondary>
-    </indexterm>
-    <indexterm>
       <primary>desktop entry files</primary>
-      <see>menus, desktop
-entry files</see>
     </indexterm>
     <indexterm>
       <primary>.desktop files</primary>
-      <see>menus, desktop entry files</see>
+      <see>desktop entry files</see>
     </indexterm>
-    <para>A <firstterm>desktop
-entry file</firstterm> is a data file that provides information about an item
-in a menu. The desktop entry file specifies the details for the item such
-as a name, a command to run, an icon, and so on. The desktop entry file also
-contains keywords which determine the location of the item in the menu hierarchy.
-Desktop entry files have a <filename>.desktop</filename> file extension.</para>
+    <para>A <firstterm>desktop entry file</firstterm> is a data file that provides information about
+an item in a menu. The desktop entry file specifies the details for the item
+such as a name, a command to run, an icon, and so on. The desktop entry file
+also contains keywords which determine the location of the item in the menu
+hierarchy. Desktop entry files have a <filename>.desktop</filename> file extension.</para>
     <para>The following is a sample desktop entry file:</para>
     <literallayout>[Desktop Entry]
 Encoding=UTF-8
@@ -295,7 +289,7 @@ in desktop entry files.</para>
               </para>
             </entry>
             <entry valign="top">
-              <para>Enter the encoding of the desktop entry file. </para>
+              <para>Specifies the encoding of the desktop entry file. </para>
             </entry>
           </row>
           <row>
@@ -305,8 +299,8 @@ in desktop entry files.</para>
               </para>
             </entry>
             <entry valign="top">
-              <para>Enter the name of the item. This name is displayed on the
-item in the menu. </para>
+              <para>Specifies the name of the item. This name is displayed
+on the item in the menu. </para>
             </entry>
           </row>
           <row>
@@ -316,8 +310,8 @@ item in the menu. </para>
               </para>
             </entry>
             <entry valign="top">
-              <para>Enter a short description of the item. The comment is displayed
-as a tooltip when you point to the item in the menu. </para>
+              <para>Specifies a short description of the item. The comment
+is displayed as a tooltip when you point to the item in the menu. </para>
             </entry>
           </row>
           <row>
@@ -327,8 +321,8 @@ as a tooltip when you point to the item in the menu. </para>
               </para>
             </entry>
             <entry valign="top">
-              <para>Enter a command to execute when you choose the item from
-the menu. </para>
+              <para>Specifies a command to execute when you choose the item
+from the menu. </para>
             </entry>
           </row>
           <row>
@@ -338,8 +332,9 @@ the menu. </para>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Enter a path to an icon that
-represents the item.</para>
+              <para>Specifies the filename of an
+icon that represents the item. Does not specify the path to the filename,
+or the filename extension. </para>
             </entry>
           </row>
           <row>
@@ -349,10 +344,11 @@ represents the item.</para>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Enter <literal>true</literal>
-if you want the command in the <literal>Exec</literal> key to run in a terminal
-window. Enter <literal>true</literal> in this key if the command does not
-create a window in which to run.</para>
+              <para>Specifies whether the command
+in the <literal>Exec</literal> key runs in a terminal window. If the value
+is <literal>true</literal> the command runs in a terminal window. </para>
+              <para>If the command does not create a window in which to run, the value of this
+key must be <literal>true</literal>.</para>
             </entry>
           </row>
           <row>
@@ -362,8 +358,8 @@ create a window in which to run.</para>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Enter the type of item. Enter
-one of the following: </para>
+              <para>Specifies the type of item. This
+value is one of the following: </para>
               <itemizedlist>
                 <listitem>
                   <para><literal>Application</literal>: Enter this option for  an
@@ -383,7 +379,7 @@ links to a file, folder, or FTP site.</para>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Enter
+              <para>Specifies
 the help file to display when you choose <guimenuitem>Help on <replaceable>application_name</replaceable></guimenuitem> from the menu item popup menu.</para>
             </entry>
           </row>
@@ -394,14 +390,14 @@ the help file to display when you choose <guimenuitem>Help on <replaceable>appli
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Enter the keywords that describe
-the item. Separate the keywords with semicolons (;). To see a list of the
-standard category keywords, see the following URL: </para>
+              <para>Specifies the keywords that describe
+the item. The keywords are separated with semicolons (;). To see a list of
+the standard category keywords, see the following URL: </para>
               <literallayout>
                 <ulink url="http://www.freedesktop.org/standards/VFolderDesktops.txt">http://www.freedesktop.org/standards/VFolderDesktops.txt</ulink>
               </literallayout>
               <para>The vfolder information files map the keywords
-that you enter to menus.</para>
+to menus.</para>
             </entry>
           </row>
         </tbody>
@@ -423,21 +419,16 @@ launcher or object.</para>
   <sect1 id="menustructure-14">
     <title>Directory Entry Files</title>
     <indexterm>
-      <primary>menus</primary>
-      <secondary>directory entry files</secondary>
-    </indexterm>
-    <indexterm>
       <primary>directory entry files</primary>
-      <see>menus,
-directory entry files</see>
     </indexterm>
     <indexterm>
       <primary>.directory files</primary>
-      <see>menus, directory entry files</see>
+      <see>directory entry files</see>
     </indexterm>
-    <para>A <firstterm>directory entry file</firstterm> is a data file that provides information
-about a menu. The directory entry file specifies the details for the menu
-such as a name, a tooltip, and an icon. Directory entry files have a <filename>.directory</filename> file extension.</para>
+    <para>A <firstterm>directory entry file</firstterm> is a data file that provides
+information about a menu. The directory entry file specifies the details for
+the menu such as a name, a tooltip, and an icon. Directory entry files have
+a <filename>.directory</filename> file extension.</para>
     <para>The following is a sample directory entry file:</para>
     <literallayout>[Desktop Entry]
 Name=Accessories
@@ -469,8 +460,8 @@ in directory entry files.</para>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Enter the name of the menu. This
-name is displayed on the menu. </para>
+              <para>Specifies the name of the menu.
+This name is displayed on the menu. </para>
             </entry>
           </row>
           <row>
@@ -480,8 +471,8 @@ name is displayed on the menu. </para>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Enter a short description of
-the menu. The comment is displayed as a tooltip when you point to the menu. </para>
+              <para>Specifies a short description
+of the menu. The comment is displayed as a tooltip when you point to the menu. </para>
             </entry>
           </row>
           <row>
@@ -491,8 +482,9 @@ the menu. The comment is displayed as a tooltip when you point to the menu. </pa
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Enter a path to an icon that
-represents the menu.</para>
+              <para>Specifies the filename of an
+icon that represents the menu. Does not specify the path to the filename,
+or the filename extension. </para>
             </entry>
           </row>
           <row>
@@ -502,7 +494,7 @@ represents the menu.</para>
               </para>
             </entry>
             <entry valign="top">
-              <para>The type of menu. The value of this key is always <literal>Directory</literal>.</para>
+              <para>Specifies the type of menu. The value of this key is always <literal>Directory</literal>.</para>
             </entry>
           </row>
         </tbody>
@@ -530,7 +522,7 @@ lists the menus to which you can add items, and the URI locations that correspon
 to the menus.</para>
     <para>When you use panels to customize menus for all users, you use the menu
 item popup menu. For more information, see <citetitle>Working With Menus</citetitle>
-in the <citetitle>GNOME 2.0 Desktop User Guide</citetitle>.</para>
+in the <citetitle>GNOME 2.2 Desktop User Guide</citetitle>.</para>
     <para>You can also use menu configuration files and menu data files to customize
 menus.</para>
     <sect2 id="menustructure-3">
@@ -550,7 +542,12 @@ menus.</para>
           <primary>menus</primary>
           <secondary>adding using file manager</secondary>
         </indexterm>
-        <para>To add a menu for all users, perform the following steps:</para>
+        <indexterm>
+          <primary>file manager</primary>
+          <secondary>adding menus with</secondary>
+        </indexterm>
+        <para>To add a menu for all users,
+perform the following steps:</para>
         <orderedlist>
           <listitem>
             <para>In a file manager window, access the location where you want
@@ -647,7 +644,7 @@ on any item in the menu.</para>
           <para>Choose <menuchoice><guimenu>Entire menu</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A <guilabel>Launcher Properties</guilabel> dialog is displayed.</para>
         </listitem>
         <listitem>
-          <para>Modify the properties of the menu in the <guilabel>Launcher Properties</guilabel> dialog. For more information on the elements in the <guilabel>Launcher Properties</guilabel> dialog, see <citetitle>Working With Panels</citetitle> in the <citetitle>GNOME 2.0 Desktop User Guide</citetitle>.</para>
+          <para>Modify the properties of the menu in the <guilabel>Launcher Properties</guilabel> dialog. For more information on the elements in the <guilabel>Launcher Properties</guilabel> dialog, see <citetitle>Working With Panels</citetitle> in the <citetitle>GNOME 2.2 Desktop User Guide</citetitle>.</para>
         </listitem>
         <listitem>
           <para>Click <guibutton>OK</guibutton>.</para>
@@ -670,7 +667,7 @@ want to edit. Right-click on the item that you want to edit.</para>
           <para>Choose <guimenuitem>Properties</guimenuitem>. A <guilabel>Launcher Properties</guilabel> dialog is displayed.</para>
         </listitem>
         <listitem>
-          <para>Modify the properties of the menu item in the <guilabel>Launcher Properties</guilabel> dialog. For more information on the elements in the <guilabel>Launcher Properties</guilabel> dialog, see <citetitle>Working With Panels</citetitle> in the <citetitle>GNOME 2.0 Desktop User Guide</citetitle>.</para>
+          <para>Modify the properties of the menu item in the <guilabel>Launcher Properties</guilabel> dialog. For more information on the elements in the <guilabel>Launcher Properties</guilabel> dialog, see <citetitle>Working With Panels</citetitle> in the <citetitle>GNOME 2.2 Desktop User Guide</citetitle>.</para>
         </listitem>
         <listitem>
           <para>Click <guibutton>OK</guibutton>.</para>
@@ -726,11 +723,9 @@ that corresponds to the menu that you want to configure. For example, to configu
 the <guimenu>Applications</guimenu> menu, create a vfolder information called <filename>applications.vfolder-info</filename> in the <filename>/etc/gnome-vfs-2.0/vfolder</filename> directory.</para>
       </listitem>
       <listitem>
-        <para>Set the permissions on the vfolder information
-file to read only.</para>
+        <para>Set the permissions on the vfolder information file to read
+only.</para>
       </listitem>
     </orderedlist>
   </sect1>
 </chapter>
-
-
diff --git a/gnome2-system-admin-guide/C/system-admin-guide-C.omf b/gnome2-system-admin-guide/C/system-admin-guide-C.omf
index c67d152..091e7df 100755
--- a/gnome2-system-admin-guide/C/system-admin-guide-C.omf
+++ b/gnome2-system-admin-guide/C/system-admin-guide-C.omf
@@ -9,20 +9,20 @@
     </maintainer>

 <!--
     <title>

-      GNOME 2.0 Desktop System Administration Guide
+      GNOME 2.2 Desktop System Administration Guide
     </title>
 -->
     <title>

       System Administration Guide
     </title>

     <date>

-      2002-12-12
+      2003-01-24
     </date>

-    <version identifier="2.0" date="2002-12-12" 
-    description="First draft"/>

+    <version identifier="2.1" date="2003-01-24" 
+    description="GNOME 2.2 version"/>

     <subject category="GNOME|Desktop"/>

     <description>

-      System Administration Guide for GNOME 2.0. 

+      System Administration Guide for GNOME 2.2. 

     </description>

     <type>

       administrator's guide

diff --git a/gnome2-system-admin-guide/C/system-admin-guide.xml b/gnome2-system-admin-guide/C/system-admin-guide.xml
index 12a36b6..790eaab 100644
--- a/gnome2-system-admin-guide/C/system-admin-guide.xml
+++ b/gnome2-system-admin-guide/C/system-admin-guide.xml
@@ -1,19 +1,25 @@
 <?xml version="1.0"?>

 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY gnomeversion "2.0">

-  <!ENTITY manrevision "2.0">

-  <!ENTITY date "December 2002">

+  <!ENTITY gnomeversion "2.2">

+  <!ENTITY manrevision "2.1">

+  <!ENTITY date "January 2003">

   <!ENTITY LEGAL SYSTEM "legal.xml">

   <!ENTITY gconf SYSTEM "gconf.xml">

   <!ENTITY menustructure SYSTEM "menustructure.xml">
+  <!ENTITY themes SYSTEM "themes.xml">
+  <!ENTITY mimetypes SYSTEM "mimetypes.xml">
+  <!ENTITY screensavers SYSTEM "screensavers.xml">
+  <!ENTITY sessions SYSTEM "sessions.xml">
+  <!ENTITY performance SYSTEM "performance.xml">
+  <!ENTITY appendixa SYSTEM "appendixa.xml">
   <!ENTITY gloss SYSTEM "glossary.xml">
 ]>

 <book id="index"> 

   <title>GNOME &gnomeversion; Desktop System Administration Guide</title> 

   <bookinfo> 

 	 <copyright> 

-		<year>2002</year> 

+		<year>2003</year> 

 		<holder>Sun Microsystems</holder> 

 	 </copyright>

 

@@ -33,7 +39,6 @@
 		  <surname>GNOME Documentation Team</surname> 

 		  <affiliation> 

 			 <orgname>Sun Microsystems</orgname> 

-			 <address><email>gdocteam@sun.com</email> </address> 

 		  </affiliation> 

 		</author> 

 	 </authorgroup>

@@ -43,8 +48,15 @@
 		  <revnumber>GNOME &gnomeversion; Desktop System Administration Guide V&manrevision;</revnumber> 

 		  <date>&date;</date> 

 		  <revdescription> 

-			 <para role="author">Sun Microsystems
-				<email>gdocteam@sun.com</email></para> 
+			 <para role="author">Sun Microsystems</para> 
+			 <para role="publisher">GNOME Documentation Project</para> 
+		  </revdescription> 
+		</revision> 

+		<revision> 

+		  <revnumber>GNOME 2.0 Desktop System Administration Guide V2.0</revnumber> 

+		  <date>December 2002</date> 

+		  <revdescription> 

+			 <para role="author">Sun Microsystems</para> 
 			 <para role="publisher">GNOME Documentation Project</para> 
 		  </revdescription> 
 		</revision> 

@@ -60,5 +72,11 @@
   </bookinfo>
 &gconf;

 &menustructure;
+&themes;
+&mimetypes;
+&screensavers;
+&sessions;
+&performance;
+&appendixa;
 &gloss;
 
</book>