Updated Preferred applications section. Fixes #413452.

2009-02-12  Claude Paroz  <claude@2xlibre.net>

	* goscustdesk.xml: Updated Preferred applications section.
	Fixes #413452.

svn path=/trunk/; revision=1082

2 files changed, 40 insertions, 189 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index cc00712..fcf524f 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-12  Claude Paroz  <claude@2xlibre.net>
+
+	* goscustdesk.xml: Updated Preferred applications section.
+	Fixes #413452.
+
 2008-11-16  Claude Paroz  <claude@2xlibre.net>
 
 	* glossary.xml: Replaced 'CD Player' by 'Volume Control' in example.
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 694a11c..914be5f 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -630,47 +630,50 @@ keys that provides an alternative to standard ways of performing an action. For
     <para>Use the <application>Preferred
 Applications</application> preference tool to specify the applications that
 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>
+for you. For example, you can specify the web browser application (<application>Epiphany
+</application>, <application>Mozilla Firefox</application>, <application>Opera</application>
+...) to launch when you click on a link in other applications such as 
+email clients or document viewers.</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>
         <para>
-          <guilabel>Web Browser</guilabel>
+          <guilabel>Internet</guilabel> (Web, Mail)
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <guilabel>Multimedia</guilabel> (Multimedia Player)
         </para>
       </listitem>
       <listitem>
         <para>
-          <guilabel>Mail Reader</guilabel>
+          <guilabel>System</guilabel> (Terminal)
         </para>
       </listitem>
       <listitem>
         <para>
-          <guilabel>Terminal</guilabel>
+          <guilabel>Accessibility</guilabel> (Visual, Mobility)
         </para>
       </listitem>
     </itemizedlist>
+    
+    <para>For each preferred application category, a drop-down menu contains a list of possible applications you can choose from. The list depends on the applications installed on your computer.</para>
+    <para>In each category, the last item in the menu (<guimenuitem>Custom</guimenuitem>) permits you to customize the command used by the system when the specific launch action occurs.</para>
+    
     <sect3 id="goscustlookandfeel-32">
-      <title>Web Browser Preferences</title>
+      <title>Custom Command Options</title>
       <indexterm>
         <primary>preferred applications</primary>
-        <secondary>web browser</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>web browser, preferred application</primary>
+        <secondary>custom command</secondary>
       </indexterm>
-      <para>Use the <application>Web Browser</application>
-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>
-      <para><xref linkend="goscustlookandfeel-TBL-37"/> lists the preferred web browser
-preferences that you can modify.</para>
+      <para>The following table summarizes the various options you can choose from when you select
+<guimenuitem>Custom</guimenuitem> in the drop-down application menu.</para>
       <table frame="topbot" id="goscustlookandfeel-TBL-37">
-        <title>Preferred Web Browser Preferences</title>
+        <title>Custom command options</title>
         <tgroup cols="2" colsep="1" rowsep="1">
           <colspec colname="colspec0" colwidth="18.86*"/>
           <colspec colname="colspec1" colwidth="47.14*"/>
@@ -688,204 +691,47 @@ preferences that you can modify.</para>
             <row>
               <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Select a Web Browser</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option if you want to use a standard
-web browser. Use the drop-down combination box to select your preferred web
-browser.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-                <para>
-                  <guilabel>Custom Web Browser</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option if you want to use a custom
-web browser. </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-                <para>
                   <guilabel>Command</guilabel>
                 </para>
               </entry>
               <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Enter the command to execute to start the custom web browser.
-To enable the browser to display a URL that you click on, include <command>"%s"</command> after the command.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-                <para>
-                  <guilabel>Start in Terminal</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option to run the command in a terminal
-window. Select this option for a browser that does not create a window in
-which to run.</para>
+                <para>Enter the command to execute to start the custom application. For the <application>Web
+Browser</application> and the <application>Mail Reader</application> applications, you can include a <literal>%s</literal>
+after the command to tell the application to use the URL or Email address you clicked on. The exact command arguments
+may depend on the specific application.</para>
               </entry>
             </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect3>
-    <sect3 id="goscustlookandfeel-42">
-      <title>Email Client Preferences</title>
-      <indexterm>
-        <primary>preferred applications</primary>
-        <secondary>email client</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>email client, preferred application</primary>
-      </indexterm>
-      <para>Use the <application>Mail Reader</application>
-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">
-        <title>Preferred Email Client 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 a Mail Reader</guilabel>
+                  <guilabel>Run in terminal</guilabel>
                 </para>
               </entry>
               <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option if you want to use a standard
-email client. Use the drop-down combination box to select your preferred email
-client.</para>
+                <para>Select this option to run the command in a terminal window. Select this option for an
+ application that does not create a window in which to run.</para>
               </entry>
             </row>
             <row>
               <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Custom Mail Reader</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option if you want to use a custom
-email client. </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-                <para>
-                  <guilabel>Command</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Enter the command to execute to start the custom email
-client.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-                <para>
-                  <guilabel>Start in Terminal</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option to run the command in a terminal
-window. Select this option for an email client that does not create a window
-in which to run.</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect3>
-    <sect3 id="goscustlookandfeel-34">
-      <title>Terminal Preferences</title>
-      <indexterm>
-        <primary>preferred applications</primary>
-        <secondary>terminal</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>terminal, preferred application</primary>
-      </indexterm>
-      <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">
-        <title>Preferred Terminal 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 a Terminal</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option if you want to use a standard
-terminal. Use the drop-down combination box to specify your preferred terminal.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-                <para>
-                  <guilabel>Custom Terminal</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option if you want to use a custom
-terminal. </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-                <para>
-                  <guilabel>Command</guilabel>
+                  <guilabel>Execute flag (Terminal only)</guilabel>
                 </para>
               </entry>
               <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Enter the command to execute to start the custom terminal.</para>
+                <para>Most terminal applications have an option that cause them to treat the remaining command line options as
+commands to run (<option>-x</option> for <application>gnome-terminal</application>).  Enter this option here.
+ For example, this is used when executing a command of a launcher for which the chosen type is Application in Terminal.</para>
               </entry>
             </row>
             <row>
               <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Exec Flag</guilabel>
+                  <guilabel>Run at start (Accessibility only)</guilabel>
                 </para>
               </entry>
               <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Enter the <command>exec</command> option to use with the
-command.</para>
+                <para>Select this option to run the command as soon as your session begins. For more accessibility options, see <ulink type="help" url="ghelp:gnome-access-guide?index"><citetitle>GNOME Desktop Accessibility Guide</citetitle></ulink>.</para>
               </entry>
             </row>
           </tbody>