Added more info about screenshots, and fixed keycombos to use docbook

2006-08-22  Francisco Javier F. Serrador  <serrador@openshine.com>

	* gostools.xml: Added more info about screenshots, and fixed
	keycombos to use docbook correctly.

2 files changed, 123 insertions, 63 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 3c64873..7bee4f9 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-22  Francisco Javier F. Serrador  <serrador@openshine.com>
+
+	* gostools.xml: Added some documentation about gnome-screenshot
+	options, and recoded keycombos using docbook tags.
+
 2006-08-11 Joachim Noreiko <jnoreiko@yahoo.com>
 
   * gosnautilus.xml: fixed a typo. Fixes #350755
diff --git a/gnome2-user-guide/C/gostools.xml b/gnome2-user-guide/C/gostools.xml
index 5b1c5e7..a47b36e 100644
--- a/gnome2-user-guide/C/gostools.xml
+++ b/gnome2-user-guide/C/gostools.xml
@@ -1,47 +1,64 @@
 <!-- -*- indent-tabs-mode: nil -*- -->
 <chapter id="tools">
-<title>Tools and Utilities</title>
-
-<highlights>
-  <para>This section describes some of the tools and utilities in the GNOME Desktop.</para>
-</highlights>
-
-<section id="tools-run-app">
-  <title>Running Applications</title>
-  <!-- preserve id for backwards compatibility: 2.12 -->
-  <anchor id="gospanel-23"/>
-  <indexterm>
-    <primary>Run Application dialog, using</primary>
-  </indexterm>
-  <para>The <guilabel>Run Application</guilabel> dialog gives you access to the command
-line. When you run a command in the <guilabel>Run Application</guilabel> dialog,
-you cannot receive output from the command.</para>
-  <para>To run a command from the command line perform the following steps:</para>
-  <orderedlist>
-    <listitem>
-      <para>Display the <guilabel>Run Application</guilabel> dialog. You
-can display the <guilabel>Run Application</guilabel> dialog in any of the
-following ways:
+  <title>Tools and Utilities</title>
+
+  <highlights>
+    <para>This section describes some of the tools and utilities in the GNOME Desktop.</para>
+  </highlights>
+
+  <section id="tools-run-app">
+    <title>Running Applications</title>
+    <!-- preserve id for backwards compatibility: 2.12 -->
+    <anchor id="gospanel-23"/>
+    <indexterm>
+      <primary>Run Application dialog, using</primary>
+    </indexterm>
+    <para>
+      The <guilabel>Run Application</guilabel> dialog gives you access to the command
+      line. When you run a command in the <guilabel>Run Application</guilabel> dialog,
+      you cannot receive output from the command.
+    </para>
+    <para>
+    To run a command from the command line perform the following steps:</para>
+    <orderedlist>
+      <listitem>
+        <para>Display the <guilabel>Run Application</guilabel> dialog. You
+        can display the <guilabel>Run Application</guilabel> dialog in any of the
+        following ways:
         <variablelist>
           <varlistentry><term>From a panel</term>
-          <listitem><para>You can add the <application>Run Application</application> object to any panel. See <xref linkend="panels-addobject"/>. Click on the <guibutton>Run</guibutton> button to open the <guilabel>Run Application</guilabel> dialog.</para></listitem></varlistentry>
+          <listitem><para>You can add the <application>Run Application</application> object to any 
+          panel. See <xref linkend="panels-addobject"/>. Click on the <guibutton>Run</guibutton> 
+          button to open the <guilabel>Run Application</guilabel> dialog.</para></listitem></varlistentry>
           <varlistentry><term>Using shortcut keys</term>
-          <listitem><para>Press <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>. You can change the shortcut keys that display the <guilabel>Run Application</guilabel> dialog
-in the <link linkend="prefs-keyboard-shortcuts"><application>Keyboard Shortcuts</application> preference tool</link>.</para></listitem></varlistentry>
+          <listitem>
+            <para>
+              Press <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>. You can change 
+              the shortcut keys that display the <guilabel>Run Application</guilabel> dialog
+              in the <link linkend="prefs-keyboard-shortcuts"><application>Keyboard Shortcuts</application> 
+            preference tool</link>.</para>
+          </listitem>
+          </varlistentry>
         </variablelist>
       </para>
       <para>The <guilabel>Run Application</guilabel> dialog is displayed.</para>
     </listitem>
     <listitem>
-      <para>Enter the command that you want to run in the blank field. </para>
-      <para>Alternatively, to choose  a command that you ran previously, click the
-down arrow button beside the command field, then choose the command to run.</para>
-      <para>Alternatively, select the <guilabel>Show list of known applications</guilabel> option to display a list of available applications.</para>
+      <para>Enter the command that you want to run in the blank field.</para>
+      <para>
+        Alternatively, to choose  a command that you ran previously, click the
+        down arrow button beside the command field, then choose the command to run.
+      </para>
+      <para>
+      Alternatively, select the <guilabel>Show list of known applications</guilabel> 
+      option to display a list of available applications.</para>
       <para>You can also use the <guibutton>Run with file</guibutton> button to
-choose a file to append to the command line. For example, you can enter <application>emacs</application> as the command, then choose a file to edit.</para>
+      choose a file to append to the command line. For example, you can enter 
+      <application>emacs</application> as the command, then choose a file to edit.
+      </para>
       <para>Select the <guilabel>Run in terminal</guilabel> option to run the application
-or command in a terminal window. Choose this option for an application or
-command that does not create a window in which to run.</para>
+      or command in a terminal window. Choose this option for an application or
+      command that does not create a window in which to run.</para>
     </listitem>
     <listitem>
       <para>Click on the <guibutton>Run</guibutton> button on the <guilabel>Run Application</guilabel> dialog. </para>
@@ -88,8 +105,7 @@ a screenshot of the entire screen.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Takes a screenshot of the entire
-screen.</para>
+                <para>Takes a screenshot of the entire screen.</para>
               </entry>
             </row>
             <row>
@@ -103,21 +119,26 @@ screen.</para>
           </tbody>
         </tgroup>
       </informaltable>
-      <para>You can use the <link linkend="prefs-keyboard-shortcuts"><application>Keyboard Shortcuts</application> preference
-tool</link> to modify the default shortcut keys.</para>
+      <para>You can use the <link linkend="prefs-keyboard-shortcuts"><application>Keyboard Shortcuts</application> 
+      preference tool</link> to modify the default shortcut keys.</para>
     </listitem>
     <listitem>
       <para>From the Menubar</para>
-      <para>Choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Accessories</guimenuitem><guimenuitem>Take Screenshot</guimenuitem></menuchoice>.</para>
+      <para>Choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Accessories</guimenuitem>
+      <guimenuitem>Take Screenshot</guimenuitem></menuchoice>.</para>
     </listitem>
     <listitem>
       <para>From the Terminal</para>
-      <para>You can use the <command>gnome-panel-screenshot</command> command to
-take a screenshot. The <command>gnome-panel-screenshot</command> command takes
-a screenshot of the entire screen, and displays the <guilabel>Save Screenshot</guilabel> dialog. Use the <guilabel>Save Screenshot</guilabel> dialog to
-save the screenshot.</para>
-      <para>You can also use options on the <command>gnome-panel-screenshot</command>
-command as follows: </para>
+      <para>
+        You can use the <command>gnome-screenshot</command> command to
+        take a screenshot. The <command>gnome-screenshot</command> command takes
+        a screenshot of the entire screen, and displays the <guilabel>Save Screenshot</guilabel> 
+        dialog. Use the <guilabel>Save Screenshot</guilabel> dialog to save the screenshot.
+      </para>
+      <para>
+        You can also use options on the <command>gnome-screenshot</command> command 
+        as follows: 
+      </para>
       <informaltable frame="topbot">
         <tgroup cols="2" colsep="0" rowsep="0">
           <colspec colname="colspec0" colwidth="35.67*"/>
@@ -140,8 +161,7 @@ command as follows: </para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Takes a screenshot of the window
-that has focus.</para>
+                <para>Takes a screenshot of the window that has focus.</para>
               </entry>
             </row>
             <row>
@@ -151,19 +171,52 @@ that has focus.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Takes a screenshot after the specified number of seconds, and displays the <guilabel>Save Screenshot</guilabel> dialog. Use the <guilabel>Save Screenshot</guilabel>
-dialog to save the screenshot.</para>
+                <para>
+                  Takes a screenshot after the specified number of seconds, 
+                and displays the <guilabel>Save Screenshot</guilabel> dialog. 
+                Use the <guilabel>Save Screenshot</guilabel> dialog to save 
+                the screenshot.
+                </para>
               </entry>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
                 <para>
+                  <command>--include-border</command>
+                </para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Takes a screenshot including the border of the screen.</para>
+              </entry>
+            </row>                                  
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <command>--border-effect=<replaceable>shadow</replaceable></command>
+                </para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Takes a screenshot adding and adds a shadow bevel arround it.</para>
+              </entry>
+            </row>                                  
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <command>--border-effect=<replaceable>border</replaceable></command>
+                </para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Takes a screenshot adding and adds a border effect arround it.</para>
+              </entry>
+            </row>                                  
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
                   <command>--help</command>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Displays the options for the
-command.</para>
+                <para>Displays the options for the command.</para>
               </entry>
             </row>
           </tbody>
@@ -172,7 +225,11 @@ command.</para>
     </listitem>
   </itemizedlist>
 
-  <para>When you take a screenshot, the <guilabel>Save Screenshot</guilabel> dialog opens. To save the screenshot as an image file, enter the filename for the screenshot and choose a location from the drop-down list.</para>
+  <para>
+  When you take a screenshot, the <guilabel>Save Screenshot</guilabel> dialog 
+  opens. To save the screenshot as an image file, enter the filename for the 
+  screenshot and choose a location from the drop-down list.
+  </para>
   
 </section>
 
@@ -347,8 +404,7 @@ command.</para>
 
                   <listitem>
                     <para>Use this button to return to the main table of
-                    contents (shown in <xref
-                    linkend="fig-yelp-window" />)</para>
+                    contents (shown in <xref linkend="fig-yelp-window" />)</para>
                   </listitem>
                 </varlistentry>
               </variablelist></para>
@@ -400,7 +456,7 @@ command.</para>
 
           <listitem>
             <para>Use the key combination
-            <keycap>Ctrl</keycap>+<keycap>N</keycap></para>
+            <keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo></para>
           </listitem>
         </itemizedlist></para>
     </section>
@@ -476,7 +532,7 @@ command.</para>
 
           <listitem>
             <para>Use the key combination
-            <keycap>Ctrl</keycap>+<keycap>W</keycap></para>
+            <keycombo><keycap>Ctrl</keycap><keycap>W</keycap></keycombo></para>
           </listitem>
         </itemizedlist></para>
     </section>
@@ -575,7 +631,7 @@ command.</para>
 
           <listitem>
             <para>Use the key combination
-            <keycap>Alt</keycap>+<keycap>Left</keycap></para>
+            <keycombo><keycap>Alt</keycap><keycap>Left</keycap></keycombo></para>
           </listitem>
 
           <listitem>
@@ -601,7 +657,7 @@ command.</para>
 
           <listitem>
             <para>Use the key combination
-            <keycap>Alt</keycap>+<keycap>Right</keycap></para>
+            <keycombo><keycap>Alt</keycap><keycap>Right</keycap></keycombo></para>
           </listitem>
 
           <listitem>
@@ -627,7 +683,7 @@ command.</para>
 
           <listitem>
             <para>Use the key combination
-            <keycap>Alt</keycap>+<keycap>Home</keycap></para>
+            <keycombo><keycap>Alt</keycap><keycap>Home</keycap></keycombo></para>
           </listitem>
 
           <listitem>
@@ -653,7 +709,7 @@ command.</para>
 
           <listitem>
             <para>Use the key combination
-            <keycap>Alt</keycap>+<keycap>Up</keycap></para>
+            <keycombo><keycap>Alt</keycap><keycap>Up</keycap></keycombo></para>
           </listitem>
         </itemizedlist><note>
           <para>This option is only available in DocBook formatted
@@ -677,7 +733,7 @@ command.</para>
 
           <listitem>
             <para>Use the key combination
-            <keycap>Alt</keycap>+<keycap>Down</keycap></para>
+            <keycombo><keycap>Alt</keycap><keycap>Down</keycap></keycombo></para>
           </listitem>
         </itemizedlist><note>
           <para>This option is only available in DocBook formatted
@@ -720,7 +776,7 @@ command.</para>
 
           <listitem>
             <para>Use the key combination
-            <keycap>Ctrl</keycap>+<keycap>D</keycap></para>
+            <keycombo><keycap>Ctrl</keycap><keycap>D</keycap></keycombo></para>
           </listitem>
         </itemizedlist>A window will appear that looks like <xref
       linkend="yelp-add-bookmark" />.</para>
@@ -742,20 +798,19 @@ command.</para>
     <section>
       <title>Edit Bookmarks</title>
 
-      <para>To edit your collection of bookmarkst:</para>
+      <para>To edit your collection of bookmarks:</para>
 
       <para><itemizedlist>
           <listitem>
             <para>Click <menuchoice>
                 <guimenu>Bookmarks</guimenu>
-
                 <guimenuitem>Edit Bookmarks...</guimenuitem>
               </menuchoice></para>
           </listitem>
 
           <listitem>
             <para>Use the key combination
-            <keycap>Ctrl</keycap>+<keycap>B</keycap></para>
+            <keycombo><keycap>Ctrl</keycap><keycap>B</keycap></keycombo></para>
           </listitem>
         </itemizedlist>A window will appear that looks like <xref
       linkend="yelp-edit-bookmarks" />.</para>