Updated Preferred Applications section. Patch by Benjamin Gramlich

2007-09-01  Claude Paroz  <claude@2xlibre.net>

	* goscustdesk.xml: Updated Preferred Applications section. Patch by
	Benjamin Gramlich <benjamin.gramlich@gmail.com>. Fixes #353085.

svn path=/trunk/; revision=739

3 files changed, 21 insertions, 104 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1583147..496e5be 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3,4 +3,7 @@ gnome-doc-list@gnome.org
 http://mail.gnome.org/archives/gnome-doc-list/
 
 Primary Maintainer:
-Shaun McCance  <shaunm@gnome.org>
+
+Shaun McCance
+E-mail: shaunm@gnome.org
+Userid: shaunm
diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 48e68d6..a433a44 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,9 +1,14 @@
+2007-09-01  Claude Paroz  <claude@2xlibre.net>
+
+	* goscustdesk.xml: Updated Preferred Applications section. Patch by
+	Benjamin Gramlich <benjamin.gramlich@gmail.com>. Fixes #353085.
+
 2007-03-11  Joachim Noreiko  <jnoreiko@yahoo.com>
 
-  * goscustdesk.xml: partly reversing changes from #398902: new Control Center
-      is held back. Keeping subcategories.
-  * gospanel.xml: updated explanation for locking to panel. #416415
-      
+	* goscustdesk.xml: partly reversing changes from #398902: new Control Center
+	is held back. Keeping subcategories.
+	* gospanel.xml: updated explanation for locking to panel. #416415
+
 2007-03-09  Joachim Noreiko  <jnoreiko@yahoo.com>
 
 	* gospanel.xml: reverted updated ids -- see #415887 for reasons.
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 1484848..ab36fd8 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -636,6 +636,8 @@ you want the GNOME Desktop to use when the GNOME Desktop starts an application
 for you. For example, you can specify <application>Xterm</application> as
 your preferred terminal application. When you open the <guimenu>System</guimenu>
 menu then choose <guimenuitem>Open Terminal</guimenuitem>, <application>Xterm</application> starts.</para>
+	<para> <application>Preferred Applications</application> can be found by going to
+<menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>Preferred Applications</guimenuitem><menuchoice>.</para>
     <para>You can customize the preferences for the <application>Preferred Applications</application> preference tool in the following functional areas.</para>
     <itemizedlist>
       <listitem>
@@ -650,11 +652,6 @@ menu then choose <guimenuitem>Open Terminal</guimenuitem>, <application>Xterm</a
       </listitem>
       <listitem>
         <para>
-          <guilabel>Text Editor</guilabel>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           <guilabel>Terminal</guilabel>
         </para>
       </listitem>
@@ -669,7 +666,7 @@ menu then choose <guimenuitem>Open Terminal</guimenuitem>, <application>Xterm</a
         <primary>web browser, preferred application</primary>
       </indexterm>
       <para>Use the <application>Web Browser</application>
-tabbed section to configure your preferred web browser. The preferred web
+section under the <guilabel>Internet</guilabel> tab to select your preferred web browser. The preferred web
 browser opens when you click on a URL. For example, the preferred web browser
 opens when you select a URL in an application, or when you select a URL launcher
 on the desktop.</para>
@@ -751,7 +748,9 @@ which to run.</para>
         <primary>email client, preferred application</primary>
       </indexterm>
       <para>Use the <application>Mail Reader</application>
-tabbed section to configure your preferred email client. </para>
+section under the <guilabel>Internet</guilabel> tab to configure your preferred email client.  
+The email client selected here will be opened when you click on an email address link in a document 
+or web browser.</para>
       <para><xref linkend="goscustlookandfeel-TBL-43"/> lists the preferred email
 client preferences that you can modify.</para>
       <table frame="topbot" id="goscustlookandfeel-TBL-43">
@@ -820,96 +819,6 @@ in which to run.</para>
         </tgroup>
       </table>
     </sect3>
-    <sect3 id="goscustlookandfeel-31">
-      <title>Text Editor Preferences</title>
-      <indexterm>
-        <primary>preferred applications</primary>
-        <secondary>text editor</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>text editor, preferred application</primary>
-      </indexterm>
-      <para>Use the <application>Text Editor</application>
-tabbed section to configure your preferred text editor.</para>
-      <para><xref linkend="goscustdoc-TBL-1"/> lists the preferred text editor preferences
-that you can modify.</para>
-      <table frame="topbot" id="goscustdoc-TBL-1">
-        <title>Preferred Text Editor Preferences</title>
-        <tgroup cols="2" colsep="1" rowsep="1">
-          <colspec colname="colspec0" colwidth="18.86*"/>
-          <colspec colname="colspec1" colwidth="47.14*"/>
-          <thead>
-            <row>
-              <entry colsep="0" rowsep="1">
-                <para>Dialog Element</para>
-              </entry>
-              <entry colsep="0" rowsep="1">
-                <para>Description</para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-                <para>
-                  <guilabel>Select an Editor</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option if you want to use a standard
-text editor. Use the drop-down combination box to specify your preferred text
-editor.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-                <para>
-                  <guilabel>Custom Editor</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option if you want to use a custom
-text editor. A <guilabel>Custom Editor Properties</guilabel> dialog is displayed.</para>
-                <itemizedlist>
-                  <listitem>
-                    <para><guilabel>Name</guilabel>: Type the name of the custom text
-editor.</para>
-                  </listitem>
-                  <listitem>
-                    <para><guilabel>Command</guilabel>: Enter the command to start the
-custom text editor.</para>
-                  </listitem>
-                  <listitem>
-                    <para><guilabel>This application can open multiple files</guilabel>:
-Select this option if the default text editor can open multiple files.</para>
-                  </listitem>
-                  <listitem>
-                    <para><guilabel>This application needs to be run in a shell</guilabel>:
-Select this option to run the command in a terminal window. Select this option
-for an editor that does not create a window in which to run.</para>
-                  </listitem>
-                </itemizedlist>
-                <para>After you specify a custom text editor, you can click
-on the <guibutton>Properties</guibutton> button to display the <guilabel>Custom Editor Properties</guilabel> dialog. You can use the dialog to modify
-the properties of the custom text editor.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-                <para>
-                  <guilabel>Use this editor to open text files in the file manager</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select
-this option if you want the file manager to start the custom text editor to
-display text files.</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect3>
     <sect3 id="goscustlookandfeel-34">
       <title>Terminal Preferences</title>
       <indexterm>
@@ -919,8 +828,8 @@ display text files.</para>
       <indexterm>
         <primary>terminal, preferred application</primary>
       </indexterm>
-      <para>Use the <application>Terminal</application> tabbed section
-to configure your preferred terminal.</para>
+      <para>Use the <guilabel>Terminal Emulator</guilabel> section under the 
+<guilabel>System</guilabel> tab to configure your preferred terminal.</para>
       <para><xref linkend="goscustlookandfeel-TBL-35"/> lists the preferred terminal
 preferences that you can modify.</para>
       <table frame="topbot" id="goscustlookandfeel-TBL-35">