- Markup cleanup

* gnome2-system-admin-guide/C/gconf.xml:
- Markup cleanup

1 files changed, 224 insertions, 232 deletions

diff --git a/gnome2-system-admin-guide/C/gconf.xml b/gnome2-system-admin-guide/C/gconf.xml
index 6dc86a8..7d546e0 100644
--- a/gnome2-system-admin-guide/C/gconf.xml
+++ b/gnome2-system-admin-guide/C/gconf.xml
@@ -55,45 +55,45 @@ preference, all applications that use the preference are immediately updated.</p
     <para>Each preference in the <application>GConf</application> repository is
 expressed as a key-value pair. A <firstterm>GConf preference key</firstterm>
 is an element in the repository that corresponds to an application preference.
-For example, the <literal>/apps/gnome-session/options/show_splash_screen</literal>
+For example, the <systemitem>/apps/gnome-session/options/show_splash_screen</systemitem>
 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>Panel</application>
-preference tool does not contain an option that corresponds to the <literal>/apps/panel/global/tooltips_enabled</literal> key.</para>
+preference tool does not contain an option that corresponds to the <systemitem>/apps/panel/global/tooltips_enabled</systemitem> key.</para>
     <para>The repository is structured like a simple hierarchical file system.
 The repository contains the following:</para>
     <itemizedlist>
       <listitem>
         <para>Directories that correspond to applications that use the <application>GConf</application> repository. For example, the file system contains the
-directory <filename>/apps/metacity</filename>. </para>
+directory <systemitem>/apps/metacity</systemitem>. </para>
       </listitem>
       <listitem>
         <para>Subdirectories that correspond to categories of preferences.
-For example, the file system contains the directory <filename>/apps/metacity/general</filename>.</para>
+For example, the file system contains the directory <systemitem>/apps/metacity/general</systemitem>.</para>
       </listitem>
       <listitem>
         <para>Special files that list the preference keys in the directory,
 and contain information about the keys. For example, a file that contains
 information about the keys that relate to the HTTP proxy preferences is in
-the directory <filename>/system/http_proxy</filename>. </para>
+the directory <systemitem>/system/http_proxy</systemitem>. </para>
       </listitem>
       <listitem>
-        <para>A <filename>/schemas</filename> directory that contains files
+        <para>A <systemitem>/schemas</systemitem> directory that contains files
 that describe all of the preference keys.</para>
       </listitem>
     </itemizedlist>
     <para>Preference keys typically have simple values such as strings, integers,
 or lists of strings and integers. The format of the preference key in the
 repository depends on the backend module that is used to read the repository.
-The following is an example of the <literal>/desktop/gnome/interface/font_name</literal> preference key when an Extensible Markup Language (XML) backend
+The following is an example of the <systemitem>/desktop/gnome/interface/font_name</systemitem> preference key when an Extensible Markup Language (XML) backend
 module is used to read the repository:</para>
-    <literallayout>&lt;entry name=&quot;font_name&quot; mtime=&quot;1038323555&quot; muser=&quot;user123&quot; type=&quot;string&quot;&gt;
-&lt;stringvalue&gt;Sans 10&lt;/stringvalue&gt;&lt;/entry&gt;</literallayout>
+    <programlisting><![CDATA[<entry name="font_name" mtime="1038323555" muser="user123" type="string">
+<stringvalue>Sans 10</stringvalue></entry>]]></programlisting>
     <note>
       <para>When this guide refers to a preference key, the path to the key
-is added to the name of the key. For example, the <literal>font_name</literal>
-preference key in the <filename>/desktop/gnome/interface</filename> subdirectory
-is referred to as <literal>/desktop/gnome/interface/font_name</literal>.</para>
+is added to the name of the key. For example, the <systemitem>font_name</systemitem>
+preference key in the <systemitem>/desktop/gnome/interface</systemitem> subdirectory
+is referred to as <systemitem>/desktop/gnome/interface/font_name</systemitem>.</para>
     </note>
     <sect2 id="gconf-26">
       <title>GConf Configuration Sources</title>
@@ -104,7 +104,7 @@ 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>gconf-version-number</replaceable>/path</filename>. Each user has a path file. The path file specifies the following
+path file is <systemitem>/etc/gconf/<replaceable>gconf-version-number</replaceable>/path</systemitem>. Each user has a path file. The path file specifies the following
 information for each configuration source:</para>
       <itemizedlist>
         <listitem>
@@ -117,13 +117,13 @@ information for each configuration source:</para>
           <para>The location of the repository.</para>
         </listitem>
       </itemizedlist>
-      <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
+      <para>The <application>GConf</application> path file also contains <systemitem>include</systemitem> instructions. By default, the contents of the <application>GConf</application> path file are as follows: </para>
+      <programlisting>xml:readonly:/etc/gconf/gconf.xml.mandatory
 include /etc/gconf/2/local-mandatory.path
-include &quot;$(HOME)/.gconf.path&quot;
+include "$(HOME)/.gconf.path"
 include /etc/gconf/2/local-defaults.path
 xml:readwrite:$(HOME)/.gconf
-xml:readonly:/etc/gconf/gconf.xml.defaults</literallayout>
+xml:readonly:/etc/gconf/gconf.xml.defaults</programlisting>
       <para>When <application>GConf</application> searches for a preference value, <application>GConf</application> reads the configuration sources in the order specified
 in the path file. The following table describes the configuration sources
 in the path file:</para>
@@ -192,7 +192,7 @@ order of priority:</para>
           <para>Default preferences</para>
         </listitem>
       </orderedlist>
-      <para>The <literal>include</literal> instructions in the <application>GConf</application> path file enable system administrators to specify other configuration
+      <para>The <systemitem>include</systemitem> 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">
@@ -357,7 +357,7 @@ and a schema object:</para>
               </entry>
               <entry colname="colspec1" valign="top">
                 <para>
-                  <literal>/desktop/gnome/interface/font_name</literal>
+                  <systemitem>/desktop/gnome/interface/font_name</systemitem>
                 </para>
               </entry>
             </row>
@@ -367,7 +367,7 @@ and a schema object:</para>
               </entry>
               <entry colname="colspec1" valign="top">
                 <para>
-                  <literal>/schemas/desktop/gnome/interface/font_name</literal>
+                  <systemitem>/schemas/desktop/gnome/interface/font_name</systemitem>
                 </para>
               </entry>
             </row>
@@ -376,30 +376,30 @@ and a schema object:</para>
                 <para>Schema object</para>
               </entry>
               <entry valign="top">
-                <literallayout>&lt;schema&gt;
-  &lt;applyto&gt;/desktop/gnome/interface/font_name&lt;/applyto&gt;
-  &lt;key&gt;/schemas/desktop/gnome/interface/font_name&lt;/key&gt;
-  &lt;owner&gt;gnome&lt;/owner&gt;
-  &lt;type&gt;string&lt;/type&gt;
-  &lt;default&gt;Sans 10&lt;/default&gt;
-  &lt;locale name=&quot;C&quot;&gt;
-    &lt;short&gt;Default font&lt;/short&gt;
-      &lt;long&gt;Name of the default font used by gtk+.&lt;/long&gt;
-  &lt;/locale&gt;
-&lt;/schema&gt;</literallayout>
+                <programlisting><![CDATA[<schema>
+  <applyto>/desktop/gnome/interface/font_name</applyto>
+  <key>/schemas/desktop/gnome/interface/font_name</key>
+  <owner>gnome</owner>
+  <type>string</type>
+  <default>Sans 10</default>
+  <locale name="C">
+    <short>Default font</short>
+      <long>Name of the default font used by gtk+.</long>
+  </locale>
+</schema>]]></programlisting>
               </entry>
             </row>
           </tbody>
         </tgroup>
       </informaltable>
       <para>You can associate a schema key with a preference key. For example, the
-following <literal>/desktop/gnome/interface/font_name</literal> key includes
+following <systemitem>/desktop/gnome/interface/font_name</systemitem> key includes
 a schema key:</para>
-      <literallayout>&lt;entry name=&quot;font_name&quot; mtime=&quot;1034873859&quot; 
-schema=&quot;/schemas/desktop/gnome/interface/font_name&quot;/&gt;</literallayout>
+      <programlisting><![CDATA[<entry name="font_name" mtime="1034873859"
+schema="/schemas/desktop/gnome/interface/font_name"/>]]></programlisting>
       <para>When you associate a schema key with a preference key, the preference
 uses the suggested value that is specified in the schema object of the schema
-key. The suggested value is contained in the <literal>&lt;default&gt;</literal>
+key. The suggested value is contained in the <sgmltag>&lt;default&gt;</sgmltag>
 element in the schema object. By default, all the preference keys in the default
 configuration source are associated with schema keys.</para>
       <para>Typically, schemas are stored in the default configuration source. </para>
@@ -426,7 +426,7 @@ new configuration source.</para>
 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/panel/global/tooltips_enabled</literal> key
+For example, the <systemitem>/apps/panel/global/tooltips_enabled</systemitem> 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,
@@ -473,7 +473,7 @@ key.</para>
       </listitem>
       <listitem>
         <para>If the value of the schema key is a schema object, return
-the suggested value in the <literal>&lt;default&gt;</literal> element of the
+the suggested value in the <sgmltag>&lt;default&gt;</sgmltag> element of the
 schema object.</para>
       </listitem>
     </orderedlist>
@@ -482,10 +482,7 @@ values. All applications use this cache, so applications only need to access
 the configuration sources once.</para>
     <para>To terminate the <application>GConf</application> daemon, run the following
 command:</para>
-    <para>
-      <computeroutput>#</computeroutput>
-      <userinput>gconftool-2 --shutdown</userinput>
-    </para>
+    <screen><userinput>gconftool-2 --shutdown</userinput></screen>
   </sect1>
   <sect1 id="gconf-6">
     <anchor id="gconf-TBL-7"/>
@@ -513,8 +510,8 @@ an application.</para>
       </listitem>
     </itemizedlist>
     <para>For example, use the following command to display the values of all
-keys in the <filename>/desktop/gnome</filename> directory and subdirectories.</para>
-    <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --recursive-list /desktop/gnome</userinput></literallayout>
+keys in the <systemitem>/desktop/gnome</systemitem> directory and subdirectories.</para>
+    <screen><userinput>gconftool-2 --recursive-list /desktop/gnome</userinput></screen>
     <para>Below are listed some of the options that you can
 use with the <command>gconftool-2</command> command.  For detailed command line options, 
 please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
@@ -522,7 +519,7 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       <title>gconftool-2 Command Options</title>
       <varlistentry>
         <term>
-            <literal>--all-dirs</literal>
+            <option>--all-dirs</option>
         </term>
         <listitem>
           <para>Lists all subdirectories in a
@@ -531,7 +528,7 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--all-entries</literal>
+            <option>--all-entries</option>
         </term>
         <listitem>
           <para>Displays the values of all keys
@@ -540,10 +537,10 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--config-source=<replaceable>configuration-source</replaceable></literal>
+            <option>--config-source=<replaceable>configuration-source</replaceable></option>
         </term>
         <listitem>
-          <para>Use this option with the <literal>--direct</literal> option
+          <para>Use this option with the <option>--direct</option> option
     to specify a configuration source to use. If you do not specify a configuration
     source with this option, the command runs on all configuration sources in
     the path file.</para>
@@ -551,31 +548,31 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--direct</literal>
+            <option>--direct</option>
         </term>
         <listitem>
-          <para>Use this option with the <literal>--config-source</literal> option to access a configuration source directly.
+          <para>Use this option with the <option>--config-source</option> option to access a configuration source directly.
     When you use this option, <application>GConf</application> bypasses the server.
     Ensure that the <application>GConf</application> daemon, <command>gconfd-2</command>, is not running before you use this option.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--dump</literal>
+            <option>--dump</option>
         </term>
         <listitem>
           <para>Generates a list that contains all preference
     keys in a <application>GConf</application> repository directory that you specify.
     The list contains XML descriptions of all the keys. The list is contained
-    in a <literal>&lt;gconfentryfile&gt;</literal> element. </para>
+    in a <sgmltag>&lt;gconfentryfile&gt;</sgmltag> element. </para>
           <para>For example,
     you can redirect the output from this option to generate a file that lists
-    all keys that are related to your panel configuration. You can use the <literal>--load</literal> option with this file.</para>
+    all keys that are related to your panel configuration. You can use the <option>--load</option> option with this file.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--get</literal>
+            <option>--get</option>
         </term>
         <listitem>
           <para>Displays the value of a preference key that you specify.
@@ -585,7 +582,7 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--help</literal>
+            <option>--help</option>
         </term>
         <listitem>
           <para>Displays a help message about the <command>gconftool-2</command> command, and the options that you can use with the <command>gconftool-2</command> command.</para>
@@ -593,7 +590,7 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--load=<replaceable>filename</replaceable></literal>
+            <option>--load=<replaceable>filename</replaceable></option>
         </term>
         <listitem>
           <para>Use this option to sets the values of preference keys in the current directory
@@ -603,16 +600,16 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--long-desc=<replaceable>description</replaceable></literal>
+            <option>--long-desc=<replaceable>description</replaceable></option>
         </term>
         <listitem>
-          <para>Use this option with the <literal>--set-schema</literal>
+          <para>Use this option with the <option>--set-schema</option>
     option to specify a long description for a schema key. </para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--makefile-install-rule</literal>
+            <option>--makefile-install-rule</option>
         </term>
         <listitem>
           <para>Installs schema definition files to applications.</para>
@@ -620,16 +617,16 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--owner=<replaceable>owner</replaceable></literal>
+            <option>--owner=<replaceable>owner</replaceable></option>
         </term>
         <listitem>
-          <para>Use this option with the <literal>--set-schema</literal> option to specify
+          <para>Use this option with the <option>--set-schema</option> option to specify
     an owner for a schema key. </para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--recursive-list</literal>
+            <option>--recursive-list</option>
         </term>
         <listitem>
           <para>Displays the values of all preference keys in all
@@ -638,7 +635,7 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--recursive-unset</literal>
+            <option>--recursive-unset</option>
         </term>
         <listitem>
           <para>Resets
@@ -648,73 +645,73 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--set</literal>
+            <option>--set</option>
         </term>
         <listitem>
           <para>Sets the value of a preference key, and writes the value
-    to the user configuration source. Use the <literal>--type</literal> option
-    with the <literal>--set</literal> option to specify the data type of the value
+    to the user configuration source. Use the <option>--type</option> option
+    with the <option>--set</option> option to specify the data type of the value
     that you want to set. For example, the following command sets the value of
-    the <literal>/apps/gnome-terminal/profiles/Default/background_color</literal>
+    the <systemitem>/apps/gnome-terminal/profiles/Default/background_color</systemitem>
     key in the user configuration source:</para>
-          <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 \
+          <screen><userinput>gconftool-2 \
   --set "/apps/gnome-terminal/profiles/Default/background_color" \
-  --type string "#000000"</userinput></literallayout>
-          <para>You can also use the <literal>--direct</literal> option and the <literal>--config-source</literal> option
-    with the <literal>--set</literal> option to write a value to another configuration
+  --type string "#000000"</userinput></screen>
+          <para>You can also use the <option>--direct</option> option and the <option>--config-source</option> option
+    with the <option>--set</option> option to write a value to another configuration
     source.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--set-schema</literal>
+            <option>--set-schema</option>
         </term>
         <listitem>
           <para>Sets the value of an attribute
     in a schema key, and writes the value to the default configuration source.</para>
-          <para>Use the following options with the <literal>--set-schema</literal>
+          <para>Use the following options with the <option>--set-schema</option>
     option to specify the attribute that you want to update:</para>
           <itemizedlist>
             <listitem>
               <para>
-                <literal>--type</literal>
+                <option>--type</option>
               </para>
             </listitem>
             <listitem>
               <para>
-                <literal>--short-desc</literal>
+                <option>--short-desc</option>
               </para>
             </listitem>
             <listitem>
               <para>
-                <literal>--long-desc</literal>
+                <option>--long-desc</option>
               </para>
             </listitem>
             <listitem>
               <para>
-                <literal>--owner</literal>
+                <option>--owner</option>
               </para>
             </listitem>
           </itemizedlist>
           <para>For example, the following command sets the short description
-    in the schema key for the <literal>/apps/gnome-terminal/profiles/Default/background_color</literal> key:</para>
-          <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 \
+    in the schema key for the <systemitem>/apps/gnome-terminal/profiles/Default/background_color</systemitem> key:</para>
+          <screen><userinput>gconftool-2 \
   --set-schema  "/schemas/apps/gnome-terminal/profiles/Default/background_color" \
-  --short-desc "Default  background color of terminal"</userinput></literallayout>
+  --short-desc "Default  background color of terminal"</userinput></screen>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--short-desc=<replaceable>description</replaceable></literal>
+            <option>--short-desc=<replaceable>description</replaceable></option>
         </term>
         <listitem>
-          <para>Use this option with the <literal>--set-schema</literal>
+          <para>Use this option with the <option>--set-schema</option>
     option to specify a short description for a schema key. </para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--shutdown</literal>
+            <option>--shutdown</option>
         </term>
         <listitem>
           <para>Terminates the <application>GConf</application> daemon.</para>
@@ -722,7 +719,7 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--type=<replaceable>data-type</replaceable></literal>
+            <option>--type=<replaceable>data-type</replaceable></option>
         </term>
         <listitem>
           <para>Use this option to specify the data type when you set a
@@ -731,32 +728,32 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
           <itemizedlist>
             <listitem>
               <para>
-                <literal>bool</literal>
+                <type>bool</type>
               </para>
             </listitem>
             <listitem>
               <para>
-                <literal>float</literal>
+                <type>float</type>
               </para>
             </listitem>
             <listitem>
               <para>
-                <literal>int</literal>
+                <type>int</type>
               </para>
             </listitem>
             <listitem>
               <para>
-                <literal>list</literal>
+                <type>list</type>
               </para>
             </listitem>
             <listitem>
               <para>
-                <literal>pair</literal>
+                <type>pair</type>
               </para>
             </listitem>
             <listitem>
               <para>
-                <literal>string</literal>
+                <type>string</type>
               </para>
             </listitem>
           </itemizedlist>
@@ -764,7 +761,7 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--unset</literal>
+            <option>--unset</option>
         </term>
         <listitem>
           <para>Resets the value of a preference
@@ -773,7 +770,7 @@ please see <ulink url="man:gconftool-2(1)">man:gconftool-2(1)</ulink>.</para>
       </varlistentry>
       <varlistentry>
         <term>
-            <literal>--usage</literal>
+            <option>--usage</option>
         </term>
         <listitem>
           <para>Displays a brief help message
@@ -800,24 +797,24 @@ values or default preference values for users, you must ensure that the <applica
 are logged out before you change preference values for users.</para>
     <para>To set a mandatory value or a default value for a preference key, use
 the <command>gconftool-2</command> command, as follows:</para>
-    <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+    <screen><userinput>gconftool-2 --direct \
   --config-source <replaceable>configuration-source</replaceable> \
   --type <replaceable>data-type</replaceable> \
-  --set <replaceable>preference-key</replaceable> <replaceable>value</replaceable></userinput></literallayout>
+  --set <replaceable>preference-key</replaceable> <replaceable>value</replaceable></userinput></screen>
     <para>For example, to set <literal>wwwproxy.xyz.com</literal> as the mandatory
 HTTP proxy host, run the following command:</para>
-    <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+    <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory \
   --type string \
-  --set /system/http_proxy/host wwwproxy.xyz.com</userinput></literallayout>
+  --set /system/http_proxy/host wwwproxy.xyz.com</userinput></screen>
     <para>The user cannot override this preference value.</para>
     <para>You can also use the <command>gconftool-2</command> command to set default
 values. For example, to set the default number of workspaces to five, run
 the following command:</para>
-    <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+    <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
   --type int \
-  --set /apps/metacity/general/num_workspaces 5</userinput></literallayout>
+  --set /apps/metacity/general/num_workspaces 5</userinput></screen>
     <para>The user can override this preference value.</para>
     <caution>
       <para>Before you change mandatory preference values or default preference
@@ -840,25 +837,25 @@ to general preferences.</para>
 GConf</secondary>
       </indexterm>
       <para>To set HTTP proxy preferences, you modify
-the values of the preference keys in the <filename>/system/http_proxy/</filename>
+the values of the preference keys in the <systemitem>/system/http_proxy/</systemitem>
 location. For example, to set a mandatory value for the HTTP proxy host, run
 the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory \
   --type string \
-  --set /system/http_proxy/host <replaceable>proxy-name</replaceable></userinput></literallayout>
+  --set /system/http_proxy/host <replaceable>proxy-name</replaceable></userinput></screen>
       <para>To set a default value for the HTTP proxy host, run the following command: </para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
   --type string \
-  --set /system/http_proxy/host <replaceable>proxy-name</replaceable></userinput></literallayout>
+  --set /system/http_proxy/host <replaceable>proxy-name</replaceable></userinput></screen>
       <para>You can also set other HTTP proxy-related preferences. For information
 on the other HTTP proxy preferences, see the <filename>system_http_proxy.schemas</filename> schema definition file.</para>
     </sect2>
     <sect2 id="gconf-11">
       <title>To Set Print Manager Preferences</title>
       <para>To set print manager preferences, you modify the values of the preference
-keys in the <filename>/apps/gnome-print-manager</filename> location. For example,
+keys in the <systemitem>/apps/gnome-print-manager</systemitem> location. For example,
 if you do not want users to view the print jobs of other users, set a mandatory
 value as follows: </para>
       <indexterm>
@@ -870,15 +867,15 @@ value as follows: </para>
         <secondary>setting
 with GConf</secondary>
       </indexterm>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory \
   --type bool \
-  --set /apps/gnome-print-manager/show_all_jobs false</userinput></literallayout>
+  --set /apps/gnome-print-manager/show_all_jobs false</userinput></screen>
       <para>To set a default value for this preference, run the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
   --type bool \
-  --set /apps/gnome-print-manager/show_all_jobs false</userinput></literallayout>
+  --set /apps/gnome-print-manager/show_all_jobs false</userinput></screen>
       <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?-->
@@ -895,15 +892,15 @@ the other print manager preferences, see the <filename>gnome-print-manager.schem
       </indexterm>
       <para>To set a mandatory
 number of workspaces, use the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory \
   --type int \
-  --set /apps/metacity/general/num_workspaces <replaceable>integer</replaceable></userinput></literallayout>
+  --set /apps/metacity/general/num_workspaces <replaceable>integer</replaceable></userinput></screen>
       <para>To set a default number of workspaces, use the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
   --type int \
-  --set /apps/metacity/general/num_workspaces <replaceable>integer</replaceable></userinput></literallayout>
+  --set /apps/metacity/general/num_workspaces <replaceable>integer</replaceable></userinput></screen>
       <para>You can also set other window manager preferences. For information on
 the other window manager preferences, see the <filename>metacity.schemas</filename>
 schema definition file.</para>
@@ -919,18 +916,18 @@ schema definition file.</para>
         <secondary>setting accessibility preferences with GConf</secondary>
       </indexterm>
       <para>To set keyboard accessibility preferences, you modify the values of the preference
-keys in the <filename>/desktop/gnome/accessibility/keyboard</filename> location.
+keys in the <systemitem>/desktop/gnome/accessibility/keyboard</systemitem> location.
 For example, if you want to set a mandatory value so that keyboard accessibility
 features are enabled, run the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory \
   --type bool \
-  --set /desktop/gnome/accessibility/keyboard/enable true</userinput></literallayout>
+  --set /desktop/gnome/accessibility/keyboard/enable true</userinput></screen>
       <para>To set a default value for this preference, run the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
   --type bool \
-  --set /desktop/gnome/accessibility/keyboard/enable false</userinput></literallayout>
+  --set /desktop/gnome/accessibility/keyboard/enable false</userinput></screen>
       <para>You can also set other keyboard accessibility preferences. For information
 on the other keyboard accessibility preferences, see the <filename>desktop_gnome_accessibility_keyboard.schemas</filename> schema definition file.</para>
     </sect2>
@@ -945,14 +942,14 @@ on the other keyboard accessibility preferences, see the <filename>desktop_gnome
         <secondary>setting shortcut preferences with GConf</secondary>
       </indexterm>
       <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
+keyboard shortcut preferences, you modify the values of preference keys in <systemitem>/apps/metacity/global_keybindings</systemitem> 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 Application</guilabel> dialog. To set this
 mandatory value, run the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory \
   --type string \
-  --set /apps/metacity/global_keybindings '&lt;Alt&gt;F3'</userinput></literallayout>
+  --set /apps/metacity/global_keybindings '&lt;Alt&gt;F3'</userinput></screen>
       <para>You can also set other keyboard shortcut preferences. For information
 on the other keyboard shortcut preferences, see the <filename>metacity.schemas</filename> schema definition file.</para>
     </sect2>
@@ -994,7 +991,7 @@ 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
+way to set the values of panel preferences is to use the <command>gconftool-2</command> command with the <option>--dump</option> and <option>--load</option> 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>Specifying Individual Panels and Panel Objects</title>
@@ -1020,116 +1017,112 @@ number of panels, panel objects, and applets that appear in the GNOME Desktop:</
             <itemizedlist>
               <listitem>
                 <para>
-                  <literal>/apps/panel/default_setup/general/toplevel_id_list</literal>
+                  <systemitem>/apps/panel/default_setup/general/toplevel_id_list</systemitem>
                 </para>
               </listitem>
               <listitem>
                 <para>
-                  <literal>/apps/panel/default_setup/general/object_id_list</literal>
+                  <systemitem>/apps/panel/default_setup/general/object_id_list</systemitem>
                 </para>
               </listitem>
               <listitem>
                 <para>
-                  <literal>/apps/panel/default_setup/general/applet_id_list</literal>
+                  <systemitem>/apps/panel/default_setup/general/applet_id_list</systemitem>
                 </para>
               </listitem>
             </itemizedlist>
             <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;
-      &lt;value&gt;
-        &lt;list type=&quot;string&quot;&gt;
-          &lt;value&gt;
-            &lt;string&gt;bottom_panel&lt;/string&gt;
-          &lt;/value&gt;
-        &lt;/list&gt;
-      &lt;/value&gt;
-    &lt;/entry&gt;</literallayout>
-            <para>In the <filename>panel-default-setup.entries</filename> file, the identifier <literal>bottom_panel</literal> identifies the bottom edge panel.</para>
+            <programlisting><![CDATA[<entry>
+  <key>toplevel_id_list</key>
+  <schema_key>/schemas/apps/panel/general/toplevel_id_list</schema_key>
+  <value>
+    <list type="string">
+      <value>
+        <string>bottom_panel</string>
+      </value>
+    </list>
+  </value>
+</entry>]]></programlisting>
+            <para>In the <filename>panel-default-setup.entries</filename> file, the identifier <systemitem>bottom_panel</systemitem> identifies the bottom edge panel.</para>
           </listitem>
           <listitem>
             <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>
+            <para>For example, the key <systemitem>/apps/panel/default_setup/toplevels/bottom_panel/size</systemitem> specifies the size of the bottom panel. </para>
           </listitem>
           <listitem>
             <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;
-      &lt;schema_key&gt;/schemas/apps/panel/objects/object_type&lt;/schema_key&gt;
-      &lt;value&gt;
-        &lt;string&gt;menu-object&lt;/string&gt;
-      &lt;/value&gt;
-    &lt;/entry&gt;
-    &lt;entry&gt;
-      &lt;key&gt;toplevel_id&lt;/key&gt;
-      &lt;schema_key&gt;/schemas/apps/panel/objects/toplevel_id&lt;/schema_key&gt;
-      &lt;value&gt;
-        &lt;string&gt;bottom_panel&lt;/string&gt;
-      &lt;/value&gt;
-    &lt;/entry&gt;
-    &lt;entry&gt;
-      &lt;key&gt;position&lt;/key&gt;
-      &lt;schema_key&gt;/schemas/apps/panel/objects/position&lt;/schema_key&gt;
-      &lt;value&gt;
-        &lt;int&gt;0&lt;/int&gt;
-      &lt;/value&gt;
-    &lt;/entry&gt;
-.
-.
-.
-  &lt;/entrylist&gt;</literallayout>
+            <programlisting><![CDATA[<entrylist base="/apps/panel/default_setup/objects/main_menu">
+  <entry>
+    <key>object_type</key>
+    <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+    <value>
+      <string>menu-object</string>
+    </value>
+  </entry>
+  <entry>
+    <key>toplevel_id</key>
+    <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+    <value>
+      <string>bottom_panel</string>
+    </value>
+  </entry>
+  <entry>
+    <key>position</key>
+    <schema_key>/schemas/apps/panel/objects/position</schema_key>
+    <value>
+      <int>0</int>
+    </value>
+  </entry>
+  <!-- Possibly more entry elements -->
+</entrylist>]]></programlisting>
           </listitem>
           <listitem>
             <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;
-      &lt;key&gt;object_type&lt;/key&gt;
-      &lt;schema_key&gt;/schemas/apps/panel/objects/object_type&lt;/schema_key&gt;
-      &lt;value&gt;
-        &lt;string&gt;bonobo-applet&lt;/string&gt;
-      &lt;/value&gt;
-    &lt;/entry&gt;
-    &lt;entry&gt;
-      &lt;key&gt;toplevel_id&lt;/key&gt;
-      &lt;schema_key&gt;/schemas/apps/panel/objects/toplevel_id&lt;/schema_key&gt;
-      &lt;value&gt;
-        &lt;string&gt;bottom_panel&lt;/string&gt;
-      &lt;/value&gt;
-    &lt;/entry&gt;
-    &lt;entry&gt;
-      &lt;key&gt;position&lt;/key&gt;
-      &lt;schema_key&gt;/schemas/apps/panel/objects/position&lt;/schema_key&gt;
-      &lt;value&gt;
-        &lt;int&gt;2&lt;/int&gt;
-      &lt;/value&gt;
-    &lt;/entry&gt;
-.
-.
-.
-    &lt;entry&gt;
-      &lt;key&gt;bonobo_iid&lt;/key&gt;
-      &lt;schema_key&gt;/schemas/apps/panel/objects/bonobo_iid_type&lt;/schema_key&gt;
-      &lt;value&gt;
-        &lt;string&gt;OAFIID:GNOME_WindowListApplet&lt;/string&gt;
-      &lt;/value&gt;
-    &lt;/entry&gt;
-  &lt;/entrylist&gt;</literallayout>
+            <programlisting><![CDATA[<entrylist base="/apps/panel/default_setup/applets/window_list">
+  <entry>
+    <key>object_type</key>
+    <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+    <value>
+      <string>bonobo-applet</string>
+    </value>
+  </entry>
+  <entry>
+    <key>toplevel_id</key>
+    <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+    <value>
+      <string>bottom_panel</string>
+    </value>
+  </entry>
+  <entry>
+    <key>position</key>
+    <schema_key>/schemas/apps/panel/objects/position</schema_key>
+    <value>
+      <int>2</int>
+    </value>
+  </entry>
+  <!-- Possibly more entry elements -->
+  <entry>
+    <key>bonobo_iid</key>
+    <schema_key>/schemas/apps/panel/objects/bonobo_iid_type</schema_key>
+    <value>
+      <string>OAFIID:GNOME_WindowListApplet</string>
+    </value>
+  </entry>
+</entrylist>]]></programlisting>
             <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>
+            <programlisting><![CDATA[<oaf_server iid="OAFIID:GNOME_WindowListApplet" 
+type="factory" location="OAFIID:GNOME_Wncklet_Factory">]]></programlisting>
           </listitem>
         </orderedlist>
       </sect3>
@@ -1142,44 +1135,43 @@ the following steps:</para>
             <para>Log in to a GNOME session, and configure the panels as required.</para>
           </listitem>
           <listitem>
-            <para>Use the <literal>--dump</literal> option with the <literal>gconftool-2</literal> command line tool to generate a file that contains an
-XML description of your panel configuration. The <literal>--dump</literal>
+            <para>Use the <option>--dump</option> option with the <command>gconftool-2</command> command line tool to generate a file that contains an
+XML description of your panel configuration. The <option>--dump</option>
 option generates a list that contains all preference keys in a <application>GConf</application> repository directory that you specify. </para>
             <para>For example, the following command creates an XML description of the
 default panel configuration in a file called <filename>my-panel-setup.entries</filename>:</para>
-            <literallayout><computeroutput>#</computeroutput> <userinput
-               >gconftool-2 --dump /apps/panel &gt; my-panel-setup.entries</userinput></literallayout>
+            <screen><userinput>gconftool-2 --dump /apps/panel &gt; my-panel-setup.entries</userinput></screen>
           </listitem>
           <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
+files. The following is an excerpt from a file generated with the <option>--dump</option> option:</para>
+            <programlisting><![CDATA[<entry>
+  <key>objects/object_16/launcher_location</key>
+  <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
+  <value>
+    <string>hadjaha-00adce02f7.desktop</string>
+  </value>
+</entry>]]></programlisting>
+            <para>In the sample above, you might want to change the reference to <filename>hadjaha-00adce02f7.desktop</filename> to another desktop entry file that is
 available globally.</para>
-            <para>When you generate a panel configuration with the <literal>--dump</literal>
+            <para>When you generate a panel configuration with the <option>--dump</option>
 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. The object at the extreme left of a panel has a <systemitem>position</systemitem> value of <literal>0</literal>. The next object has a <systemitem>position</systemitem> 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>
+the <systemitem>right_stick</systemitem> 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
+            <para>Use the <option>--load</option> option with the <command>gconftool-2</command> command line tool to set the values of the default configuration
 source to the values in the <filename>my-panel-setup.entries</filename> file.
 For example, the following command sets the values of the keys in the default
 configuration source to the values of the corresponding keys in <filename>my-panel-setup.entries</filename>:</para>
-            <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+            <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
-  --load my-panel-setup.entries</userinput></literallayout>
+  --load my-panel-setup.entries</userinput></screen>
           </listitem>
         </orderedlist>
       </sect3>
@@ -1239,17 +1231,17 @@ Interface Component</para>
       </informaltable>
       <para>For example, to set <literal>Sans 12</literal> as the mandatory application
 font, run the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory \
   --type string \
-  --set /desktop/gnome/interface/font_name "Sans 12"</userinput></literallayout>
+  --set /desktop/gnome/interface/font_name "Sans 12"</userinput></screen>
       <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>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
   --type string \
-  --set /apps/nautilus/preferences/desktop_font "palatino 12"</userinput></literallayout>
+  --set /apps/nautilus/preferences/desktop_font "palatino 12"</userinput></screen>
     </sect2>
     <sect2 id="gconf-20">
       <title>To Set Background Preferences</title>
@@ -1263,17 +1255,17 @@ the default desktop object font, run the following command:</para>
 setting with GConf</secondary>
       </indexterm>
       <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
+desktop background, you modify the values of the preference keys in the <systemitem>/desktop/gnome/background</systemitem> location. For example, to set a mandatory
 image for the background, run the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory \
   --type string \
-  --set /desktop/gnome/background/picture_filename <replaceable>filename.png</replaceable></userinput></literallayout>
+  --set /desktop/gnome/background/picture_filename <replaceable>filename.png</replaceable></userinput></screen>
       <para>To set a default value for this preference, run the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><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></literallayout>
+  --set /desktop/gnome/background/picture_filename <replaceable>filename.png</replaceable></userinput></screen>
       <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>
@@ -1289,17 +1281,17 @@ other background preferences, see the <filename>desktop_gnome_background.schemas
 with GConf</secondary>
       </indexterm>
       <para>To set splash image preferences, you
-modify the value of the preference keys in the <filename>/apps/gnome-session/options/</filename> location. For example, if you do not want users ever to see a
+modify the value of the preference keys in the <systemitem>/apps/gnome-session/options/</systemitem> location. For example, if you do not want users ever to see a
 splash image, set a mandatory value as follows:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory \
   --type bool \
-  --set /apps/gnome-session/options/show_splash_screen false</userinput></literallayout>
+  --set /apps/gnome-session/options/show_splash_screen false</userinput></screen>
       <para>To set a default value for this preference, run the following command:</para>
-      <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+      <screen><userinput>gconftool-2 --direct \
   --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
   --type bool \
-  --set /apps/gnome-session/options/show_splash_screen false</userinput></literallayout>
+  --set /apps/gnome-session/options/show_splash_screen false</userinput></screen>
       <para>You can also set other splash image preferences. For information on
 the other splash image preferences, see the <filename>gnome-session.schemas</filename> schema definition file.</para>
     </sect2>
@@ -1317,9 +1309,9 @@ values</secondary>
     </indexterm>
     <para>To
 restore the default preference values for a user, run the following command:</para>
-    <literallayout><computeroutput>#</computeroutput> <userinput>gconftool-2 --direct \
+    <screen><userinput>gconftool-2 --direct \
   --config-source <replaceable>user-configuration-source</replaceable> \
-  --recursive-unset</userinput></literallayout>
+  --recursive-unset</userinput></screen>
     <para>Replace <replaceable>user-configuration-source</replaceable> with the
 configuration source in the <filename>.gconf</filename> directory in the home
 directory of the user. </para>