Updates to SAG for GNOME 2.6 Desktop.

17 files changed, 793 insertions, 713 deletions

diff --git a/gnome2-system-admin-guide/C/ChangeLog b/gnome2-system-admin-guide/C/ChangeLog
index ab193a4..38d4752 100644
--- a/gnome2-system-admin-guide/C/ChangeLog
+++ b/gnome2-system-admin-guide/C/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-16 Eugene O'Connor <eugene.oconnor@sun.com>
+
+   * Updated System Administration Guide for GNOME 2.6.
+
 2003-09-08 Eugene O'Connor <eugene.oconnor@sun.com>
 
    * Updated System Administration Guide for GNOME 2.4.
diff --git a/gnome2-system-admin-guide/C/appendixa.xml b/gnome2-system-admin-guide/C/appendixa.xml
index 585f00f..a2ea254 100644
--- a/gnome2-system-admin-guide/C/appendixa.xml
+++ b/gnome2-system-admin-guide/C/appendixa.xml
@@ -1,3 +1,4 @@
+  
   <appendix id="appendixa-0">
     <title>Hidden Directories</title>
     <highlights>
@@ -21,10 +22,10 @@ Desktop adds to the home directories of users. </para>
         <colspec colname="colspec1" colwidth="50*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
+            <entry>
               <para>Directory</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Description</para>
             </entry>
           </row>
@@ -96,10 +97,9 @@ the user. </para>
             </entry>
             <entry valign="top">
               <para>The <application>Nautilus</application> file manager
-contains a preference that enables users to use the file manager to
-manage the desktop. If the user selects this option, this directory contains
-the objects that are on the desktop of the user. This directory contains the
-following:</para>
+contains a preference that enables users to use the file manager to manage
+the desktop. If this option is selected, this directory contains the objects
+that are on the desktop of the user. This directory contains the following:</para>
               <itemizedlist>
                 <listitem>
                   <para>Objects on the desktop, for example, the <guilabel>Home</guilabel>
@@ -174,9 +174,7 @@ user. For example, this directory can contain the following: </para>
                 <listitem>
                   <para>Metadata for the directories with which the user works.</para>
                 </listitem>
-                <listitem>
-                  <para><application>Nautilus</application> themes that the user adds.</para>
-                </listitem>
+<!--Removed Nautilus themes.-->
                 <listitem>
                   <para><application>Nautilus</application> emblems that the user
 adds.</para>
@@ -194,8 +192,9 @@ adds.</para>
               </para>
             </entry>
             <entry valign="top">
-              <para>Contains controls themes, window frame themes, and
-icons themes that the user adds. The user can add themes from the <application>Theme</application> preference tool.</para>
+              <para>Contains controls theme options, window frame theme
+options, and icons theme options that the user adds. The user can add themes
+from the <application>Theme</application> preference tool.</para>
             </entry>
           </row>
           <row>
diff --git a/gnome2-system-admin-guide/C/appendixb.xml b/gnome2-system-admin-guide/C/appendixb.xml
new file mode 100644
index 0000000..4b759b9
--- /dev/null
+++ b/gnome2-system-admin-guide/C/appendixb.xml
@@ -0,0 +1,32 @@
+  
+  <appendix id="appendixb-0">
+    <title>Security Note on Configuring SMB Printers</title>
+    <highlights>
+      <para>This appendix provides a security note related to the configuration
+of printers on Windows network shares.</para>
+    </highlights>
+    <indexterm>
+      <primary>Samba</primary>
+      <see>SMB</see>
+    </indexterm>
+    <indexterm>
+      <primary>Windows network shares</primary>
+      <see>SMB</see>
+    </indexterm>
+    <indexterm>
+      <primary>SMB</primary>
+      <secondary>configuring printers</secondary>
+    </indexterm>
+    <para>Windows network shares are also referred to as Samba or <firstterm>SMB</firstterm>
+shares. When you configure a printer on an SMB share, you must enter a username
+and password for the print queue. </para>
+    <para>The username and password for the print queue is stored as unencrypted
+text in the file <filename>/etc/cups/printers.conf</filename>.
+This file has read-only permissions for users with root privileges, so any
+user with root privileges can read the username and password for the print
+queue. </para>
+    <para>To reduce the impact of possible security violations, ensure that the
+username and password required to access the print queue is used only for
+the print queue.  This ensures that any possible security violation is restricted
+to unauthorized use of the print queue.</para>
+  </appendix>
diff --git a/gnome2-system-admin-guide/C/fontconfig.xml b/gnome2-system-admin-guide/C/fontconfig.xml
new file mode 100644
index 0000000..0bd3f58
--- /dev/null
+++ b/gnome2-system-admin-guide/C/fontconfig.xml
@@ -0,0 +1,101 @@
+<chapter id="fontconfig-0">
+  <title>Configuring Fonts</title>
+  <highlights>
+    <para>This chapter describes how to configure fonts in the GNOME
+Desktop.</para>
+  </highlights>
+  <sect1 id="fontconfig-1">
+    <title>Introduction to Configuring Fonts</title>
+    <indexterm>
+      <primary>configuring fonts</primary>
+      <see>fonts</see>
+    </indexterm>
+    <indexterm>
+      <primary>fontconfig</primary>
+      <see>fonts</see>
+    </indexterm>
+    <indexterm>
+      <primary>fonts</primary>
+      <secondary>introduction</secondary>
+    </indexterm>
+    <para>GNOME Desktop uses the <literal>fontconfig</literal> font configuration and
+customization library. The <literal>fontconfig</literal> library can use all
+kinds of fonts, including PostScript Type 1 fonts and TrueType fonts.</para>
+    <para>The <literal>fontconfig</literal> library provides a list of all the
+fonts available on a GNOME Desktop system. To compile this list, <literal>fontconfig</literal> searches the directories listed in the <filename>/etc/fonts/fonts.conf</filename> file. To view all the fonts available on a system, access the <literal>fonts:///</literal> location in the file manager on the system.</para>
+    <para>For more information about the <literal>fontconfig</literal> library,
+see the following URL: </para>
+    <literallayout>
+      <ulink url="http://freedesktop.org/software/fontconfig">http://freedesktop.org/software/fontconfig</ulink>
+    </literallayout>
+  </sect1>
+  <sect1 id="fontconfig-4">
+    <title>Font Substitution</title>
+    <indexterm>
+      <primary>fonts</primary>
+      <secondary>substitution</secondary>
+    </indexterm>
+    <para>The <literal>fontconfig</literal> library performs font substitution
+when either entire fonts, or individual characters, are not present. If the
+system needs to display a font that is not available, <literal>fontconfig</literal> attempts to display another, similar font. For example, if a web
+page requests to display the Verdana font, and that font is not installed
+on the system, <literal>fontconfig</literal> displays a similar font, such
+as Helvetica. The list of similar fonts is defined in the <filename>/etc/fonts/fonts.conf</filename> file. </para>
+    <para>If the system needs to display a character that is not present in the
+selected font, <literal>fontconfig</literal> attempts to display the character
+in another, similar font. For example, you might select Bitstream Vera Sans
+as the font for the Text Editor application. The Bitstream Vera font family
+does not include Cyrillic characters. If you open a document which contains
+a Cyrillic character, Text Editor uses a similar font that includes Cyrillic
+characters to display the character.</para>
+    <para>The <literal>fontconfig</literal> library also defines aliases for fonts,
+for example, <literal>serif</literal>, <literal>sans-serif</literal>, and <literal>monospace</literal>. When you select one of the aliases for a font, the system
+uses the first font that is defined for that alias in the <filename>/etc/fonts/fonts.conf</filename>. </para>
+  </sect1>
+  <sect1 id="fontconfig-2">
+    <title>To Add a Font for All Users</title>
+    <indexterm>
+      <primary>fonts</primary>
+      <secondary>adding for all users</secondary>
+    </indexterm>
+    <para>To add a font for all users, perform the following steps:</para>
+    <orderedlist>
+      <listitem>
+        <para>Copy the font file to one of the directories in the <filename>/etc/fonts/fonts.conf</filename> file. Typically, fonts are stored in the <filename>/usr/share/fonts/</filename> directory.</para>
+      </listitem>
+      <listitem>
+        <para>The <literal>fontconfig</literal> library updates the list
+of fonts automatically. If the list of fonts is not updated, run the following
+command:</para>
+        <para>
+          <computeroutput>#</computeroutput>
+          <userinput>fc-cache <replaceable>directory-name</replaceable></userinput>
+        </para>
+      </listitem>
+    </orderedlist>
+  </sect1>
+  <sect1 id="fontconfig-3">
+    <title>To Add a Font for an Individual User</title>
+    <indexterm>
+      <primary>fonts</primary>
+      <secondary>adding for individual users</secondary>
+    </indexterm>
+    <para>To add a font for an individual users, perform
+the following steps:</para>
+    <orderedlist>
+      <listitem>
+        <para>Copy the font file to the <filename>$HOME/.fonts</filename>
+directory of the user. If you drag the font file to the <literal>fonts:///</literal> location in the file manager, the font file is copied to the <filename>$HOME/.fonts</filename> directory.</para>
+      </listitem>
+      <listitem>
+        <para>The <literal>fontconfig</literal> library updates the list
+of fonts automatically. If the list of fonts is not updated, run the following
+command:</para>
+        <para>
+          <computeroutput>#</computeroutput>
+          <userinput>fc-cache <replaceable>directory-name</replaceable></userinput>
+        </para>
+      </listitem>
+    </orderedlist>
+  </sect1>
+</chapter>
diff --git a/gnome2-system-admin-guide/C/gconf.xml b/gnome2-system-admin-guide/C/gconf.xml
index c6786f6..32eecdc 100644
--- a/gnome2-system-admin-guide/C/gconf.xml
+++ b/gnome2-system-admin-guide/C/gconf.xml
@@ -1,20 +1,18 @@
 <chapter id="gconf-0">
   <title>Using GConf</title>
   <highlights>
-    <para>The information in this chapter describes how to use <application>GConf</application> to manage user preferences.</para>
-    <para>
-      <application>Configuration Editor</application>
-    </para>
+    <para>The information in this chapter describes how to use <application>GConf</application> to manage user preferences. This chapter also describes
+how to use <application>Configuration Editor</application>.</para>
   </highlights>
   <sect1 id="gconf-1">
-    <title>Introducing GConf</title>
+    <title>Introducion to GConf</title>
     <indexterm>
       <primary>GConf</primary>
       <secondary>introduction</secondary>
     </indexterm>
     <para><application>GConf</application> simplifies the administration of preferences
-for users in the desktop environment. <application>GConf</application> enables
-system administrators to do the following:</para>
+for GNOME Desktop users. <application>GConf</application> enables system administrators
+to do the following:</para>
     <itemizedlist>
       <listitem>
         <para>Set mandatory values for particular preferences for all users.
@@ -47,9 +45,6 @@ preference, all applications that use the preference are immediately updated.</p
         <para>A command line tool, <command>gconftool-2</command>.</para>
       </listitem>
     </itemizedlist>
-    <para>
-      <application>Configuration Editor</application>
-    </para>
   </sect1>
   <sect1 id="gconf-24">
     <title>GConf Repository</title>
@@ -63,8 +58,8 @@ is an element in the repository that corresponds to an application preference.
 For example, the <literal>/apps/gnome-session/options/show_splash_screen</literal>
 preference key corresponds to the <guilabel>Show splash screen on login</guilabel>
 option in the <application>Sessions</application> preference tool.  The GNOME
-Desktop user interface does not contain all of the preference keys in the <application>GConf</application> repository. For example, the <application>Sessions</application>
-preference tool does not contain an option that corresponds to the <literal>/apps/gnome-session/options/allow_tcp_connections</literal> key.</para>
+Desktop user interface does not contain all of the preference keys in the <application>GConf</application> repository. For example, the <application>Panel</application>
+preference tool does not contain an option that corresponds to the <literal>/apps/panel/global/tooltips_enabled</literal> key.</para>
     <para>The repository is structured like a simple hierarchical file system.
 The repository contains the following:</para>
     <itemizedlist>
@@ -109,8 +104,8 @@ is referred to as <literal>/desktop/gnome/interface/font_name</literal>.</para>
       <para>The <application>GConf</application> repository contains
 a series of storage locations that are called <firstterm>configuration sources</firstterm>. The configuration sources are listed in the <firstterm>GConf
 path file</firstterm>. The location of the <application>GConf</application>
-path file is <filename>/etc/gconf/<replaceable>version-number</replaceable>/path</filename>. Each user has a path file. Each line in the path file specifies
-the following information:</para>
+path file is <filename>/etc/gconf/<replaceable>gconf-version-number</replaceable>/path</filename>. Each user has a path file. The path file specifies the following
+information for each configuration source:</para>
       <itemizedlist>
         <listitem>
           <para>The backend module to use to read the repository. </para>
@@ -122,10 +117,11 @@ the following information:</para>
           <para>The location of the repository.</para>
         </listitem>
       </itemizedlist>
-      <para>By default, the contents of the <application>GConf</application> path
-file are as follows: </para>
+      <para>The <application>GConf</application> path file also contains <literal>include</literal> instructions. By default, the contents of the <application>GConf</application> path file are as follows: </para>
       <literallayout>xml:readonly:/etc/gconf/gconf.xml.mandatory
+include /etc/gconf/2/local-mandatory.path
 include &quot;$(HOME)/.gconf.path&quot;
+include /etc/gconf/2/local-defaults.path
 xml:readwrite:$(HOME)/.gconf
 xml:readonly:/etc/gconf/gconf.xml.defaults</literallayout>
       <para>When <application>GConf</application> searches for a preference value, <application>GConf</application> reads the configuration sources in the order specified
@@ -137,10 +133,10 @@ in the path file:</para>
           <colspec colwidth="68.71*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Configuration Source</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Description</para>
               </entry>
             </row>
@@ -164,6 +160,9 @@ mandatory.</para>
                 <para>This configuration source is stored in the <filename>.gconf</filename> directory
 in the home directory of the user. When the user sets a preference, the new
 preference information is added to this location. </para>
+                <para>You can use
+the <application>Configuration Editor</application> to modify the user configuration
+source.</para>
               </entry>
             </row>
             <row>
@@ -193,10 +192,59 @@ order of priority:</para>
           <para>Default preferences</para>
         </listitem>
       </orderedlist>
-      <para>The <literal>include</literal> instruction in the <application>GConf</application> path file enables users to use another configuration source.
-To use another configuration source, the user must specify the location of
-the configuration source. The user specifies the location of the configuration
+      <para>The <literal>include</literal> instructions in the <application>GConf</application> path file enable system administrators to specify other configuration
+sources. </para>
+      <informaltable frame="topbot">
+        <tgroup cols="2" colsep="0" rowsep="0">
+          <colspec colwidth="50*"/>
+          <colspec colwidth="50*"/>
+          <thead>
+            <row rowsep="1">
+              <entry>
+                <para>Included Configuration Source</para>
+              </entry>
+              <entry>
+                <para>Description</para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry valign="top">
+                <para>
+                  <filename>/etc/gconf/2/local-mandatory.path</filename>
+                </para>
+              </entry>
+              <entry valign="top">
+                <para>Use this configuration
+source to store mandatory preference values for a particular system.</para>
+              </entry>
+            </row>
+            <row>
+              <entry valign="top">
+                <para>
+                  <filename>$(HOME)/.gconf.path</filename>
+                </para>
+              </entry>
+              <entry valign="top">
+                <para>The user specifies the location of  the configuration
 source in the home directory, in a file that is called <filename>.gconf.path</filename>.</para>
+              </entry>
+            </row>
+            <row>
+              <entry valign="top">
+                <para>
+                  <filename>/etc/gconf/2/local-defaults.path</filename>
+                </para>
+              </entry>
+              <entry valign="top">
+                <para>Use this configuration
+source to store default preference values for a particular system.</para>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
     </sect2>
     <sect2 id="gconf-27">
       <title>GConf Schemas</title>
@@ -234,10 +282,10 @@ and the relationship of these items to preference keys:</para>
           <colspec colname="colspec1" colwidth="75.69*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Item</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Description</para>
               </entry>
             </row>
@@ -294,10 +342,10 @@ and a schema object:</para>
           <colspec colname="colspec1" colwidth="75.69*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Item</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Example</para>
               </entry>
             </row>
@@ -376,13 +424,14 @@ a <filename>.schemas</filename> extension.</para>
 new configuration source.</para>
       <para>Some schema definition files correspond closely to a part of the GNOME
 Desktop user interface. For example, <filename>system_http_proxy.schemas</filename>
-corresponds to the <application>Network Proxy</application> preference tool.
-Other schema definition files contain preference keys that are not present
-in the GNOME Desktop user interface. For example, the <literal>/apps/gnome-session/options/splash_screen_text</literal> key is not present in the user interface. </para>
+corresponds to the <application>Network Proxy</application> preference tool. Other schema definition files contain
+preference keys that are not present in the GNOME Desktop user interface.
+For example, the <literal>/apps/panel/global/tooltips_enabled</literal> key
+is not present in the user interface. </para>
       <para>Some parts of the GNOME Desktop user interface contain preferences that
 represent preference keys from more than one schema definition file. For example,
-the <application>Keyboard Shortcuts</application> preference tool contains
-preferences that represent keys from the <filename>panel-global-config.schemas</filename> and <filename>metacity.schemas</filename> files.</para>
+the <application>Keyboard Shortcuts</application> preference tool contains preferences that represent
+keys from the <filename>panel-global-config.schemas</filename> and <filename>metacity.schemas</filename> files.</para>
     </sect2>
   </sect1>
   <sect1 id="gconf-25">
@@ -478,10 +527,10 @@ use with the <command>gconftool-2</command> command.</para>
         <colspec colname="colspec1" colwidth="64.48*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
+            <entry>
               <para>Option</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Function</para>
             </entry>
           </row>
@@ -535,7 +584,7 @@ Ensure that the <application>GConf</application> daemon, <command>gconfd-2</comm
             </entry>
           </row>
           <row>
-            <entry colname="colspec0">
+            <entry colname="colspec0" valign="top">
               <para>
                 <literal>--dump</literal>
               </para>
@@ -573,14 +622,13 @@ key that you specify.</para>
             </entry>
           </row>
           <row>
-            <entry colname="colspec0">
+            <entry colname="colspec0" valign="top">
               <para>
                 <literal>--load=<replaceable>filename</replaceable></literal>
               </para>
             </entry>
             <entry colname="colspec1">
-              <para>Use
-this option to sets the values of preference keys in the current directory
+              <para>Use this option to sets the values of preference keys in the current directory
 in a configuration source to the values in the file that you specify. The
 file that you specify must contain XML descriptions of the keys, in a <literal>&lt;gconfentryfile&gt;</literal> element.</para>
             </entry>
@@ -905,6 +953,7 @@ false</userinput>
       </para>
       <para>You can also set other print manager preferences. For information on
 the other print manager preferences, see the <filename>gnome-print-manager.schemas</filename> schema definition file.</para>
+<!--gnome-print-manager isn't in Mercury. Is there a replacement?-->
     </sect2>
     <sect2 id="gconf-12">
       <title>To Set the Number of Workspaces</title>
@@ -957,7 +1006,7 @@ true</userinput>
       <para>
         <computeroutput>#</computeroutput>
         <userinput>gconftool-2 --direct --config-source
-xml:readwrite:/etc/gconf/gconf.xml.defaults --type bool --set desktop/gnome/accessibility/keyboard/enable
+xml:readwrite:/etc/gconf/gconf.xml.defaults --type bool --set /desktop/gnome/accessibility/keyboard/enable
 false</userinput>
       </para>
       <para>You can also set other keyboard accessibility preferences. For information
@@ -976,7 +1025,7 @@ on the other keyboard accessibility preferences, see the <filename>desktop_gnome
       <para>To set
 keyboard shortcut preferences, you modify the values of preference keys in <filename>/apps/metacity/global_keybindings</filename> location. For example, you might
 want users to use only the <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> keyboard
-shortcut to open the <guilabel>Run Program</guilabel> dialog. To set this
+shortcut to open the <guilabel>Run Application</guilabel> dialog. To set this
 mandatory value, run the following command:</para>
       <para>
         <computeroutput>#</computeroutput>
@@ -1002,9 +1051,8 @@ preferences, setting individual </secondary>
         <primary>panels</primary>
         <secondary>preferences, individual, setting with GConf</secondary>
       </indexterm>
-      <para>The <filename>panel-default-setup.entries</filename> schema
-definition file specifies the following details of the panels in the desktop
-environment:</para>
+      <para>The <filename>panel-default-setup.entries</filename> file
+specifies the following details of the panels in the GNOME Desktop:</para>
       <itemizedlist>
         <listitem>
           <para>Number of panels.</para>
@@ -1021,14 +1069,15 @@ environment:</para>
       </itemizedlist>
       <para>The configuration of individual panels and of panel objects is a complex
 task. To configure individual panels and panel objects, you must first understand
-the structure of the <filename>panel-default-setup.entries</filename> schema
-definition file. For more information on the <filename>panel-default-setup.entries</filename> schema definition file, see the next section.</para>
+the structure of the <filename>panel-default-setup.entries</filename> file.
+For more information on the <filename>panel-default-setup.entries</filename>
+file, see the next section.</para>
       <para>To set preferences for individual panels and panel objects, you must
 set the values of many preferences in a configuration source. The easiest
 way to set the values of panel preferences is to use the <literal>gconftool-2</literal> command with the <literal>--dump</literal> and <literal>--load</literal> options. For more information on how to set preferences for panels
 and objects on panels, see <xref linkend="gconf-3"/>.</para>
       <sect3 id="gconf-23">
-        <title>Schema Definition File for Individual Panels and Panel Objects</title>
+        <title>Specifying Individual Panels and Panel Objects</title>
         <indexterm>
           <primary>GConf</primary>
           <secondary>schema definition files</secondary>
@@ -1039,15 +1088,15 @@ and objects on panels, see <xref linkend="gconf-3"/>.</para>
           <secondary>schema definition files</secondary>
           <tertiary>panel and panel object</tertiary>
         </indexterm>
-        <para>The schema definition file <filename>panel-default-setup.entries</filename> contains sections that specify panels
-and panel contents. The <filename>panel-default-setup.entries</filename> file
-is structured as follows:</para>
+        <para>The file <filename>panel-default-setup.entries</filename> contains sections that specify panels and panel contents. The <filename>panel-default-setup.entries</filename> file specifies values for schema keys.
+The <filename>panel-default-setup.entries</filename> file resides in the <filename>/etc/gconf/schemas</filename> directory. </para>
+        <para>The <filename>panel-default-setup.entries</filename> file is structured
+as follows:</para>
         <orderedlist>
           <listitem>
-            <para>Preference keys that specify the general structure of panels,
-applets, and other panel objects in the desktop environment. The following
-keys specify the number of panels, applets, and other panel objects that appear
-in the desktop environment:</para>
+            <para>Keys that specify the general structure of panels, applets,
+and other panel objects in the GNOME Desktop. The following keys specify the
+number of panels, panel objects, and applets that appear in the GNOME Desktop:</para>
             <itemizedlist>
               <listitem>
                 <para>
@@ -1056,17 +1105,17 @@ in the desktop environment:</para>
               </listitem>
               <listitem>
                 <para>
-                  <literal>/apps/panel/default_setup/general/applet_id_list</literal>
+                  <literal>/apps/panel/default_setup/general/object_id_list</literal>
                 </para>
               </listitem>
               <listitem>
                 <para>
-                  <literal>/apps/panel/default_setup/general/object_id_list</literal>
+                  <literal>/apps/panel/default_setup/general/applet_id_list</literal>
                 </para>
               </listitem>
             </itemizedlist>
-            <para>The keys also assign identifiers to each panel, applet, and panel object.
-For example, the following sample from <filename>panel-default-setup.entries</filename> specifies that one panel appears in the desktop environment:</para>
+            <para>The keys also assign identifiers to each panel, panel object, and applet.
+For example, the following sample from <filename>panel-default-setup.entries</filename> specifies that one panel appears in the GNOME Desktop:</para>
             <literallayout>&lt;entry&gt;
       &lt;key&gt;toplevel_id_list&lt;/key&gt;
       &lt;schema_key&gt;/schemas/apps/panel/general/toplevel_id_list&lt;/schema_key&gt;
@@ -1078,18 +1127,18 @@ For example, the following sample from <filename>panel-default-setup.entries</fi
         &lt;/list&gt;
       &lt;/value&gt;
     &lt;/entry&gt;</literallayout>
-            <para>In <filename>panel-default-setup.entries</filename>, the identifier <literal>bottom_panel</literal> identifies the bottom edge panel.</para>
+            <para>In the <filename>panel-default-setup.entries</filename> file, the identifier <literal>bottom_panel</literal> identifies the bottom edge panel.</para>
           </listitem>
           <listitem>
-            <para>Preference keys that specify the properties of the panels.
-The panel property keys are structured as follows:</para>
+            <para>Keys that specify the properties of the panels. The panel
+property keys are structured as follows:</para>
             <literallayout>/apps/panel/default_setup/toplevels/<replaceable>panel-name</replaceable>/<replaceable>panel-property-key</replaceable></literallayout>
             <para>For example, the key <literal>/apps/panel/default_setup/toplevels/bottom_panel/size</literal> specifies the size of the bottom panel. </para>
           </listitem>
           <listitem>
-            <para>Preference keys that list the panel objects, the panel object
-properties, and the panels in which the objects reside. For example, the following
-sample from <filename>panel-default-setup.entries</filename> specifies a <guimenu>Main Menu</guimenu> object at the left side of the bottom panel:</para>
+            <para>Keys that specify the panel objects, the panel object properties,
+and the panels in which the objects reside. For example, the following sample
+from <filename>panel-default-setup.entries</filename> specifies a <guimenu>Main Menu</guimenu> object at the left side of the bottom panel:</para>
             <literallayout>&lt;entrylist base=&quot;/apps/panel/default_setup/objects/main_menu&quot;&gt;
    &lt;entry&gt;
       &lt;key&gt;object_type&lt;/key&gt;
@@ -1118,8 +1167,8 @@ sample from <filename>panel-default-setup.entries</filename> specifies a <guimen
   &lt;/entrylist&gt;</literallayout>
           </listitem>
           <listitem>
-            <para>Preference keys that list the applets, the applet preferences,
-and the panels in which the applets reside. For example, the following sample
+            <para>Keys that specify the applets, the applet preferences, and
+the panels in which the applets reside. For example, the following sample
 from <filename>panel-default-setup.entries</filename> specifies the <application>Window List</application> applet, in the bottom panel:</para>
             <literallayout>&lt;entrylist base=&quot;/apps/panel/default_setup/applets/window_list&quot;&gt;
     &lt;entry&gt;
@@ -1154,6 +1203,13 @@ from <filename>panel-default-setup.entries</filename> specifies the <application
       &lt;/value&gt;
     &lt;/entry&gt;
   &lt;/entrylist&gt;</literallayout>
+            <para>The OAFIID is a unique identifier for an applet. To find the OAFIID
+for a particular applet, see the <filename>.server</filename> file for the
+applet in the <filename>/usr/lib/bonobo/servers</filename> directory. For
+example, the following excerpt from <filename>GNOME_Wncklet_Factory.server</filename> shows the OAFIID for the <application>Window List</application>
+applet:</para>
+            <literallayout>&lt;oaf_server iid=&quot;OAFIID:GNOME_WindowListApplet&quot; 
+type=&quot;factory&quot; location=&quot;OAFIID:GNOME_Wncklet_Factory&quot;&gt;</literallayout>
           </listitem>
         </orderedlist>
       </sect3>
@@ -1180,6 +1236,24 @@ default panel configuration in a file called <filename>my-panel-setup.entries</f
           <listitem>
             <para>Open the <filename>my-panel-setup.entries</filename> file
 in a text editor, and modify the file as required.</para>
+            <para>For example, you might want to change the location of the desktop entry
+files. The following is an excerpt from a file generated with the <literal>--dump</literal> option:</para>
+            <literallayout>&lt;entry&gt;
+      &lt;key&gt;objects/object_16/launcher_location&lt;/key&gt;
+      &lt;schema_key&gt;/schemas/apps/panel/objects/launcher_location&lt;/schema_key&gt;
+      &lt;value&gt;
+        &lt;string&gt;hadjaha-00adce02f7.desktop&lt;/string&gt;
+      &lt;/value&gt;
+    &lt;/entry&gt;</literallayout>
+            <para>In the sample above, you might want to change the reference to <literal>hadjaha-00adce02f7.desktop</literal> to another desktop entry file that is
+available globally.</para>
+            <para>When you generate a panel configuration with the <literal>--dump</literal>
+option, the positions of the panel objects are absolute positions. You might
+want to change the positions of panel objects from absolute positions to relative
+positions. The object at the extreme left of a panel has a <literal>position</literal> value of <literal>0</literal>. The next object has a <literal>position</literal> value of <literal>1</literal>, and so on. If you want object
+positions to be relative to the right side of the panel, set the value of
+the <literal>right_stick</literal> key to <literal>true</literal>. </para>
+<!--Give full key name for position.-->
           </listitem>
           <listitem>
             <para>Use the <literal>--load</literal> option with the <literal>gconftool-2</literal> command line tool to set the values of the default configuration
@@ -1219,11 +1293,12 @@ interface to which the keys correspond:</para>
           <colspec colwidth="50*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>GConf Location</para>
               </entry>
-              <entry valign="top">
-                <para>User Interface Component</para>
+              <entry>
+                <para>User
+Interface Component</para>
               </entry>
             </row>
           </thead>
@@ -1233,7 +1308,7 @@ interface to which the keys correspond:</para>
                 <para>/desktop/gnome/interface/font_name</para>
               </entry>
               <entry valign="top">
-                <para><application>Font</application> preference tool, <guilabel>Application font</guilabel> section</para>
+                <para><application>Font</application> preference tool, <guilabel>Application font</guilabel> option</para>
               </entry>
             </row>
             <row>
@@ -1241,7 +1316,7 @@ interface to which the keys correspond:</para>
                 <para>/apps/nautilus/preferences/desktop_font</para>
               </entry>
               <entry valign="top">
-                <para><application>Font</application> preference tool, <guilabel>Desktop font</guilabel> section</para>
+                <para><application>Font</application> preference tool, <guilabel>Desktop font</guilabel> option</para>
               </entry>
             </row>
           </tbody>
@@ -1255,13 +1330,9 @@ font, run the following command:</para>
 xml:readwrite:/etc/gconf/gconf.xml.mandatory --type string --set /desktop/gnome/interface/font_name &ldquo;Sans
 12&rdquo;</userinput>
       </para>
-      <indexterm>
-        <primary>desktop</primary>
-        <secondary>font preferences, setting
-with GConf</secondary>
-      </indexterm>
-      <para>To set <literal>palatino 12</literal>
-as the default desktop object font, run the following command:</para>
+      <para><indexterm><primary>desktop</primary><secondary>font preferences, setting
+with GConf</secondary></indexterm>To set <literal>palatino 12</literal> as
+the default desktop object font, run the following command:</para>
       <para>
         <computeroutput>#</computeroutput>
         <userinput>gconftool-2 --direct --config-source
@@ -1270,18 +1341,19 @@ xml:readwrite:/etc/gconf/gconf.xml.defaults --type string --set /apps/nautilus/p
       </para>
     </sect2>
     <sect2 id="gconf-20">
-      <title>To Set Desktop Background Preferences</title>
+      <title>To Set Background Preferences</title>
       <indexterm>
         <primary>GConf</primary>
-        <secondary>desktop background, setting</secondary>
+        <secondary>background, setting</secondary>
       </indexterm>
       <indexterm>
-        <primary>desktop background</primary>
-        <secondary>preferences, setting with GConf</secondary>
+        <primary>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>To set preferences for the
+desktop background, 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 background, run the following command:</para>
       <para>
         <computeroutput>#</computeroutput>
         <userinput>gconftool-2 --direct --config-source
@@ -1293,8 +1365,8 @@ xml:readwrite:/etc/gconf/gconf.xml.mandatory --type string --set /desktop/gnome/
         <userinput>gconftool-2 --direct --config-source
 xml:readwrite:/etc/gconf/gconf.xml.defaults --type string --set /desktop/gnome/background/picture_filename <replaceable>filename.png</replaceable></userinput>
       </para>
-      <para>You can also set other desktop background preferences. For information
-on the other desktop background preferences, see the <filename>desktop_gnome_background.schemas</filename> schema definition file.</para>
+      <para>You can also set other background preferences. For information on the
+other background preferences, see the <filename>desktop_gnome_background.schemas</filename> schema definition file.</para>
     </sect2>
     <sect2 id="gconf-21">
       <title>To Set Splash Image Preferences</title>
@@ -1350,145 +1422,4 @@ 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>
   </sect1>
-  <sect1 id="gconf-4">
-    <title>Using Configuration Editor</title>
-    <indexterm>
-      <primary>GConf</primary>
-      <see>Configuration Editor</see>
-    </indexterm>
-    <indexterm>
-      <primary>Configuration Editor</primary>
-      <secondary>overview</secondary>
-    </indexterm>
-    <para><application>Configuration Editor</application> enables
-you to do the following:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Modify the values of the keys in the <application>GConf</application>
-repository.</para>
-      </listitem>
-      <listitem>
-        <para>View documentation on the keys in the <application>GConf</application>
-repository.</para>
-      </listitem>
-    </itemizedlist>
-    <para>To open <application>Configuration Editor</application>, choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>System Tools</guisubmenu><guimenuitem>Configuration Editor</guimenuitem></menuchoice>. <xref linkend="gconf-FIG-31"/>
-shows the <application>Configuration Editor</application> window.</para>
-    <figure id="gconf-FIG-31">
-      <title>Configuration Editor Window</title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/gconf_editor_anno_window.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Configuration Editor window. Callouts: Tree pane, Modification pane, Documentation pane.</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-    </figure>
-    <para>The <application>Configuration Editor</application> window contains
-the following panes:</para>
-    <variablelist>
-      <varlistentry>
-        <term>Tree pane</term>
-        <listitem>
-          <para>Enables you to navigate
-the directories and subdirectories in the <application>GConf</application>
-repository. Use this pane to display the keys that you want to modify in the
-modification pane. The tree pane is on the left side of the window.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>Modification pane</term>
-        <listitem>
-          <para>Displays the keys
-in the selected <application>GConf</application> repository directory. Use
-this pane to select keys that you want to modify, and to modify the values
-of keys. The modification pane is in the upper part of the right side of the
-window.</para>
-          <para>The icons beside the keys in the modification pane indicate what type
-of value you can enter for the key. For example, the check mark icon beside
-the <literal>/system/http_proxy/use_http_proxy</literal> key indicates that
-you can enter a boolean value for the key. </para>
-          <para>The icons also indicate if you cannot edit the value of a key. For example,
-a key icon beside a schema key indicates that you cannot modify the value
-of the key. </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>Documentation pane</term>
-        <listitem>
-          <para>Displays documentation
-for the currently selected key. Use this pane to read more information on
-the <application>GConf</application> preference keys.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    <indexterm>
-      <primary>GConf</primary>
-      <secondary>GConf editor,
-using</secondary>
-    </indexterm>
-    <para>You can copy the names of keys so that
-you can paste the name of the key into another application. You can also add
-bookmarks to keys.</para>
-    <para>The following sections describe how to use the <application>Configuration
-Editor</application>.</para>
-    <sect2 id="gconf-32">
-      <title>To Modify the Value of a Key</title>
-      <indexterm>
-        <primary>Configuration Editor</primary>
-        <secondary>modifying key
-values</secondary>
-      </indexterm>
-      <para>To modify the value of a key, perform
-the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Use the tree pane to display the key that you want to modify
-in the modification pane. </para>
-        </listitem>
-        <listitem>
-          <para>Select the key to modify.</para>
-        </listitem>
-        <listitem>
-          <para>To change the value of an integer key or a string key, click
-in the <guilabel>Value</guilabel> column of the key. Type the new value for
-the key.</para>
-          <para>To change the value of a boolean key, click in the <guilabel>Value</guilabel>
-column of the key.</para>
-        </listitem>
-      </orderedlist>
-    </sect2>
-    <sect2 id="gconf-33">
-      <title>To Copy a Key Name</title>
-      <indexterm>
-        <primary>Configuration Editor</primary>
-        <secondary>copying key names</secondary>
-      </indexterm>
-      <para>To copy a key name, select the key whose name
-you want to copy in the modification pane. Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy key name</guimenuitem></menuchoice>. If required,
-you can paste the name of the key into another application.</para>
-    </sect2>
-    <sect2 id="gconf-5">
-      <title>Using Bookmarks With Keys</title>
-      <indexterm>
-        <primary>Configuration Editor</primary>
-        <secondary>bookmarks</secondary>
-      </indexterm>
-      <para>To access a key in your bookmarks, choose the key from the <guimenu>Bookmarks</guimenu> menu. You can add keys to your <guimenu>Bookmarks</guimenu>
-menu. </para>
-      <sect3 id="gconf-29">
-        <title>To Add a Bookmark</title>
-        <para>To add a bookmark, select the key that you want to bookmark in the modification
-pane. Choose <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Add bookmark</guimenuitem></menuchoice>.</para>
-      </sect3>
-      <sect3 id="gconf-30">
-        <title>To Delete a Bookmark</title>
-        <para>To delete a bookmark, choose <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Edit bookmarks</guimenuitem></menuchoice>. An <guilabel>Edit bookmarks</guilabel> dialog is displayed. Select the bookmark in the
-dialog, then click <guilabel>Delete</guilabel>. </para>
-      </sect3>
-    </sect2>
-  </sect1>
 </chapter>
diff --git a/gnome2-system-admin-guide/C/glossary.xml b/gnome2-system-admin-guide/C/glossary.xml
index 65dd29a..434cbf5 100644
--- a/gnome2-system-admin-guide/C/glossary.xml
+++ b/gnome2-system-admin-guide/C/glossary.xml
@@ -80,7 +80,7 @@ order in which to search the sources.</para>
 lists the keys in a particular application, and defines the characteristics
 of the keys. <application>GConf</application> schemas are generated from schema
 definition files. Schema definition files have a <filename>.schemas</filename>
-extension.</para>
+file extension.</para>
     </glossdef>
   </glossentry>
   <glossentry id="glossary-7">
@@ -119,8 +119,8 @@ the object.</para>
     <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>
+types with file extensions and filename patterns. MIME information files have
+a <filename>.mime</filename> file extension.</para>
     </glossdef>
   </glossentry>
   <glossentry id="glossary-21">
@@ -145,7 +145,7 @@ Graphic (PNG) file is attached to an email. </para>
     <glossdef>
       <para>The MIME type registry is a location that contains text files
 which register MIME types for the desktop environment. The location of the
-MIME type registry for the GNOME Desktop is <filename>/usr/gnome/share/mime-info</filename>.</para>
+MIME type registry for the GNOME Desktop is <filename>/usr/share/mime-info</filename>.</para>
     </glossdef>
   </glossentry>
   <glossentry id="glossary-31">
@@ -153,7 +153,13 @@ MIME type registry for the GNOME Desktop is <filename>/usr/gnome/share/mime-info
     <glossdef>
       <para>Open Source Metadata Framework file. This is a file that is
 associated with the XML file for a manual. The OMF file contains information
-about the manual that is used by the help browser. OMF files have a <filename>.omf</filename> extension.</para>
+about the manual that is used by the Help browser. OMF files have a <filename>.omf</filename> file extension.</para>
+    </glossdef>
+  </glossentry>
+  <glossentry id="glossary-33">
+    <glossterm>PAM</glossterm>
+    <glossdef>
+      <para>Pluggable Authentication Modules.</para>
     </glossdef>
   </glossentry>
   <glossentry id="glossary-25">
@@ -167,10 +173,10 @@ when searching for a pattern in a file. </para>
   <glossentry id="glossary-30">
     <glossterm>pregenerate</glossterm>
     <glossdef>
-      <para>To convert source XML files for online help to HTML before
-the online help is used. You can pregenerate help to improve the performance
-of the help browser. Use the <command>yelp-pregenerate</command> command to
-pregenerate help.</para>
+      <para>To convert source XML files for online Help to HTML before
+the online Help is used. You can pregenerate Help to improve the performance
+of the Help browser. Use the <command>yelp-pregenerate</command> command to
+pregenerate Help.</para>
     </glossdef>
   </glossentry>
   <glossentry id="glossary-28">
@@ -188,11 +194,17 @@ GNOME Desktop is <application>XScreenSaver</application>. </para>
 on the screen of the user when the screen is not in use. </para>
     </glossdef>
   </glossentry>
+  <glossentry id="glossary-34">
+    <glossterm>UDP</glossterm>
+    <glossdef>
+      <para>User Datagram Protocol.</para>
+    </glossdef>
+  </glossentry>
   <glossentry id="glossary-15">
     <glossterm>Uniform Resource Identifier</glossterm>
     <glossdef>
       <para>A Uniform Resource Identifier (URI) is a string that identifies
-a particular location in a file system or on the Web. For example, the address
+a particular location in a file system or on the web. For example, the address
 of a web page is a URI.</para>
     </glossdef>
   </glossentry>
diff --git a/gnome2-system-admin-guide/C/help.xml b/gnome2-system-admin-guide/C/help.xml
index af0224b..13f98de 100644
--- a/gnome2-system-admin-guide/C/help.xml
+++ b/gnome2-system-admin-guide/C/help.xml
@@ -4,7 +4,7 @@
     <para>This chapter describes the Help system in the GNOME Desktop.</para>
   </highlights>
   <sect1 id="help-1">
-    <title>Introduction</title>
+    <title>Introduction to the Help System</title>
     <indexterm>
       <primary>online Help</primary>
       <see>Help</see>
diff --git a/gnome2-system-admin-guide/C/l10n-readme.txt b/gnome2-system-admin-guide/C/l10n-readme.txt
index a3b1d62..dacb2e0 100644
--- a/gnome2-system-admin-guide/C/l10n-readme.txt
+++ b/gnome2-system-admin-guide/C/l10n-readme.txt
@@ -1,6 +1,26 @@
 ___________________________________________________________
-GNOME 2.4 Desktop System Administration Guide - L10n readme
+GNOME 2.6 Desktop System Administration Guide - L10n readme
 Written by: Eugene O'Connor (eugene.oconnor@sun.com)
+Manual revision: 2.3
+Date: 16 March 2004
+
+Changes between Version 2.2 and 2.3
+===================================
+
+gconf: Deleted Configuration Editor information.
+
+New chapters: 
+fontconfig
+lockdown
+appendixb
+
+Deleted chapter: 
+gdm
+
+Deleted screenshot:
+gconf_editor_anno_window
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Manual revision: 2.2
 Date: 08 September 2003
 
@@ -52,33 +72,9 @@ First version.
 
 
 ________________________________________________________________________
-GNOME 2.0 Desktop  System Administration Guide - Screenshot Instructions
+GNOME 2.6 Desktop  System Administration Guide - Screenshot Instructions
 Written by: Eugene O'Connor (eugene.oconnor@sun.com)
-Manual revision: 2.1
-Date: 14 January 2003
-
-======================================================
-General Screenshot Instructions
-------------------------------------------------------
+Manual revision: 2.3
+Date: 16 March 2004
 
-When you take screenshots for the GNOME 2.4 Desktop System Administration Guide, please note the following:
-
-* For information on how to take screenshots, see the GDP Handbook.
-* For information on how to add callouts, see the GDP Handbook.
-* For information on the style of screenshots to be used in GNOME, see http://developer.gnome.org/documents/style-guide/ch10.html. Please note that, unless otherwise specified, all of the screenshots should be taken with the default settings.
-* Screenshot are taken at a screen resolution of 800*600. 
-* When you take a screenshot of a window or dialog, the window or dialog should have focus, unless otherwise specified.
-
-======================================================
-gconf Screenshot Instructions
-------------------------------------------------------
-
-gconf_editor_anno_window
-1. Start Configuration Editor.
-2. Display the key /system/http_proxy/use_http_proxy in the GConf editor window. 
-3. Adjust the width of the panes to make the window as small as possible.
-4. Ensure that the window has focus. If it does not, click on the window to give it focus.
-5. Take a screenshot of the window. 
-6. In your image editor, paste the screenshot into the appropriate location in file gconf_editor_anno_window.xcf.
-7. In your image editor, add the translations to the XCF file.
-8. In your image editor, save the file in the appropriate formats.
+There are no screenshots in this book.
diff --git a/gnome2-system-admin-guide/C/lockdown.xml b/gnome2-system-admin-guide/C/lockdown.xml
new file mode 100644
index 0000000..044d070
--- /dev/null
+++ b/gnome2-system-admin-guide/C/lockdown.xml
@@ -0,0 +1,202 @@
+<chapter id="lockdown-0">
+  <title>Disabling GNOME Desktop Features</title>
+  <highlights>
+    <para>This chapter describes how to disable particular features
+of the GNOME Desktop.</para>
+  </highlights>
+  <sect1 id="lockdown-1">
+    <title>Introduction to Disabling GNOME Desktop Features</title>
+    <indexterm>
+      <primary>disabling features</primary>
+      <secondary>introduction</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>lockdown</primary>
+      <see>disabling features</see>
+    </indexterm>
+    <para>The GNOME Desktop includes features that you can use
+to restrict access to certain functions in the GNOME Desktop. The disable
+features are useful in various situations where you want to restrict the actions
+that users can perform on a computer. For example, you might want to prevent
+command line operations on a computer that is for public use at a trade show.
+The disable features are also known as <emphasis>lockdown</emphasis> features.</para>
+    <para>You set <application>GConf</application> keys to disable features. For
+information about how to set <application>GConf</application> keys, see <xref linkend="gconf-0"/>. You can also use the <application>Configuration Editor</application> application to set <application>GConf</application> keys in
+a user configuration source. For more information about the <application>Configuration Editor</application> application, see the <citetitle>GConf Editor
+Manual</citetitle>.</para>
+  </sect1>
+  <sect1 id="lockdown-2">
+    <title>To Disable Lock Screen and Log Out</title>
+    <indexterm>
+      <primary>disabling features</primary>
+      <secondary>lock screen</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>disabling features</primary>
+      <secondary>log
+out</secondary>
+    </indexterm>
+    <para>To disable the lock screen and log out functions, set the <literal>/apps/panel/global/disable_lock_screen</literal> key and the <literal>/apps/panel/global/disable_log_out</literal> key to <literal>true</literal>.</para>
+    <para>When you disable
+the lock screen and log out functions, the following items are removed from
+the panels:</para>
+    <itemizedlist>
+      <listitem>
+        <para><guimenuitem>Lock Screen</guimenuitem> and <guimenuitem>Log
+Out <replaceable>user</replaceable></guimenuitem> menu items from the <guimenu>Main Menu</guimenu>.</para>
+      </listitem>
+      <listitem>
+        <para><guimenuitem>Lock</guimenuitem> and <guimenuitem>Log Out</guimenuitem>
+menu items from the <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Actions</guimenuitem></menuchoice> menu. To open this menu, right-click on
+a vacant space on a panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Actions</guimenuitem></menuchoice>.</para>
+      </listitem>
+      <listitem>
+        <para><guimenuitem>Lock Screen</guimenuitem> and <guimenuitem>Log
+Out <replaceable>user</replaceable></guimenuitem> menu items from the <guimenu>Actions</guimenu> menu in the <application>Menu Bar</application> applet.</para>
+      </listitem>
+    </itemizedlist>
+    <para>Also, any <guibutton>Lock Screen</guibutton> buttons and <guibutton>Log Out</guibutton> buttons on panels are disabled.</para>
+  </sect1>
+  <sect1 id="lockdown-12">
+    <title>To Disable Command Line Operations</title>
+    <indexterm>
+      <primary>disabling features</primary>
+      <secondary>command line</secondary>
+    </indexterm>
+    <para>To disable operations from a command line, set the <literal>/desktop/gnome/lockdown/disable_command_line</literal> key to <literal>true</literal>.</para>
+    <para>When you disable command line operations, the following
+changes occur in the user interface:</para>
+    <itemizedlist>
+      <listitem>
+        <para>The <guimenuitem>Run Application</guimenuitem> menu item is
+removed from the following menus:</para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <guimenu>Main Menu</guimenu>
+            </para>
+          </listitem>
+          <listitem>
+            <para><guimenu>Actions</guimenu> submenu in the <guimenu>Add to
+Panel</guimenu> menu</para>
+          </listitem>
+          <listitem>
+            <para><guimenu>Actions</guimenu> menu in the <application>Menu Bar</application> applet</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>Any <guibutton>Run</guibutton> buttons on panels are disabled.</para>
+      </listitem>
+    </itemizedlist>
+    <para>To disable command line operations, you must also remove menu items
+that start terminal applications. For example, you might want to remove menu
+items that contain the following commands from the menus:</para>
+    <itemizedlist>
+      <listitem>
+        <para><application>GNOME Terminal</application> command, that is <command>/usr/bin/gnome-terminal</command></para>
+      </listitem>
+      <listitem>
+        <para>
+          <command>/usr/bin/xterm</command>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <command>/usr/bin/setterm</command>
+        </para>
+      </listitem>
+    </itemizedlist>
+    <para>The items are removed from the following menus:</para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <guimenu>Main Menu</guimenu>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <menuchoice>
+            <guimenu>Add to Panel</guimenu>
+            <guimenuitem>Launcher from menu</guimenuitem>
+          </menuchoice>
+        </para>
+      </listitem>
+    </itemizedlist>
+    <para>To disable command line operations, you must also disable the <application>Command Line</application> applet. To disable the <application>Command Line</application> applet, add the applet to the <literal>/apps/panel/global/disabled_applets</literal> key. When you disable the <application>Command Line</application>
+applet, the <application>Command Line</application> applet is removed from
+the <guimenu>Main Menu</guimenu> and the <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Utility</guimenuitem></menuchoice> menu. </para>
+  </sect1>
+  <sect1 id="lockdown-11">
+    <title>To Disable Panel Configuration</title>
+    <indexterm>
+      <primary>disabling features</primary>
+      <secondary>panel configuration</secondary>
+    </indexterm>
+    <para>To disable panel configuration, set the <literal>/apps/panel/global/locked_down</literal> key to <literal>true</literal>.</para>
+    <para>When you disable
+panel configuration, the following changes occur in the user interface:</para>
+    <itemizedlist>
+      <listitem>
+        <para>The following items are removed from the panel popup menu,
+and from the drawer popup menu:</para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <guimenuitem>Add to Panel</guimenuitem>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <guimenuitem>Delete This Panel</guimenuitem>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <guimenuitem>Properties</guimenuitem>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <guimenuitem>New Panel</guimenuitem>
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>The launcher popup menu is disabled.</para>
+      </listitem>
+      <listitem>
+        <para>The following items are removed from the applet popup menu:</para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <guimenuitem>Remove From Panel</guimenuitem>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <guimenuitem>Lock</guimenuitem>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <guimenuitem>Move</guimenuitem>
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>The <guimenu>Main Menu</guimenu> popup menu is disabled. </para>
+      </listitem>
+      <listitem>
+        <para>The launcher drag feature is disabled, so that users cannot
+drag launchers to, or from, panels.</para>
+      </listitem>
+      <listitem>
+        <para>The panel drag feature is disabled, so that users cannot drag
+panels to new locations.</para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
+</chapter>
diff --git a/gnome2-system-admin-guide/C/menustructure.xml b/gnome2-system-admin-guide/C/menustructure.xml
index d090e0f..ede832b 100644
--- a/gnome2-system-admin-guide/C/menustructure.xml
+++ b/gnome2-system-admin-guide/C/menustructure.xml
@@ -67,10 +67,10 @@ to the menus.</para>
         <colspec colwidth="50*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
+            <entry>
               <para>Menu</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>URI Locations</para>
             </entry>
           </row>
@@ -89,8 +89,7 @@ users</para>
           </row>
           <row>
             <entry valign="top">
-              <para><guimenu>Desktop Preferences</guimenu> menu
-for all users</para>
+              <para><guimenu>Desktop Preferences</guimenu> menu for all users</para>
             </entry>
             <entry valign="top">
               <para>
@@ -118,18 +117,11 @@ 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>
-    <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><indexterm><primary>menus</primary><secondary>vfolder information files</secondary></indexterm><indexterm><primary>vfolder information files</primary></indexterm>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;
@@ -164,10 +156,10 @@ in vfolder information files.</para>
         <colspec colname="colspec3" colwidth="66.17*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
+            <entry>
               <para>Element</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Description</para>
             </entry>
           </row>
@@ -256,13 +248,13 @@ hierarchy. Desktop entry files have a <filename>.desktop</filename> file extensi
     <literallayout>[Desktop Entry]
 Encoding=UTF-8
 Name=Calculator
-Comment=Perform simple calculations
-Exec=gnome-calculator
-Icon=gnome-calc3.png
+Comment=Perform calculations
+Exec=gcalctool
+Icon=gcalctool.png
 Terminal=false
 Type=Application
-X-GNOME-DocPath=gnome-calculator/gnome-calculator.xml
-Categories=GNOME;Application;Utility;</literallayout>
+Categories=GNOME;Application;Utility;
+X-GNOME-DocPath=gcalctool/gcalctool.xml</literallayout>
     <para><xref linkend="menustructure-TBL-7"/> describes the most important keys
 in desktop entry files.</para>
     <table frame="topbot" id="menustructure-TBL-7">
@@ -272,10 +264,10 @@ in desktop entry files.</para>
         <colspec colname="colspec1" colwidth="74.75*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
+            <entry>
               <para>Desktop Entry Key</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Description</para>
             </entry>
           </row>
@@ -333,7 +325,7 @@ from the menu. </para>
             <entry colname="colspec1" valign="top">
               <para>Specifies the filename of an
 icon that represents the item. Does not specify the path to the filename,
-or the filename extension. </para>
+or the file extension. </para>
             </entry>
           </row>
           <row>
@@ -374,38 +366,39 @@ links to a file, folder, or FTP site.</para>
           <row>
             <entry colname="colspec0" valign="top">
               <para>
-                <literal>X-GNOME-DocPath</literal>
+                <literal>Categories</literal>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <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>
+              <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 desktop menu specification at the
+following URL: </para>
+              <literallayout>
+                <ulink url="http://www.freedesktop.org">http://www.freedesktop.org</ulink>
+              </literallayout>
+              <para>The vfolder information
+files map the keywords to menus.</para>
             </entry>
           </row>
           <row>
             <entry colname="colspec0" valign="top">
               <para>
-                <literal>Categories</literal>
+                <literal>X-GNOME-DocPath</literal>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <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
-to menus.</para>
+              <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>
         </tbody>
       </tgroup>
     </table>
-    <para>For more information on the keys in desktop entry files, see the following
-URL: </para>
+    <para>For more information on the keys in desktop entry files, see the desktop
+entry specification at the following URL: </para>
     <literallayout>
-      <ulink url="http://www.freedesktop.org/standards/desktop-entry-spec/desktop-entry-spec.html">http://www.freedesktop.org/standards/desktop-entry-spec/desktop-entry-spec.html</ulink>
+      <ulink url="http://www.freedesktop.org">http://www.freedesktop.org</ulink>
     </literallayout>
     <note>
       <para>Panel launchers and desktop objects also use desktop entry files.
@@ -442,10 +435,10 @@ in directory entry files.</para>
         <colspec colname="colspec1" colwidth="72.93*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
+            <entry>
               <para>Directory Entry Key</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Description</para>
             </entry>
           </row>
@@ -482,7 +475,7 @@ of the menu. The comment is displayed as a tooltip when you point to the menu. <
             <entry colname="colspec1" valign="top">
               <para>Specifies the filename of an
 icon that represents the menu. Does not specify the path to the filename,
-or the filename extension. </para>
+or the file extension. </para>
             </entry>
           </row>
           <row>
@@ -505,7 +498,7 @@ or the filename extension. </para>
       <primary>menus</primary>
       <secondary>editing</secondary>
     </indexterm>
-    <para>You use the following desktop environment components to edit menus:</para>
+    <para>You use the following GNOME Desktop components to edit menus:</para>
     <itemizedlist>
       <listitem>
         <para><application>Nautilus</application> file manager</para>
@@ -564,10 +557,6 @@ is automatically updated with the details of the new menu. The name of the
 folder is displayed as the name of the menu.</para>
           </listitem>
         </orderedlist>
-        <note>
-          <para>You might need to reload the display of the file manager window
-before you can type the name for the folder.</para>
-        </note>
         <para>The next time that users log in, the menu is in the assigned location.</para>
       </sect3>
       <sect3 id="menustructure-20">
@@ -580,11 +569,11 @@ before you can type the name for the folder.</para>
         <orderedlist>
           <listitem>
             <para>Create a directory entry file for the item that you want to
-add. Create the directory entry file in the <filename>/usr/gnome/share/gnome/vfolders</filename> directory. For more information on directory entry files, see <xref linkend="menustructure-14"/>. </para>
+add. Create the directory entry file in the <filename>/usr/share/gnome/vfolders</filename> directory. For more information on directory entry files, see <xref linkend="menustructure-14"/>. </para>
           </listitem>
           <listitem>
             <para>Locate the vfolder information file for the location where
-you want to add the menu. For example, to add a menu to the <guimenu>Applications</guimenu> menu, locate the file <filename>/usr/gnome/etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info</filename>. </para>
+you want to add the menu. For example, to add a menu to the <guimenu>Applications</guimenu> menu, locate the file <filename>/etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info</filename>. </para>
           </listitem>
           <listitem>
             <para>In the vfolder information file, add a <literal>&lt;Folder&gt;</literal> element for the new menu. For more information on vfolder information
@@ -698,7 +687,7 @@ following conditions are true:</para>
     <itemizedlist>
       <listitem>
         <para>A vfolder information file that corresponds to the menu is
-present in the <filename>/etc/gnome-vfs-2.0/vfolder</filename> directory.</para>
+present in the <filename>/etc/gnome-vfs-2.0/vfolders</filename> directory.</para>
       </listitem>
       <listitem>
         <para>The vfolder information file has the same name as the URI
@@ -714,12 +703,12 @@ following steps:</para>
     <orderedlist>
       <listitem>
         <para>Create a vfolder information file for the menu that you want
-to configure in the <filename>/etc/gnome-vfs-2.0/vfolder</filename> directory.</para>
+to configure in the <filename>/etc/gnome-vfs-2.0/vfolders</filename> directory.</para>
       </listitem>
       <listitem>
         <para>Give the vfolder information file the name of the URI location
 that corresponds to the menu that you want to configure. For example, to configure
-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>
+the <guimenu>Applications</guimenu> menu, create a vfolder information called <filename>applications.vfolder-info</filename> in the <filename>/etc/gnome-vfs-2.0/vfolders</filename> directory.</para>
       </listitem>
       <listitem>
         <para>Set the permissions on the vfolder information file to read
diff --git a/gnome2-system-admin-guide/C/mimetypes.xml b/gnome2-system-admin-guide/C/mimetypes.xml
index 759a681..e9a07f4 100644
--- a/gnome2-system-admin-guide/C/mimetypes.xml
+++ b/gnome2-system-admin-guide/C/mimetypes.xml
@@ -2,7 +2,7 @@
   <title>MIME Types</title>
   <highlights>
     <para>This chapter describes how applications detect MIME types,
-how to register MIME types, and how to add applications to the desktop environment.</para>
+how to register MIME types, and how to add applications to the GNOME Desktop.</para>
   </highlights>
   <sect1 id="mimetypes-1">
     <title>Introduction to MIME Types</title>
@@ -64,7 +64,7 @@ type of the file.</para>
         <para>If file content sniffers do not identify the MIME type, then
 the application can check the filename. The application checks the filename
 against the <firstterm>MIME type registry</firstterm>. The MIME type registry
-associates particular filename extensions and filename patterns, with particular
+associates particular file extensions and filename patterns, with particular
 MIME types. If a match for the filename is found, the MIME type associated
 with the extension or pattern is the MIME type of the file.</para>
       </listitem>
@@ -80,7 +80,7 @@ and the MIME type registry.</para>
       <indexterm>
         <primary>file content sniffers</primary>
       </indexterm>
-      <para>File content sniffers are specified in the file <filename>/usr/gnome/etc/gnome-vfs-mime-magic</filename>. The following is an example of a file content sniffer:</para>
+      <para>File content sniffers are specified in the file <filename>/etc/gnome-vfs-mime-magic</filename>. The following is an example of a file content sniffer:</para>
       <literallayout>0	string		\x89PNG					image/png</literallayout>
       <para>The syntax for file content sniffers is as follows:</para>
       <literallayout>offset_start[:offset_end] pattern_type pattern [&amp;pattern_mask] type</literallayout>
@@ -93,10 +93,10 @@ sniffer.</para>
           <colspec colwidth="70.10*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Field</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Description</para>
               </entry>
             </row>
@@ -304,18 +304,18 @@ match the pattern and mask is <literal>image/bmp</literal>.</para>
         <primary>MIME types</primary>
         <secondary>MIME type registry</secondary>
       </indexterm>
-      <para>The MIME type registry is located in <filename>/usr/gnome/share/mime-info</filename>. The MIME type registry contains the following files:</para>
+      <para>The MIME type registry is located in <filename>/usr/share/mime-info</filename>. The MIME type registry contains the following files:</para>
       <informaltable frame="topbot">
         <tgroup cols="2" colsep="0" rowsep="0">
           <colspec colwidth="50*"/>
           <colspec colwidth="50*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>File</para>
               </entry>
-              <entry valign="top">
-                <para>Filename Extension</para>
+              <entry>
+                <para>File Extension</para>
               </entry>
             </row>
           </thead>
@@ -355,7 +355,7 @@ files.</para>
 associate MIME types with one or both of the following:</para>
         <itemizedlist>
           <listitem>
-            <para>Filename extensions</para>
+            <para>File extensions</para>
           </listitem>
           <listitem>
             <para>Filename patterns</para>
@@ -371,11 +371,10 @@ as a regular expression.</para>
         <literallayout><replaceable>MIME-type</replaceable>
 		ext[,priority]: <replaceable>list-of-extensions</replaceable>
 		regex[,priority]: <replaceable>list-of-regular-expressions</replaceable></literallayout>
-        <para>You can specify a priority value for the filename extension and the
-regular expression. You can use the priority value to differentiate composite
-filenames. For example, you can assign a priority of <literal>1</literal>
-to the <filename>.gz</filename> extension, and assign a higher priority of <literal>2</literal> to the <filename>.tar.gz</filename> extension. In this case, the
-file <filename>abc.tar.gz</filename> takes the MIME type for <filename>.tar.gz</filename>.</para>
+        <para>You can specify a priority value for the file extension and the regular
+expression. You can use the priority value to differentiate composite filenames.
+For example, you can assign a priority of <literal>1</literal> to the <filename>.gz</filename> extension, and assign a higher priority of <literal>2</literal>
+to the <filename>.tar.gz</filename> extension. In this case, the file <filename>abc.tar.gz</filename> takes the MIME type for <filename>.tar.gz</filename>.</para>
         <note>
           <para>You must indent the <literal>ext</literal> field and the <literal>regex</literal> field with a tab character (<literal>\t</literal>).</para>
         </note>
@@ -398,8 +397,10 @@ text/x-readme
         <note>
           <para>The file manager reads the MIME information files alphabetically.
 The alphabetical order determines the order in which MIME types are assigned
-to filename extensions or regular expressions. For example, if the same file
-extension is assigned to different MIME types in the files <filename>abc.mime</filename> and <filename>def.mime</filename>, the MIME type in <filename>abc.mime</filename> is used.</para>
+to file extensions or regular expressions. For example, if the same file extension
+is assigned to different MIME types in the files <filename>abc.mime</filename>
+and <filename>def.mime</filename>, the MIME type in <filename>abc.mime</filename>
+is used.</para>
         </note>
       </sect3>
       <sect3 id="mimetypes-11">
@@ -432,24 +433,24 @@ MIME keys files. Typically, the <literal>description</literal> key and the <lite
             <colspec colname="colspec1" colwidth="50*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Key</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description</para>
                 </entry>
               </row>
             </thead>
             <tbody>
               <row>
-                <entry colname="colspec0">
+                <entry colname="colspec0" valign="top">
                   <para>
                     <literal>can_be_executable</literal>
                   </para>
                 </entry>
-                <entry colname="colspec1">
-                  <para>Specifies whether files of this MIME type
-can be executed.</para>
+                <entry colname="colspec1" valign="top">
+                  <para>Specifies
+whether files of this MIME type can be executed.</para>
                 </entry>
               </row>
               <row>
@@ -471,7 +472,7 @@ displayed in the file manager and other applications.</para>
                 </entry>
                 <entry valign="top">
                   <para>Specifies the filename of an icon to represent the
-MIME type. Does not specify the path to the filename, or the filename extension. </para>
+MIME type. Does not specify the path to the filename, or the file extension. </para>
                   <para>This icon can be displayed in the file manager and other applications.</para>
                 </entry>
               </row>
@@ -490,8 +491,8 @@ for this MIME type for most applications.</para>
               <row>
                 <entry valign="top">
                   <para>
-                    <literal>short_list_application_ids</literal>
-                    <literal>_for_novice_user_level</literal>
+                    <literallayout>short_list_application_ids
+_for_novice_user_level</literallayout>
                   </para>
                 </entry>
                 <entry valign="top">
@@ -542,7 +543,7 @@ the following information:</para>
     </itemizedlist>
     <para>An application registration file can contain one or more application
 registrations. Application registration files have a <filename>.applications</filename> extension.</para>
-    <para>The location of the application registry is <filename>/usr/share/gnome/application-registry</filename>. This directory contains a default application registration file
+    <para>The location of the application registry is <filename>/usr/share/application-registry</filename>. This directory contains a default application registration file
 that is  called <filename>gnome-vfs.applications</filename>.</para>
     <para>To register an application, add a registration file for the application
 to the application registry. </para>
@@ -566,10 +567,10 @@ files.</para>
         <colspec colname="colspec1" colwidth="50*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
+            <entry>
               <para>Key</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Description</para>
             </entry>
           </row>
@@ -670,7 +671,7 @@ use.</para>
     </table>
   </sect1>
   <sect1 id="mimetypes-9">
-    <title>Adding an Application to the Desktop Environment</title>
+    <title>Adding an Application to the GNOME Desktop</title>
     <indexterm>
       <primary>MIME types</primary>
       <secondary>adding applications</secondary>
@@ -679,16 +680,16 @@ use.</para>
       <primary>applications</primary>
       <secondary>adding</secondary>
     </indexterm>
-    <para>To add an application to the desktop environment, perform
-the following steps:</para>
+    <para>To add an application to the GNOME Desktop, perform the
+following steps:</para>
     <orderedlist>
       <listitem>
         <para>Add a menu item for the application. For more information
 on how to add an item to a menu, see <xref linkend="menustructure-0"/>.</para>
       </listitem>
       <listitem>
-        <para>Add an icon for the application to <filename>/usr/gnome/share/icons/<replaceable>theme-name</replaceable>/<replaceable>icon-size</replaceable>/apps</filename>.
-For more information on icons and themes, see <citetitle>Installing Themes</citetitle>. </para>
+        <para>Add an icon for the application to <filename>/usr/share/icons/<replaceable>theme-name</replaceable>/<replaceable>icon-size</replaceable>/apps</filename>.
+For more information on icons and themes, see <xref linkend="themes-0"/>. </para>
       </listitem>
       <listitem>
         <para>If the application uses a new MIME type, add a file content
@@ -706,8 +707,8 @@ registry. For more information on MIME keys files, see <xref linkend="mimetypes-
       </listitem>
       <listitem>
         <para>If the application uses a new MIME type, add an icon for the
-MIME type to <filename>/usr/gnome/share/icons/<replaceable>theme-name</replaceable>/<replaceable>icon-size</replaceable>/mimetypes</filename>. For more information on icons
-and themes, see <citetitle>Installing Themes</citetitle>. </para>
+MIME type to <filename>/usr/share/icons/<replaceable>theme-name</replaceable>/<replaceable>icon-size</replaceable>/mimetypes</filename>. For more information on icons
+and themes, see <xref linkend="themes-0"/>. </para>
       </listitem>
       <listitem>
         <para>To associate the application with a MIME type, add an application
diff --git a/gnome2-system-admin-guide/C/performance.xml b/gnome2-system-admin-guide/C/performance.xml
index 0c26d10..21cd41f 100644
--- a/gnome2-system-admin-guide/C/performance.xml
+++ b/gnome2-system-admin-guide/C/performance.xml
@@ -11,14 +11,14 @@ the GNOME Desktop.</para>
       <secondary>introduction</secondary>
     </indexterm>
     <para>This chapter lists several preferences whose
-settings you can change to improve the performance of the desktop environment.
-You can use the <command>gconftool-2</command> command to set values for preferences
+settings you can change to improve the performance of the GNOME Desktop. You
+can use the <command>gconftool-2</command> command to set values for preferences
 for users. The example commands in this chapter show how to set values in
-the user configuration source.  </para>
+the user configuration source.</para>
     <para>You can also use the <literal>--direct</literal> and <literal>--config-source</literal> options to set mandatory values or default values for preferences.
 You can also use the <command>gconftool-2</command> command in a script to
 set the values of many preferences. For more information on the  <command>gconftool-2</command> command and the options that are  available with the
-command, see <citetitle>Using GConf</citetitle>.</para>
+command, see <xref linkend="gconf-0"/>.</para>
   </sect1>
   <sect1 id="performance-8">
     <title>Reducing CPU Usage</title>
@@ -36,7 +36,7 @@ usage</secondary>
       <secondary>reducing</secondary>
     </indexterm>
     <para>This section describes preferences that
-you can set to reduce CPU usage by the desktop environment. </para>
+you can set to reduce CPU usage by the GNOME Desktop. </para>
     <sect2 id="performance-3">
       <title>To Use Theme Options Which Require Less CPU Resources</title>
       <indexterm>
@@ -51,9 +51,9 @@ you can set to reduce CPU usage by the desktop environment. </para>
       <para>Some window frame theme
 options load image files to draw the window frame. Other options use simpler
 techniques to draw the window frame.</para>
-      <para>The default window frame option is Crux. Crux loads image files, and
-can be slow on systems with limited CPU resources. To reduce CPU usage, use
-one of the following window frame options: </para>
+      <para>The Crux window frame option loads image files, and can be slow on systems
+with limited CPU resources. To reduce CPU usage, use one of the following
+window frame options: </para>
       <itemizedlist>
         <listitem>
           <para>Atlanta</para>
@@ -92,7 +92,8 @@ frame theme option, run the following command: </para>
         <userinput>gconftool-2 --type string
 --set /apps/metacity/general/theme Atlanta</userinput>
       </para>
-      <para>Alternatively, users can choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guimenuitem>Theme</guimenuitem></menuchoice>, then select the appropriate option.</para>
+      <para>Alternatively, users can use the <application>Theme</application> preference
+tool to select the appropriate option.</para>
       <tip>
         <para>You can use the <application>Metacity Theme Viewer</application>
 to measure the performance of a window frame option, and to preview the option.
@@ -132,7 +133,8 @@ item. To turn off this feature, run the following command: </para>
         <userinput>gconftool-2 --type bool
 --set /desktop/gnome/interface/menus_have_icons false</userinput>
       </para>
-      <para>Alternatively, users can choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guimenuitem>Menus &amp; Toolbars</guimenuitem></menuchoice>, then deselect the <guilabel>Show icons in menus</guilabel> option.</para>
+      <para>Alternatively, users can use the <application>Menus &amp; Toolbars</application>
+preference tool to deselect the <guilabel>Show icons in menus</guilabel> option.</para>
     </sect2>
     <sect2 id="performance-6">
       <title>To Reduce CPU Usage by Turning Off the Splash Screen</title>
@@ -150,8 +152,9 @@ login. </para>
         <userinput>gconftool-2 --type bool
 --set /apps/gnome-session/options/show_splash_screen false</userinput>
       </para>
-      <para>Alternatively, users can choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guisubmenu>Advanced</guisubmenu><guimenuitem>Sessions</guimenuitem></menuchoice>,
-then deselect the <guilabel>Show splash screen on login</guilabel> option.</para>
+      <para>Alternatively, users can use the <application>Sessions</application>
+preference tool to deselect the <guilabel>Show splash screen on login</guilabel>
+option.</para>
     </sect2>
     <sect2 id="performance-4">
       <title>To Reduce CPU Usage by Turning Off Panel Animation</title>
@@ -166,8 +169,8 @@ in an animated style. To turn off panel animation, run the following command: </
         <userinput>gconftool-2 --type bool
 --set /apps/panel/global/enable_animations false</userinput>
       </para>
-      <para>Alternatively, users can choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guisubmenu>Advanced</guisubmenu><guimenuitem>Panel</guimenuitem></menuchoice>,
-then deselect the <guilabel>Animation</guilabel> option.</para>
+      <para>Alternatively, users can use the <application>Panel</application> preference
+tool to deselect the <guilabel>Drawer and panel animation</guilabel> option.</para>
     </sect2>
     <sect2 id="performance-7">
       <title>Improving File Manager Performance</title>
@@ -193,24 +196,24 @@ values are described in the following table:</para>
             <colspec colwidth="65.54*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Value</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description</para>
                 </entry>
               </row>
             </thead>
             <tbody>
               <row>
-                <entry>
+                <entry valign="top">
                   <para>
                     <literal>always</literal>
                   </para>
                 </entry>
-                <entry>
-                  <para>Performs
-the action for both local files, and files on other file systems.</para>
+                <entry valign="top">
+                  <para>Performs the action for both local files, and files on
+other file systems.</para>
                 </entry>
               </row>
               <row>
@@ -247,10 +250,10 @@ manager. For the fastest performance, set the value of the preferences to <liter
             <colspec colwidth="56.66*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Preference</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description</para>
                 </entry>
               </row>
@@ -275,10 +278,10 @@ files, run the following command: </para>
 the following steps:</para>
                   <orderedlist>
                     <listitem>
-                      <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window, then choose <guilabel>Performance</guilabel>.</para>
+                      <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window, then choose <guilabel>Preview</guilabel>.</para>
                     </listitem>
                     <listitem>
-                      <para>Select an option for the <guilabel>Show Text in Icons</guilabel>
+                      <para>Select an option for the <guilabel>Show text in icons</guilabel>
 preference.</para>
                     </listitem>
                   </orderedlist>
@@ -301,11 +304,11 @@ To never show the number of items in folders, run the following command:</para>
                   <para>Alternatively, users can perform the following steps:</para>
                   <orderedlist>
                     <listitem>
-                      <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window, then choose <guilabel>Performance</guilabel>.</para>
+                      <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window, then choose <guilabel>Preview</guilabel>.</para>
                     </listitem>
                     <listitem>
-                      <para>Select an option for the <guilabel>Show Number of Items in
-Folders</guilabel> preference.</para>
+                      <para>Select an option for the <guilabel>Count number of items</guilabel>
+preference.</para>
                     </listitem>
                   </orderedlist>
                 </entry>
@@ -327,11 +330,11 @@ To never show thumbnails, run the following command:</para>
                   <para>Alternatively, users can perform the following steps:</para>
                   <orderedlist>
                     <listitem>
-                      <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window, then choose <guilabel>Performance</guilabel>.</para>
+                      <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window, then choose <guilabel>Preview</guilabel>.</para>
                     </listitem>
                     <listitem>
-                      <para>Select an option for the <guilabel>Show Thumbnails for Image
-Files</guilabel> preference.</para>
+                      <para>Select an option for the <guilabel>Show thumbnails</guilabel>
+preference.</para>
                     </listitem>
                   </orderedlist>
                 </entry>
@@ -354,10 +357,10 @@ never </userinput>
 steps:</para>
                   <orderedlist>
                     <listitem>
-                      <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window, then choose <guilabel>Performance</guilabel>.</para>
+                      <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window, then choose <guilabel>Preview</guilabel>.</para>
                     </listitem>
                     <listitem>
-                      <para>Select an option for the <guilabel>Preview Sound Files</guilabel>
+                      <para>Select an option for the <guilabel>Preview sound files</guilabel>
 preference.</para>
                     </listitem>
                   </orderedlist>
@@ -382,9 +385,6 @@ turn off the side pane and the toolbar.</para>
           <userinput>gconftool-2 --type bool
 --set /apps/nautilus/preferences/start_with_sidebar false</userinput>
         </para>
-        <para>Alternatively, users can choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window,
-then choose <guilabel>Windows</guilabel>, and then deselect the <guilabel>Display side pane</guilabel> option. The next time that users open a file
-manager window, the window does not display a side pane. </para>
         <para><indexterm><primary>file manager</primary><secondary>toolbar, turning
 off</secondary></indexterm>To turn off the toolbar, run the following command: </para>
         <para>
@@ -392,9 +392,6 @@ off</secondary></indexterm>To turn off the toolbar, run the following command: <
           <userinput>gconftool-2 --type bool
 --set /apps/nautilus/preferences/start_with_toolbar false</userinput>
         </para>
-        <para>Alternatively, users can choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window,
-then choose <guilabel>Windows</guilabel>, and then deselect the <guilabel>Display toolbar</guilabel> option. The next time that users open a file manager
-window, the window does not display a toolbar. </para>
         <para>You can also turn off the location bar. Users can use the <keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo> keyboard shortcut to display a location bar
 when required.  </para>
         <para><indexterm><primary>file manager</primary><secondary>location bar, turning
@@ -405,9 +402,6 @@ command:</para>
           <userinput>gconftool-2 --type bool
 --set /apps/nautilus/preferences/start_with_location_bar false</userinput>
         </para>
-        <para>Alternatively, users can choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window,
-then choose <guilabel>Windows</guilabel>, and then deselect the <guilabel>Display location bar</guilabel> option. The next time that users open a file
-manager window, the window does not display a location bar.</para>
       </sect3>
       <sect3 id="performance-11">
         <title>To Turn Off the Desktop</title>
@@ -422,8 +416,8 @@ off</secondary>
         </indexterm>
         <para>The file manager contains a preference that
 enables users to use <application>Nautilus</application> to manage the desktop.
-Users can disable the desktop to improve performance. However, if users disable
-the desktop, users cannot do the following:</para>
+You can disable the desktop to improve performance. However, if you disable
+the desktop, you cannot do the following:</para>
         <itemizedlist>
           <listitem>
             <para>Use the <guimenu>Desktop</guimenu> menu.</para>
@@ -433,7 +427,8 @@ the desktop, users cannot do the following:</para>
 desktop background. </para>
           </listitem>
           <listitem>
-            <para>Use the <guilabel>Home</guilabel> object and the <guilabel>Trash</guilabel> object. The <guilabel>Home</guilabel> object and the <guilabel>Trash</guilabel> object are not displayed on the desktop. </para>
+            <para>Use the desktop objects, such as <guilabel>Trash</guilabel>.
+The desktop objects are not displayed on the desktop. </para>
           </listitem>
         </itemizedlist>
         <para>To disable the desktop, run the following command: </para>
@@ -442,9 +437,6 @@ desktop background. </para>
           <userinput>gconftool-2 --type bool
 --set /apps/nautilus/preferences/show_desktop false</userinput>
         </para>
-        <para>Alternatively, users can choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from a file manager window.
-Users can then choose <guilabel>Desktop &amp; Trash</guilabel>, and then deselect
-the <guilabel>Use Nautilus to draw the desktop</guilabel> option. </para>
       </sect3>
     </sect2>
   </sect1>
@@ -462,7 +454,7 @@ reducing</primary>
       <primary>network traffic, reducing</primary>
     </indexterm>
     <para>This section describes preferences that you can
-set to reduce X Window System network traffic on the desktop environment. </para>
+set to reduce X Window System network traffic on the GNOME Desktop. </para>
     <sect2 id="performance-14">
       <title>To Use Theme Options Which Create Less Network Traffic</title>
       <indexterm>
@@ -519,11 +511,11 @@ traffic if the panels are displayed on a remote host. </para>
     <para>Many modern computer systems support 24-bit color, that is, 16,777,216 colors.
 However, many users still use systems that support 8-bit color, that is, 256
 colors. </para>
-    <para>The desktop environment uses the <firstterm>websafe color palette</firstterm>.
+    <para>The GNOME Desktop uses the <firstterm>websafe color palette</firstterm>.
 This palette is a general-purpose palette of 216 colors, which is designed
 to optimize the use of color on systems that support 8-bit color. However,
-some visual components of the desktop environment are designed for systems
-that support 24-bit color.</para>
+some visual components of the GNOME Desktop are designed for systems that
+support 24-bit color.</para>
     <para>The following display problems might occur on systems that support 8-bit
 color:</para>
     <itemizedlist>
@@ -549,7 +541,7 @@ might lose colors, then become unviewable.</para>
       </listitem>
     </itemizedlist>
     <para>The following sections describe how to optimize the appearance of the
-desktop environment for systems that support 8-bit color. </para>
+GNOME Desktop for systems that support 8-bit color. </para>
     <sect2 id="performance-20">
       <title>To Use Theme Options That Use the Websafe Color Palette</title>
       <indexterm>
@@ -586,18 +578,18 @@ can increase the number of colors used.</para>
         <secondary>and color usage</secondary>
       </indexterm>
       <para>You can turn off the splash screen to make more colors available
-for the desktop environment and for applications.</para>
+for the GNOME Desktop and for applications.</para>
       <para>For information on how to turn off the splash screen, see <xref linkend="performance-6"/>.</para>
     </sect2>
     <sect2 id="performance-19">
-      <title>To Reduce Color Usage by Using a Solid Color for the Desktop Background</title>
+      <title>To Reduce Color Usage by Using a Solid Color for the Background</title>
       <indexterm>
-        <primary>desktop background</primary>
+        <primary>background</primary>
         <secondary>using solid color</secondary>
       </indexterm>
-      <para>Use a solid color for the desktop background.
-Use of a solid color reduces the number of colors used by the desktop environment. </para>
-      <para>To set a solid color for the desktop background, run the following commands: </para>
+      <para>Use a solid color for the desktop background. Use of a solid
+color reduces the number of colors used by the GNOME Desktop. </para>
+      <para>To set a solid color for the background, run the following commands: </para>
       <para>
         <computeroutput>#</computeroutput>
         <userinput>gconftool-2 --type string
@@ -613,154 +605,8 @@ Use of a solid color reduces the number of colors used by the desktop environmen
         <userinput>gconftool-2 --type string
 --set /desktop/gnome/background/primary_color \#<replaceable>hexadecimal-color</replaceable></userinput>
       </para>
-      <para>Alternatively, users can choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guimenuitem>Background</guimenuitem></menuchoice>, then choose a solid color for the desktop
-background.</para>
+      <para>Alternatively, users can use the <application>Background</application>
+preference tool to choose a solid color for the background.</para>
     </sect2>
   </sect1>
-  <sect1 id="performance-23">
-    <title>Improving Performance of Help</title>
-    <indexterm>
-      <primary>improving</primary>
-      <secondary>Help performance</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>Help</primary>
-      <secondary>improving performance</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>performance, improving</primary>
-      <secondary>Help</secondary>
-    </indexterm>
-    <para>The source documents for the
-Help are XML files. The XML files are converted to HTML, and the <application>Yelp</application> Help browser displays the HTML. The HTML can be <firstterm>pregenerated</firstterm>, that is, the XML can be converted to HTML before
-the Help is used.</para>
-    <para>Alternatively, the conversion can be performed automatically when a
-user calls a Help file. If the conversion is performed when the user calls
-the Help file, the conversion has a significant impact on the speed with which
-Help documents are displayed.</para>
-    <para>To avoid performance problems with the Help, pregenerate the HTML so
-that the Help browser does not need to do the conversion. Use the <command>yelp-pregenerate</command> command to pregenerate a Help document. The syntax
-of the <command>yelp-pregenerate</command> command is as follows: </para>
-    <cmdsynopsis>
-      <command>yelp-pregenerate</command>
-      <group>
-        <arg choice="plain">
-          <option>a</option>
-        </arg>
-        <arg choice="opt">
-          <option>f</option>
-          <replaceable>filename</replaceable>
-        </arg>
-      </group>
-      <arg choice="opt">
-        <option role="nodash">
-          <replaceable>locale</replaceable>
-        </option>
-      </arg>
-    </cmdsynopsis>
-    <para>The following table describes the options and arguments
-for the <command>yelp-pregenerate</command> command:</para>
-    <informaltable frame="topbot">
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colwidth="33.33*"/>
-        <colspec colwidth="66.67*"/>
-        <thead>
-          <row rowsep="1">
-            <entry>
-              <para>Option or Argument</para>
-            </entry>
-            <entry>
-              <para>Description</para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry>
-              <para>
-                <literal>-a</literal>
-              </para>
-            </entry>
-            <entry>
-              <para>Pregenerates
-all XML files that are registered in the <application>ScrollKeeper</application>
-database. This option is the default option.</para>
-            </entry>
-          </row>
-          <row>
-            <entry>
-              <para>
-                <literal>-f</literal>
-              </para>
-            </entry>
-            <entry>
-              <para>Pregenerates
-only the XML files that you specify in the command.</para>
-            </entry>
-          </row>
-          <row>
-            <entry>
-              <para>
-                <literal>filename</literal>
-              </para>
-            </entry>
-            <entry>
-              <para>The name of the XML file or XML files that you want to pregenerate.</para>
-            </entry>
-          </row>
-          <row>
-            <entry>
-              <para>
-                <literal>locale</literal>
-              </para>
-            </entry>
-            <entry>
-              <para>The
-locale for which you want to pregenerate the XML files. The default locale
-is C, or English.</para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <para>For example, to pregenerate the English version of all XML files in
-the file system, run the following command:</para>
-    <para>
-      <computeroutput>#</computeroutput>
-      <userinput>yelp-pregenerate -a</userinput>
-    </para>
-    <para>You do not need to specify the locale in this example, as the default
-locale is <literal>C</literal>. To pregenerate the Spanish version of the <application>gedit</application> manual, run the following command: </para>
-    <para>
-      <computeroutput>#</computeroutput>
-      <userinput>yelp-pregenerate -f gedit.xml
-es</userinput>
-    </para>
-    <para>When a user opens a Help file, the Help browser does the following: </para>
-    <orderedlist>
-      <listitem>
-        <para>The Help browser searches for the appropriate HTML file. If
-the Help browser finds the HTML file, the Help browser compares the modification
-dates of the HTML file and the corresponding XML file. If the HTML file is
-more recent than the XML file, the HTML file is displayed.</para>
-      </listitem>
-      <listitem>
-        <para>If the HTML file is older than the XML file, the XML file
-is converted to HTML.</para>
-      </listitem>
-      <listitem>
-        <para>If the Help browser does not find a HTML file for a Help document,
-the XML file is converted to HTML.</para>
-      </listitem>
-    </orderedlist>
-    <para>In other words, the Help browser displays pregenerated HTML if the pregenerated
-HTML file is present. If the pregenerated HTML file is not present, the Help
-browser converts the XML file to HTML.</para>
-    <note>
-      <para>You might want to pregenerate the Help for any new applications
-that you want to add to your desktop environment. If there are severe space
-restrictions in your environment, you might choose not to pregenerate the
-Help.</para>
-    </note>
-  </sect1>
 </chapter>
diff --git a/gnome2-system-admin-guide/C/screensavers.xml b/gnome2-system-admin-guide/C/screensavers.xml
index 30311ef..c6780cd 100644
--- a/gnome2-system-admin-guide/C/screensavers.xml
+++ b/gnome2-system-admin-guide/C/screensavers.xml
@@ -28,50 +28,13 @@ are available for the screensaver.</para>
       <secondary>setting preferences</secondary>
     </indexterm>
     <para>Default screensaver preferences are stored in a file that
-is called <filename>XScreenSaver</filename>. This file is stored in different
-locations, depending on the platform, as follows:</para>
-    <informaltable frame="topbot">
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colwidth="43.76*"/>
-        <colspec colwidth="56.24*"/>
-        <thead>
-          <row rowsep="1">
-            <entry valign="top">
-              <para>Platform</para>
-            </entry>
-            <entry valign="top">
-              <para>File Location</para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry valign="top">
-              <para>RedHat Linux</para>
-            </entry>
-            <entry valign="top">
-              <para>
-                <filename>/usr/X11R6/lib/X11/app-defaults/XScreenSaver</filename>
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>Solaris Operating System</para>
-            </entry>
-            <entry valign="top">
-              <para>
-                <filename>/usr/openwin/lib/app-defaults/XScreenSaver</filename>
-              </para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <para>To modify screensaver application preferences, users can use the <application>Screensaver</application> preference tool. To start the <application>Screensaver</application> preference tool, choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guimenuitem>Screensaver</guimenuitem></menuchoice> from the Menu Panel. When a user modifies
-the screensaver preferences, the preferences are stored in the home directory
-of the user, in the <filename>$HOME/.xscreensaver</filename> file. For information on screensaver preferences, see <citetitle>GNOME 2.2 Desktop User Guide</citetitle>.</para>
-    <para>Users can also run the command <command>/usr/X11R6/bin/xscreensaver-demo</command> to open the <guilabel>XScreenSaver</guilabel> dialog.</para>
+is called <filename>XScreenSaver</filename>. This file is stored in <filename>/usr/X11R6/lib/X11/app-defaults/XScreenSaver</filename>.</para>
+    <para>To modify screensaver application preferences, users can use the <application>Screensaver</application> preference tool. When a user modifies the screensaver
+preferences, the preferences are stored in the home directory of the user,
+in the <filename>$HOME/.xscreensaver</filename> file. For information on screensaver preferences, see <citetitle>GNOME 2.2 Desktop User Guide</citetitle>.</para>
+    <para>Users can
+also run the command <command>/usr/bin/xscreensaver-demo</command> to open
+the <guilabel>XScreenSaver</guilabel> dialog.</para>
     <para>To set default screensaver preferences for all users, modify the <filename>XScreenSaver</filename> file. You can also use the <guilabel>XScreenSaver</guilabel> dialog to create a <filename>$HOME/.xscreensaver</filename> file,
 then copy the file to the location of the <filename>XScreenSaver</filename>
 file.</para>
@@ -105,15 +68,17 @@ to choose one or more <firstterm>screensaver displays</firstterm>. A screensaver
 display is an application that displays images on the screen of the user when
 the screen is not in use. The screensaver displays are listed in the <filename>XScreenSaver</filename> file and in the <filename>$HOME/.xscreensaver</filename>
 file. </para>
-    <para>To add a new screensaver display, copy the executable file for the display
-to the <filename>/usr/X11R6/lib/xscreensaver/hacks</filename> directory. Add
-the command for the screensaver display to the <filename>XScreenSaver</filename> file or the <filename>$HOME/.xscreensaver</filename> file. Include
-any arguments that are required to run the screensaver display on the whole
-screen, rather than in a window. For example, you might want to include the <literal>-root</literal> option to display the screensaver display on the whole screen.</para>
-    <para>To disable a screensaver display, add a minus sign (-) at
-the start of the command for the screensaver display in the preferences file.
-The following excerpt from a <filename>$HOME/.xscreensaver</filename> file
-shows a disabled <literal>Qix (solid)</literal> screensaver display:</para>
+    <para>To add a new
+screensaver display, copy the executable file for the display to the directory
+where the displays are located. Add the command for the screensaver display
+to the <filename>XScreenSaver</filename> file or the <filename>$HOME/.xscreensaver</filename> file. Include any arguments that are required to run the screensaver
+display on the whole screen, rather than in a window. For example, you might
+want to include the <literal>-root</literal> option to display the screensaver
+display on the whole screen.</para>
+    <para>To disable a screensaver display, add
+a minus sign (-) at the start of the command for the screensaver display in
+the preferences file. The following excerpt from a <filename>$HOME/.xscreensaver</filename> file shows a disabled <literal>Qix (solid)</literal> screensaver
+display:</para>
     <literallayout>-		 &quot;Qix (solid)&quot; 	qix -root -solid -segments 100</literallayout>
   </sect1>
 </chapter>
diff --git a/gnome2-system-admin-guide/C/sessions.xml b/gnome2-system-admin-guide/C/sessions.xml
index d7db396..2661f4b 100644
--- a/gnome2-system-admin-guide/C/sessions.xml
+++ b/gnome2-system-admin-guide/C/sessions.xml
@@ -12,7 +12,7 @@ and login scripts.</para>
       <secondary>introduction</secondary>
     </indexterm>
     <para>A session occurs between the time that a user logs in to
-the desktop environment and the time that the user logs out. The session manager
+the GNOME Desktop and the time that the user logs out. The session manager
 starts after the <application>Login Manager</application> authenticates the
 user. The session manager enables the user to manage the session. For example,
 a user can save the state of a session and return to that session the next
@@ -27,7 +27,7 @@ time that the user logs in. </para>
       </listitem>
       <listitem>
         <para>The <application>gnome-panel</application> application, which
-runs the panels in the desktop environment.</para>
+runs the panels in the GNOME Desktop.</para>
       </listitem>
       <listitem>
         <para>The <application>Metacity</application> window manager.</para>
@@ -48,10 +48,10 @@ session information:</para>
         <colspec colwidth="48.20*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
+            <entry>
               <para>File</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Description</para>
             </entry>
           </row>
@@ -82,6 +82,7 @@ the details are stored in this file.</para>
         </tbody>
       </tgroup>
     </informaltable>
+<!--The last row does not appear to be true in Mercury - check.-->
     <para>To set default session details for all users, modify the default session
 file. </para>
     <para>To restore the default session settings for a user, delete the session
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 16435dc..9a7314f 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.4 Desktop System Administration Guide
+      GNOME 2.6 Desktop System Administration Guide
     </title>
 -->
     <title>

       System Administration Guide
     </title>

     <date>

-      2003-09-08
+      2004-03-16
     </date>

-    <version identifier="2.2" date="2003-09-08" 
-    description="GNOME 2.4 version"/>

+    <version identifier="2.3" date="2004-03-16" 
+    description="GNOME 2.6 version"/>

     <subject category="GNOME|Desktop"/>

     <description>

-      System Administration Guide for GNOME 2.4. 

+      System Administration Guide for GNOME 2.6. 

     </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 46d5920..80f3a1a 100644
--- a/gnome2-system-admin-guide/C/system-admin-guide.xml
+++ b/gnome2-system-admin-guide/C/system-admin-guide.xml
@@ -1,29 +1,36 @@
 <?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.4">

-  <!ENTITY manrevision "2.2">

-  <!ENTITY date "September 2003">

+  <!ENTITY gnomeversion "2.6">

+  <!ENTITY manrevision "2.3">

+  <!ENTITY date "March 2004">

   <!ENTITY LEGAL SYSTEM "legal.xml">

   <!ENTITY gconf SYSTEM "gconf.xml">

   <!ENTITY menustructure SYSTEM "menustructure.xml">
   <!ENTITY themes SYSTEM "themes.xml">
+  <!ENTITY fontconfig SYSTEM "fontconfig.xml">
   <!ENTITY mimetypes SYSTEM "mimetypes.xml">
   <!ENTITY gdm SYSTEM "gdm.xml">
   <!ENTITY screensavers SYSTEM "screensavers.xml">
   <!ENTITY sessions SYSTEM "sessions.xml">
   <!ENTITY help SYSTEM "help.xml">
   <!ENTITY performance SYSTEM "performance.xml">
+  <!ENTITY lockdown SYSTEM "lockdown.xml">
   <!ENTITY appendixa SYSTEM "appendixa.xml">
+  <!ENTITY appendixb SYSTEM "appendixb.xml">
   <!ENTITY gloss SYSTEM "glossary.xml">
 ]>

 <book id="index"> 

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

   <bookinfo> 

 	 <copyright> 

-		<year>2003</year> 

+		<year>2004</year> 

 		<holder>Sun Microsystems</holder> 

 	 </copyright>

+	 <copyright> 

+		<year>2003</year> 

+		<holder>Sun Microsystems</holder> 

+	 </copyright>
 

 <!-- translators: uncomment this:

   <copyright>

@@ -55,6 +62,14 @@
 		  </revdescription> 
 		</revision> 
 		<revision> 

+		  <revnumber>GNOME 2.4 Desktop System Administration Guide V2.2</revnumber> 

+		  <date>September 2003</date> 

+		  <revdescription> 

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

 		  <revnumber>GNOME 2.2 Desktop System Administration Guide V2.1</revnumber> 

 		  <date>January 2003</date> 

 		  <revdescription> 

@@ -71,11 +86,11 @@
 		  </revdescription> 
 		</revision> 

 	 </revhistory> 

-	 <releaseinfo> This manual describes version &gnomeversion; of the GNOME desktop.

+	 <releaseinfo> This manual describes version &gnomeversion; of the GNOME Desktop.

 		</releaseinfo> 

 	 <legalnotice> 

 		<title>Feedback</title> 

-		<para> To report a bug or make a suggestion regarding the GNOME desktop or this

+		<para> To report a bug or make a suggestion regarding the GNOME Desktop or this

 		  manual, follow the directions in the <ulink url="ghelp:gnome-feedback"
 	  type="help">GNOME Feedback Page</ulink>. </para>

 	 </legalnotice> 

@@ -83,12 +98,14 @@
 &gconf;

 &menustructure;
 &themes;
+&fontconfig;
 &mimetypes;
-&gdm;
 &screensavers;
 &sessions;
 &help;
 &performance;
+&lockdown;
 &appendixa;
+&appendixb;
 &gloss;
 
</book> 

diff --git a/gnome2-system-admin-guide/C/themes.xml b/gnome2-system-admin-guide/C/themes.xml
index 02620aa..82c2198 100644
--- a/gnome2-system-admin-guide/C/themes.xml
+++ b/gnome2-system-admin-guide/C/themes.xml
@@ -12,15 +12,16 @@ and how to create a custom option.</para>
       <secondary>introduction</secondary>
     </indexterm>
     <para>A theme is a group of coordinated settings that specifies the visual
-appearance of a part of the desktop environment. Users can choose themes to
-change the appearance of the desktop.</para>
-    <para>A theme contains settings that affect different parts of the GNOME desktop,
+appearance of a part of the GNOME Desktop. Users can choose themes to change
+the appearance of the GNOME Desktop.</para>
+    <para>A theme contains settings that affect different parts of the GNOME Desktop,
 as follows:</para>
     <variablelist>
       <varlistentry>
         <term>Controls</term>
         <listitem>
-          <para><indexterm><primary>themes</primary><secondary>controls options</secondary><tertiary>introduction</tertiary></indexterm><indexterm><primary>GTK+ themes</primary><see>themes, controls options</see></indexterm>The controls setting for a theme determines the visual
+          <para><indexterm><primary>themes</primary><secondary>controls options</secondary><tertiary>introduction</tertiary></indexterm><indexterm><primary>GTK+ themes</primary><see>themes, controls
+options</see></indexterm>The controls setting for a theme determines the visual
 appearance of windows, panels, and applets. The controls setting also determines
 the visual appearance of the GNOME-compliant interface items that appear on
 windows, panels, and applets, such as menus, icons, and buttons. Some of the
@@ -32,17 +33,8 @@ preference tool.</para>
       <varlistentry>
         <term>Window frame</term>
         <listitem>
-          <indexterm>
-            <primary>themes</primary>
-            <secondary>window frame options</secondary>
-            <tertiary>introduction</tertiary>
-          </indexterm>
-          <indexterm>
-            <primary>Metacity themes</primary>
-            <see>themes, window frame options</see>
-          </indexterm>
-          <para>The window frame setting
-for a theme determines the appearance of the frames around windows only. Users
+          <para><indexterm><primary>themes</primary><secondary>window frame options</secondary><tertiary>introduction</tertiary></indexterm><indexterm><primary>Metacity themes</primary><see>themes, window frame options</see></indexterm>The window frame setting for
+a theme determines the appearance of the frames around windows only. Users
 can choose an option for the window frame setting from the <guilabel>Window
 Border</guilabel> tabbed section in the <application>Theme</application> preference
 tool.</para>
@@ -51,16 +43,7 @@ tool.</para>
       <varlistentry>
         <term>Icon</term>
         <listitem>
-          <indexterm>
-            <primary>themes</primary>
-            <secondary>icons options</secondary>
-            <tertiary>introduction</tertiary>
-          </indexterm>
-          <indexterm>
-            <primary>icon themes</primary>
-            <see>themes, icons options</see>
-          </indexterm>
-          <para>The icon setting for a theme determines the appearance of
+          <para><indexterm><primary>themes</primary><secondary>icons options</secondary><tertiary>introduction</tertiary></indexterm><indexterm><primary>icon themes</primary><see>themes, icons options</see></indexterm>The icon setting for a theme determines the appearance of
 the icons on panels and the desktop background. Users can choose an option
 for the icon setting from the <guilabel>Icons</guilabel> tabbed section in
 the <application>Theme</application> preference tool.</para>
@@ -71,7 +54,7 @@ the <application>Theme</application> preference tool.</para>
   <sect1 id="themes-17">
     <title>Theme Index File</title>
     <para>Each theme has an index file which defines the characteristics of the
-theme. The name of the index file is <filename>/usr/share/theme/<replaceable>theme-name</replaceable>/index.theme</filename>. </para>
+theme. The name of the index file is <filename>/usr/share/themes/<replaceable>theme-name</replaceable>/index.theme</filename>. </para>
     <para>The following is a sample theme index file:</para>
     <literallayout>[Desktop Entry]
 Type=X-GNOME-Metatheme
@@ -105,83 +88,82 @@ ApplicationFont=sans 18
         </thead>
         <tbody>
           <row>
-            <entry colname="colspec0">
+            <entry colname="colspec0" valign="top">
               <para>
                 <literal>Type</literal>
               </para>
             </entry>
-            <entry colname="colspec1">
-              <para>Specifies that this theme determines the appearance
-of several theme options, such as controls, window frames, and icons.</para>
+            <entry colname="colspec1" valign="top">
+              <para>Specifies that this theme determines
+the appearance of several theme options, such as controls, window frames,
+and icons.</para>
             </entry>
           </row>
           <row>
-            <entry colname="colspec0">
+            <entry colname="colspec0" valign="top">
               <para>
                 <literal>Name</literal>
               </para>
             </entry>
-            <entry colname="colspec1">
-              <para>The name of the theme. This is the name of
-the theme that is displayed in the <application>Theme</application> preference
-tool.</para>
+            <entry colname="colspec1" valign="top">
+              <para>The name of the theme. This is
+the name of the theme that is displayed in the <application>Theme</application>
+preference tool.</para>
             </entry>
           </row>
           <row>
-            <entry colname="colspec0">
+            <entry colname="colspec0" valign="top">
               <para>
                 <literal>Comment</literal>
               </para>
             </entry>
-            <entry colname="colspec1">
-              <para>A brief description of the theme. This is
-the text that is displayed under the name of the theme in the <application>Theme</application> preference tool.</para>
+            <entry colname="colspec1" valign="top">
+              <para>A brief description of the theme.
+This is the text that is displayed under the name of the theme in the <application>Theme</application> preference tool.</para>
             </entry>
           </row>
           <row>
-            <entry>
+            <entry valign="top">
               <para>
                 <literal>GtkTheme</literal>
               </para>
             </entry>
-            <entry>
-              <para>Corresponds to the controls setting in the <application>Theme</application>
-preference tool. Specifies which controls setting option to apply to windows,
-panels, and applets.</para>
+            <entry valign="top">
+              <para>Corresponds to the controls setting in the <application>Theme</application> preference tool. Specifies which controls setting option
+to apply to windows, panels, and applets.</para>
             </entry>
           </row>
           <row>
-            <entry>
+            <entry valign="top">
               <para>
                 <literal>IconTheme</literal>
               </para>
             </entry>
-            <entry>
-              <para>Corresponds to the icons setting in the <application>Theme</application> preference
-tool. Specifies which icons setting option to apply to panels and the desktop
-background.</para>
+            <entry valign="top">
+              <para>Corresponds to the icons setting in the <application>Theme</application> preference tool. Specifies which icons setting option
+to apply to panels and the desktop background.</para>
             </entry>
           </row>
           <row>
-            <entry>
+            <entry valign="top">
               <para>
                 <literal>MetacityTheme</literal>
               </para>
             </entry>
-            <entry>
-              <para>Corresponds to the window frame setting in the <application>Theme</application>
-preference tool. Specifies which window frame setting option to apply to windows.</para>
+            <entry valign="top">
+              <para>Corresponds to the window frame setting in the <application>Theme</application> preference tool. Specifies which window frame setting
+option to apply to windows.</para>
             </entry>
           </row>
           <row>
-            <entry colname="colspec0">
+            <entry colname="colspec0" valign="top">
               <para>
                 <literal>ApplicationFont</literal>
               </para>
             </entry>
-            <entry colname="colspec1">
-              <para>Corresponds to the application font setting
-in the <application>Font</application> preference tool.</para>
+            <entry colname="colspec1" valign="top">
+              <para>Corresponds to the application font setting in the <application>Font</application>
+preference tool.</para>
             </entry>
           </row>
         </tbody>
@@ -290,9 +272,10 @@ as follows:</para>
         </listitem>
       </varlistentry>
     </variablelist>
-    <para>Typically, a new option for the icons setting
-is supplied as a <filename>.tar.gz</filename> file. To install the new icons
-option, unzip the <filename>.tar.gz</filename> file, then untar the <filename>.tar</filename> file into the <filename>/usr/share/icons</filename> directory.</para>
+    <para>Typically, a new option for the icons setting is supplied
+as a <filename>.tar.gz</filename> file. To install the new icons option, unzip
+the <filename>.tar.gz</filename> file, then untar the <filename>.tar</filename>
+file into the <filename>/usr/share/icons</filename> directory.</para>
     <para>Users can install their own options for the icons setting. If a user
 installs an option for the icons setting, the option is stored in the <filename>$HOME/.icons/<replaceable>option-name</replaceable></filename> directory.</para>
   </sect1>
@@ -302,17 +285,17 @@ installs an option for the icons setting, the option is stored in the <filename>
       <primary>themes</primary>
       <secondary>installing icons</secondary>
     </indexterm>
-    <para>The desktop environment provides several themes that are
-designed for users with special visual needs. For example, some of the themes
-are designed for users with low vision. Several versions of icons might be
-required so that the icon can be displayed properly in each theme.</para>
+    <para>The GNOME Desktop provides several themes that are designed
+for users with special visual needs. For example, some of the themes are designed
+for users with low vision. Several versions of icons might be required so
+that the icon can be displayed properly in each theme.</para>
     <para>You might need to install a new icon for an application. When you install
 a new icon, you must create several versions of the icon, so that the icon
 displays correctly in the themes. You must create several versions of the
 following types of icon:</para>
     <itemizedlist>
       <listitem>
-        <para>Icons that are used within applications in the desktop environment.</para>
+        <para>Icons that are used within applications in the GNOME Desktop.</para>
       </listitem>
       <listitem>
         <para>Icons that are used internally by GTK+ applications, or GTK+
@@ -344,12 +327,13 @@ versions of the icon:</para>
 icons above also, for themes that do not require large print.</para>
     <para>Install the icons to the image files location that is specified for
 the theme in <xref linkend="themes-3"/> or <xref linkend="themes-5"/>. For example,
-to add icons to the HighContrast theme, add the icons to the <filename>/usr/share/themes/HighContrast/pixmaps</filename> directory. Add references to the icons to the relevant theme files.
-For example, to add icons to the HighContrast theme, add references to the
-icons to the <filename>/usr/share/themes/HighContrast/gtk-2.0/gtkrc</filename>
-file. </para>
+to add icons to the HighContrastLargePrint theme, add the icons to the <filename>/usr/share/themes/HighContrastLargePrint/pixmaps</filename> directory. Add
+references to the icons to the relevant theme files. For example, to add icons
+to the HighContrastLargePrint theme, add references to the icons to the <filename>/usr/share/themes/HighContrastLargePrint/gtk-2.0/gtkrc</filename> file. Modify
+the <filename>gtkrc</filename> file for the theme to associate the icon with
+a GTK stock icon identifier.<!--More info required from Calum.--></para>
     <para>For more information on how to create icons for application launchers
-and for panels, see <ulink url="http://www.freedesktop.org/standards/icon-theme-spec.html">http://www.freedesktop.org/standards/icon-theme-spec.html</ulink>.</para>
+and for panels, see <ulink url="http://www.freedesktop.org/Standards/icon-theme-spec">http://www.freedesktop.org/Standards/icon-theme-spec</ulink>.</para>
   </sect1>
   <sect1 id="themes-15">
     <title>To Create a Custom Controls Option</title>
@@ -370,12 +354,12 @@ create the following directories:</para>
         <itemizedlist>
           <listitem>
             <para>
-              <filename>/usr/share/themes/SmallPrint/gtk-2.0</filename>
+              <filename>/usr/share/themes/SmallPrint</filename>
             </para>
           </listitem>
           <listitem>
             <para>
-              <filename>/usr/share/themes/SmallPrint/pixmaps</filename>
+              <filename>/usr/share/themes/SmallPrint/gtk-2.0</filename>
             </para>
           </listitem>
         </itemizedlist>