desktop-user-guide/FC-6/en_US Communications.xml, 1.11, 1.12 Customizing.xml, 1.6, 1.7 Games.xml, 1.6, 1.7 Introduction.xml, 1.6, 1.7 Login.xml, 1.6, 1.7 Media.xml, 1.6, 1.7 Multimedia.xml, 1.6, 1.7 Office.xml, 1.6, 1.7 Photos.xml, 1.6, 1.7 SharingDesktop.xml, 1.6, 1.7 Tour.xml, 1.6, 1.7 Web.xml, 1.6, 1.7 desktop-user-guide.xml, 1.5, 1.6

Bart Couvreur (couf) fedora-docs-commits at redhat.com
Mon Feb 26 14:47:14 UTC 2007


Author: couf

Update of /cvs/docs/desktop-user-guide/FC-6/en_US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15425

Modified Files:
	Communications.xml Customizing.xml Games.xml Introduction.xml 
	Login.xml Media.xml Multimedia.xml Office.xml Photos.xml 
	SharingDesktop.xml Tour.xml Web.xml desktop-user-guide.xml 
Log Message:
Finalized admonitions and figures in DocBook


Index: Communications.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Communications.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Communications.xml	25 Feb 2007 17:38:39 -0000	1.11
+++ Communications.xml	26 Feb 2007 14:47:12 -0000	1.12
@@ -45,14 +45,10 @@
     this command tells emacs to look the container type, e.g. <para>,
     and indent according to where it is in its parent containers, that
     is, its nesting.-->
-  <section>
+  <section id="sn-setup-email">
     <title>Setting Up Your Email</title>
 
     <para>
-      <anchor id='setup_email'/>
-    </para>
-
-    <para>
       This information is specific to using
       <emphasis role='strong'>Evolution</emphasis> on Fedora. Additional
       documentation for <emphasis role='strong'>Evolution</emphasis> is
@@ -73,7 +69,7 @@
       <title>E-mail Icon</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/redhat-email.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/redhat-email-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>E-mail Icon</phrase>
@@ -104,7 +100,7 @@
       <title>Identity screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/evol_setup_2a-6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/evol_setup_2a-6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Identity screen</phrase>
@@ -136,7 +132,7 @@
       <title>Server type selection</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/evol_setup_3-6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/evol_setup_3-6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Server type selection</phrase>
@@ -155,7 +151,7 @@
       <title>Recieving Email Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/evol_setup_4-6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/evol_setup_4-6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Recieving Email Screen</phrase>
@@ -175,7 +171,7 @@
       <title>Recieving Options Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/evol_setup_5-6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/evol_setup_5-6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Recieving Options Screen</phrase>
@@ -196,7 +192,7 @@
       <title>Sending Email Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/evol_setup_7-6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/evol_setup_7-6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Sending Email Screen</phrase>
@@ -212,7 +208,7 @@
       <title>Sending Email Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/evol_setup_8-6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/evol_setup_8-6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Sending Email Screen</phrase>
@@ -229,7 +225,7 @@
       <title>Account Management Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/evol_setup_9-6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/evol_setup_9-6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Account Management Screen</phrase>
@@ -243,7 +239,7 @@
       <title>Timezone Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/evol_setup_10-6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/evol_setup_10-6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Timezone screen</phrase>
@@ -260,7 +256,7 @@
       <title>Finished Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/evol_setup_11-6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/evol_setup_11-6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Finished Screen</phrase>
@@ -275,7 +271,7 @@
       <title>Evolution Main Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/evol_setup_12-6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/evol_setup_12-6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Evolution Main Screen</phrase>
@@ -283,14 +279,10 @@
       </mediaobject>
     </figure>
   </section>
-  <section>
+  <section id="sn-setup-messaging">
     <title>Setting up Instant Messaging</title>
 
     <para>
-      <anchor id='setup-messaging'/>
-    </para>
-
-    <para>
       This section is specific for
       <emphasis role='strong'>Gaim</emphasis> in Fedora. For further
       information and documentation on
@@ -312,7 +304,7 @@
       <title>Gaim Accounts Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/Gaim_accounts_1.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_1-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Gaim Accounts Screen</phrase>
@@ -327,7 +319,7 @@
       <title>Gaim Add Account Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/Gaim_accounts_2.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_2-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Gaim Add Account Screen</phrase>
@@ -345,7 +337,7 @@
       <title>Gaim Add Account Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/Gaim_accounts_3.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_3-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Gaim Add Account Screen</phrase>
@@ -364,7 +356,7 @@
       <title>Gaim Add Account Screen</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/Gaim_accounts_4.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_4-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Gaim Add Account Screen</phrase>
@@ -379,7 +371,7 @@
       <title>Gaim Accounts List</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/Gaim_accounts_5.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_5-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Gaim Accounts List</phrase>
@@ -392,14 +384,10 @@
       this procedure for each account to be added.
     </para>
   </section>
-  <section>
+  <section id="sn-using-gaim">
     <title>Using Gaim</title>
 
     <para>
-      <anchor id='using-gaim'/>
-    </para>
-
-    <para>
       Select one of the enabled accounts to see the <emphasis>Buddy
       List</emphasis> window. In this window, menus allow the user to
       add additional IM contacts.
@@ -408,7 +396,7 @@
       <title>Gaim Buddylist</title>
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="./figs/Gaim_accounts_6.png" format="PNG"/>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_6-en_US.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Gaim Buddylist</phrase>


Index: Customizing.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Customizing.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Customizing.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ Customizing.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,12 +9,7 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/Customizing</title>
-  </articleinfo>
-
-  <section>
+<chapter id="ch-Customizing">
     <title>Customizing the Desktop</title>
 
     <para>
@@ -27,14 +22,10 @@
       bundled for the desktop.
     </para>
 
-    <section>
+    <section id="sn-change-theme">
       <title>Changing the Theme</title>
 
       <para>
-        <anchor id='change-theme'/>
-      </para>
-
-      <para>
         Themes are a way to change your desktop to suit your personal
         preferences.
       </para>
@@ -50,26 +41,24 @@
         Preferences</emphasis> window appears:
       </para>
 
-      <para>
-        <inlinemediaobject>
+      <figure>
+        <title>Change the Desktop Theme</title>
+        <mediaobject>
           <imageobject>
-            <imagedata fileref='/wiki/Docs/DesktopUserGuide/Customizing?action=AttachFile&amp;do=get&amp;target=chngTheme3.png'/>
+            <imagedata align="center" fileref="./figs/chngTheme3.png"
+	    format="PNG"/>
           </imageobject>
           <textobject>
-            <phrase>attachment:chngTheme3.png</phrase>
+            <phrase>Change the Desktop Theme</phrase>
           </textobject>
-        </inlinemediaobject>
-      </para>
+        </mediaobject>
+      </figure>
     </section>
 
-    <section>
+    <section id="sn-change-background">
       <title>Changing the Background</title>
 
       <para>
-        <anchor id='change-background'/>
-      </para>
-
-      <para>
         To change the background image on your desktop, right-click on
         an empty area of the desktop, and select the <emphasis>Change
         Desktop Background</emphasis> option. The <emphasis>Desktop
@@ -84,27 +73,16 @@
         Wallpaper</emphasis>. Then change the color under
         <emphasis>Desktop Colors</emphasis>.
       </para>
-      <table>
-        <caption/>
-        <tgroup cols='1'>
-          <colspec colname='xxx1'/>
-          <tbody>
-            <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/idea.png' depth='15'/></imageobject><textobject><phrase>(!)</phrase></textobject></inlinemediaobject> Another way to change the desktop background is to choose <emphasis>System > Preferences > Desktop Background</emphasis> from the menu panel. </para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
+      <tip>
+      	<title>Alternative</title>
+	<para>Another way to change the desktop background is to choose <emphasis>System > Preferences > Desktop Background</emphasis> from the menu panel. </para>
+      </tip>
     </section>
 
-    <section>
+    <section id="sn-nautilus-behavior">
       <title>Customizing File Browsing Behavior</title>
 
       <para>
-        <anchor id='nautilus-behavior'/>
-      </para>
-
-      <para>
         By default, Fedora uses the
         <emphasis role='strong'>Nautilus</emphasis> file manager, which
         opens a new window each time you open a folder. You can change
@@ -122,25 +100,8 @@
         click on the box next to the text <emphasis>Always open in
         browser windows</emphasis>.
       </para>
-      <table>
-        <caption/>
-        <tgroup cols='2'>
-          <colspec colname='xxx1'/>
-          <colspec colname='xxx2'/>
-          <tbody>
-            <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/SharingDesktop'>Previous Page - Sharing Your Desktop</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
-      </para>
     </section>
-  </section>
-</article>
+</chapter>
 
 <!--
 Local variables:


Index: Games.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Games.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Games.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ Games.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,41 +9,28 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/Games</title>
-  </articleinfo>
-
-  <section>
-    <title>Playing Games</title>
-
-    <para>
-      By default, Fedora comes with a selection of 15 games. There are
-      additional game packages that can be selected during installation.
-      In addition, the Fedora Extras project has packages for many more
-      games. You can install additional games after installation by
-      using the Add/Remove program application,
-      <emphasis role='strong'>Pirut</emphasis>, and the Fedora Extras
-      software repository. More information about this games repository
-      can be found on the Fedora Extras Games Wiki:
-    </para>
-
-    <para>
-      <ulink url='http://fedoraproject.org/wiki/Games'>http://fedoraproject.org/wiki/Games</ulink>
-    </para>
-  </section>
-
-  <section>
+<chapter id="ch-Games">
+  <title>Playing Games</title>
+  <para>
+    By default, Fedora comes with a selection of 15 games. There are
+    additional game packages that can be selected during installation.
+    In addition, the Fedora Extras project has packages for many more
+    games. You can install additional games after installation by using
+    the Add/Remove program application,
+    <emphasis role='strong'>Pirut</emphasis>, and the Fedora Extras
+    software repository. More information about this games repository
+    can be found on the Fedora Extras Games Wiki:
+  </para>
+  <para>
+    <ulink url='http://fedoraproject.org/wiki/Games'>http://fedoraproject.org/wiki/Games</ulink>
+  </para>
+  <section id="sn-description-game">
     <title>Brief Description of Each Game</title>
-
-    <para>
-      <anchor id='description-game'/>
-    </para>
     <table>
-      <caption/>
+      <title>Games on Fedora</title>
       <tgroup cols='2'>
-        <colspec colname='xxx1'/>
-        <colspec colname='xxx2'/>
+        <colspec colnum="1" colname="Name of game"/>
+        <colspec colnum="2" colname="Description"/>
         <tbody>
           <row>
 <entry><para><emphasis>AisleRiot Solitaire</emphasis></para></entry>
@@ -112,26 +99,8 @@
       For information about using these games, refer to the individual
       <emphasis>Help > Contents</emphasis> menu within each game.
     </para>
-    <table>
-      <caption/>
-      <tgroup cols='3'>
-        <colspec colname='xxx1'/>
-        <colspec colname='xxx2'/>
-        <colspec colname='xxx3'/>
-        <tbody>
-          <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Multimedia'>Previous Page - Playing Multimedia</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Photos'>Next Page - Managing Photos</ulink></para></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <para>
-      <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
-    </para>
   </section>
-</article>
+</chapter>
 
 <!--
 Local variables:


Index: Introduction.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Introduction.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Introduction.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ Introduction.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,87 +9,84 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/Introduction</title>
-  </articleinfo>
-
-  <section>
-    <title>Introduction</title>
-
-    <para>
-      Welcome to the Fedora Core 6 Desktop User Guide! This guide is
-      intended for users, with a working Fedora Core 6 system, who are
-      able to use a mouse and keyboard. This guide shows:
-    </para>
-
-    <itemizedlist>
-      <listitem>How to login to your computer </listitem>
-      <listitem>The layout of the default Fedora desktop </listitem>
-      <listitem>How to use Nautilus, a file and system navigator </listitem>
-      <listitem>How to use Evolution, an e-mail client </listitem>
-      <listitem>How to use Gaim, an instant messenger client </listitem>
-      <listitem>How to use Firefox, a web-browser </listitem>
-      <listitem>
-        <para>
-          How to use OpenOffice, an office suite
-        </para>
-      </listitem>
-      <listitem>How to customize your new Fedora desktop </listitem>
-    </itemizedlist>
-
-    <section>
-      <title>About this Document</title>
-
+<chapter id="ch-Introduction">
+  <title>Introduction</title>
+  <para>
+    Welcome to the Fedora Core 6 Desktop User Guide! This guide is
+    intended for users, with a working Fedora Core 6 system, who are
+    able to use a mouse and keyboard. This guide shows:
+  </para>
+  <itemizedlist>
+    <listitem>
       <para>
-        <anchor id='about-document'/>
+        How to login to your computer
       </para>
-
+    </listitem>
+    <listitem>
       <para>
-        Volunteer contributors from the Fedora Documentation Project
-        created this guide, and many others, for each release of Fedora.
-        If you have questions or suggestions about Fedora documentation,
-        or if you would like to help document Fedora, please visit the
-        Fedora Documentation Project web site:
+        The layout of the default Fedora desktop
       </para>
-
+    </listitem>
+    <listitem>
       <para>
-        <ulink url='http://fedoraproject.org/wiki/DocsProject'>http://fedoraproject.org/wiki/DocsProject</ulink>
+        How to use Nautilus, a file and system navigator
       </para>
-
+    </listitem>
+    <listitem>
       <para>
-        For assistance installing Fedora Core 6, please read the Fedora
-        Core Installation Guide:
+        How to use Evolution, an e-mail client
       </para>
-
+    </listitem>
+    <listitem>
       <para>
-        <ulink url='http://fedora.redhat.com/docs/install-guide/fc6/'>http://fedora.redhat.com/docs/install-guide/fc6/</ulink>
+        How to use Gaim, an instant messenger client
       </para>
-
+    </listitem>
+    <listitem>
       <para>
-        Thank you for choosing Fedora.
+        How to use Firefox, a web-browser
       </para>
-      <table>
-        <caption/>
-        <tgroup cols='3'>
-          <colspec colname='xxx1'/>
-          <colspec colname='xxx2'/>
-          <colspec colname='xxx3'/>
-          <tbody>
-            <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Previous Page - Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Login'>Next Page - Logging into the Desktop</ulink></para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
+    </listitem>
+    <listitem>
       <para>
-        <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
+        How to use OpenOffice, an office suite
       </para>
-    </section>
+    </listitem>
+    <listitem>
+      <para>
+        How to customize your new Fedora desktop
+      </para>
+    </listitem>
+  </itemizedlist>
+  <section id="sn-about-document">
+    <title>About this Document</title>
+
+    <para>
+      Volunteer contributors from the Fedora Documentation Project
+      created this guide, and many others, for each release of Fedora.
+      If you have questions or suggestions about Fedora documentation,
+      or if you would like to help document Fedora, please visit the
+      Fedora Documentation Project web site:
+    </para>
+
+    <para>
+      <ulink url='http://fedoraproject.org/wiki/DocsProject'>http://fedoraproject.org/wiki/DocsProject</ulink>
+    </para>
+
+    <para>
+      For assistance installing Fedora Core 6, please read the Fedora
+      Core Installation Guide:
+    </para>
+
+    <para>
+      <ulink url='http://fedora.redhat.com/docs/install-guide/fc6/'>http://fedora.redhat.com/docs/install-guide/fc6/</ulink>
+    </para>
+
+    <para>
+      Thank you for choosing Fedora.
+    </para>
   </section>
-</article>
+</chapter>
 
 <!--
 Local variables:


Index: Login.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Login.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Login.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ Login.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,235 +9,153 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/Login</title>
-  </articleinfo>
-
-  <section>
-    <title>Logging into the Desktop</title>
-
+<chapter id="ch-Login">
+  <title>Logging into the Desktop</title>
+  <para>
+    This section of the Fedora Desktop User Guide explains how to login
+    to your system. The <emphasis>user account</emphasis> and the
+    password created during the installation process is necessary to
+    complete this step. If you have forgotten your user account, your
+    password, or both, read the section
+    <ulink url='/wiki/Docs/DesktopUserGuide/Login/'>I Cannot Login:
+    HELP!</ulink>. For additional information about the login process,
+    read the section
+    <ulink url='/wiki/Docs/DesktopUserGuide/Login/'>Logging In: An
+    Explanation</ulink>. This first section covers the login process.
+  </para>
+  <para>
+    Any user can now login when the display looks similar to the picture
+    below:
+  </para>
+  <figure>
+    <title>Login Screen</title>
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="./figs/FC6_Login.png" format="PNG"/>
+      </imageobject>
+      <textobject>
+        <phrase>Login Screen</phrase>
+      </textobject>
+    </mediaobject>
+  </figure>
+  <para>
+    To login, type your username into the horizontal field containing a
+    blinking black bar (the <emphasis>cursor</emphasis>). Next, press
+    the <emphasis role='strong'>[Enter]</emphasis> key. Next, type your
+    password into the same field you typed your username, then press the
+    <emphasis role='strong'>[Enter]</emphasis> key.
+  </para>
+  <tip>
+    <title>Password display</title>
+    <para>
+      <emphasis role='strong'>For security reasons, a dot is displayed
+      for every character entered in the password field.</emphasis>
+    </para>
+  </tip>
+  <tip>
+    <title>Keep your password private</title>
+    <para>
+      <emphasis role='strong'>As with any password, your Fedora account
+      password should be kept private and not shared with anyone or
+      written down in plain view.</emphasis>
+    </para>
+    <para>
+      Each computer user should be assigned a unique username and
+      password. With unique user accounts, the system is more secure,
+      and Fedora automatically stores files and other sensitive
+      information separately from other users.
+    </para>
+  </tip>
+  <tip>
+    <title>Your username and password are case-sensitive.</title>
     <para>
-      This section of the Fedora Desktop User Guide explains how to
-      login to your system. The <emphasis>user account</emphasis> and
-      the password created during the installation process is necessary
-      to complete this step. If you have forgotten your user account,
-      your password, or both, read the section
+      A correct username and password is required to login to the
+      system. Common errors include mis-typed fields or the
+      <emphasis role='strong'>[Caps Lock]</emphasis> feature is on.
+      Remember, usernames and passwords are case-sensitive. This means
+      that 'user' is not the same as 'USER' or 'uSeR'. If problems
+      persist, read the section
       <ulink url='/wiki/Docs/DesktopUserGuide/Login/'>I Cannot Login:
-      HELP!</ulink>. For additional information about the login process,
-      read the section
-      <ulink url='/wiki/Docs/DesktopUserGuide/Login/'>Logging In: An
-      Explanation</ulink>. This first section covers the login process.
-    </para>
-
-    <para>
-      Any user can now login when the display looks similar to the
-      picture below:
-    </para>
-
-    <para>
-      <inlinemediaobject>
-        <imageobject>
-          <imagedata fileref='/wiki/Docs/DesktopUserGuide/Login?action=AttachFile&amp;do=get&amp;target=020_FC6_Login.png'/>
-        </imageobject>
-        <textobject>
-          <phrase>attachment:020_FC6_Login.png</phrase>
-        </textobject>
-      </inlinemediaobject>
-    </para>
-
-    <para>
-      To login, type your username into the horizontal field containing
-      a blinking black bar (the <emphasis>cursor</emphasis>). Next,
-      press the <emphasis role='strong'>[Enter]</emphasis> key. Next,
-      type your password into the same field you typed your username,
-      then press the <emphasis role='strong'>[Enter]</emphasis> key.
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <table>
-          <caption/>
-          <tgroup cols='1'>
-            <colspec colname='xxx1'/>
-            <tbody>
-              <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/idea.png' depth='15'/></imageobject><textobject><phrase>(!)</phrase></textobject></inlinemediaobject> <emphasis role='strong'>For security reasons, a dot is displayed for every character entered in the password field.</emphasis> </para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        <table>
-          <caption/>
-          <tgroup cols='1'>
-            <colspec colname='xxx1'/>
-            <tbody>
-              <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/idea.png' depth='15'/></imageobject><textobject><phrase>(!)</phrase></textobject></inlinemediaobject> <emphasis role='strong'>As with any password, your Fedora account password should be kept private and not shared with anyone or written down in plain view.</emphasis> </para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        <table>
-          <caption/>
-          <tgroup cols='1'>
-            <colspec colname='xxx1'/>
-            <tbody>
-              <row>
-<entry><para> Each computer user should be assigned a unique username and password.  With unique user accounts, the system is more secure, and Fedora automatically stores files and other sensitive information separately from other users.</para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        <table>
-          <caption/>
-          <tgroup cols='1'>
-            <colspec colname='xxx1'/>
-            <tbody>
-              <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/idea.png' depth='15'/></imageobject><textobject><phrase>(!)</phrase></textobject></inlinemediaobject> <emphasis role='strong'>Your username and password are case-sensitive.</emphasis> </para></entry>
-              </row>
-              <row>
-<entry><para> A correct username and password is required to login to the system.  Common errors include mis-typed fields or the <emphasis role='strong'>[Caps Lock]</emphasis> feature is on.  Remember, usernames and passwords are case-sensitive.  This means that 'user' is not the same as 'USER' or 'uSeR'.  If problems persist, read the section <ulink url='/wiki/Docs/DesktopUserGuide/Login/'>I Cannot Login: HELP!</ulink> </para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      After a correct username and password are entered, the login
-      screen will be replaced by the <emphasis>splash screen</emphasis>.
-      After this, the splash screen should be replaced by the default
-      Fedora 6 desktop. Congratulations! The computer is now ready for
-      use.
+      HELP!</ulink>
     </para>
+  </tip>
+  <para>
+    After a correct username and password are entered, the login screen
+    will be replaced by the <emphasis>splash screen</emphasis>. After
+    this, the splash screen should be replaced by the default Fedora 6
+    desktop. Congratulations! The computer is now ready for use.
+  </para>
+  <section id="sn-login-explanation">
+    <title>Logging In: An Explanation</title>
 
-    <section>
-      <title>Logging In: An Explanation</title>
-
-      <para>
-        <anchor id='login-explanation'/>
-      </para>
-
-      <para>
-        Fedora is a <emphasis>multi-user</emphasis> operating system. In
-        short, this means multiple users can be logged into the computer
-        at the same time. Three distinct groups, <emphasis>normal
-        user</emphasis>, <emphasis>system user</emphasis> and
-        administrative accounts exist on your Fedora system. By default,
-        your account is created as a <emphasis>normal user</emphasis>
-        account. Normal users have permission to run a desktop and
-        related desktop applications. System users have permission to
-        programs running in the background, often with elevated
-        privileges, that help maintain your computer system. One example
-        of a system account is the Xscreensaver program.
-      </para>
+    <para>
+      Fedora is a <emphasis>multi-user</emphasis> operating system. In
+      short, this means multiple users can be logged into the computer
+      at the same time. Three distinct groups, <emphasis>normal
+      user</emphasis>, <emphasis>system user</emphasis> and
+      administrative accounts exist on your Fedora system. By default,
+      your account is created as a <emphasis>normal user</emphasis>
+      account. Normal users have permission to run a desktop and related
+      desktop applications. System users have permission to programs
+      running in the background, often with elevated privileges, that
+      help maintain your computer system. One example of a system
+      account is the Xscreensaver program.
+    </para>
 
-      <itemizedlist>
-        <listitem>
-          <table>
-            <caption/>
-            <tgroup cols='1'>
-              <colspec colname='xxx1'/>
-              <tbody>
-                <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/alert.png' depth='15'/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role='strong'>Modify Default Login Procedure with Xscreensaver.</emphasis> </para></entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <table>
-            <caption/>
-            <tgroup cols='1'>
-              <colspec colname='xxx1'/>
-              <tbody>
-                <row>
-<entry><para> The Fedora login process is regulated by a system user called <emphasis role='strong'>Xscreensaver</emphasis>.  Xscreensaver secures your desktop when it is unattended and can be configured by accessing the following menu options: <emphasis>System > Preferences > Screensaver</emphasis>.</para></entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-        </listitem>
-      </itemizedlist>
+    <warning>
+      <title>Modify Default Login Procedure with Xscreensaver.</title>
 
       <para>
-        Administrative accounts are accounts with elevated privileges,
-        such as the <emphasis>root</emphasis> account, that enable the
-        user to perform tasks to alter the behavior and ability of other
-        users on the computer system. The <emphasis>root</emphasis> user
-        is considered the "ultimate" administrative account as it has
-        domain over the entire machine. For more information about these
-        different levels, permissions, and user provisioning, please
-        refer to the
-        <ulink url='/wiki/Docs/Drafts/AdministrationGuide'>Fedora
-        Administration Guide</ulink>.
+        The Fedora login process is regulated by a system user called
+        <emphasis role='strong'>Xscreensaver</emphasis>. Xscreensaver
+        secures your desktop when it is unattended and can be configured
+        by accessing the following menu options: <emphasis>System >
+        Preferences > Screensaver</emphasis>.
       </para>
+    </warning>
 
-      <itemizedlist>
-        <listitem>
-          <table>
-            <caption/>
-            <tgroup cols='1'>
-              <colspec colname='xxx1'/>
-              <tbody>
-                <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/alert.png' depth='15'/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role='strong'>Day-to-day tasks do not require root level access.</emphasis> </para></entry>
-                </row>
-                <row>
-<entry><para> Do not log into your desktop as root, as it is potentially dangerous.  When the need arises to perform maintenance duties such as installing software, removing software, or updating the system, the tool can be run as the root user.  This is done in this guide with the command form <code>su -c 'command-to-be-run-as-root'</code>.  Programs that require root privileges will to prompt you for the root password before the program starts.</para></entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-        </listitem>
-      </itemizedlist>
-    </section>
+    <para>
+      Administrative accounts are accounts with elevated privileges,
+      such as the <emphasis>root</emphasis> account, that enable the
+      user to perform tasks to alter the behavior and ability of other
+      users on the computer system. The <emphasis>root</emphasis> user
+      is considered the "ultimate" administrative account as it has
+      domain over the entire machine. For more information about these
+      different levels, permissions, and user provisioning, please refer
+      to the <ulink url='/wiki/Docs/Drafts/AdministrationGuide'>Fedora
+      Administration Guide</ulink>.
+    </para>
 
-    <section>
-      <title>I Cannot Login: HELP!</title>
+    <warning>
+      <title>Day-to-day tasks do not require root level access.</title>
 
       <para>
-        <anchor id='cannot-login'/>
+        Do not log into your desktop as root, as it is potentially
+        dangerous. When the need arises to perform maintenance duties
+        such as installing software, removing software, or updating the
+        system, the tool can be run as the root user. This is done in
+        this guide with the command form <code>su -c
+        'command-to-be-run-as-root'</code>. Programs that require root
+        privileges will to prompt you for the root password before the
+        program starts.
       </para>
+    </warning>
+  </section>
+  <section id="sn-cannot-login">
+    <title>I Cannot Login: HELP!</title>
 
-      <para>
-        Recovering or replacing a password for a user account is not
-        hard, but it is beyond the scope of this guide. For an
-        explanation and details on how to do this, please refer to the
-        <ulink url='/wiki/Docs/Drafts/AdministrationGuide'>Fedora
-        Administration Guide</ulink>, which has a section on user
-        accounts, and
-        <ulink url='/wiki/Docs/Drafts/AdministrationGuide/UserAccounts'>password
-        recovery</ulink>.
-      </para>
-      <table>
-        <caption/>
-        <tgroup cols='3'>
-          <colspec colname='xxx1'/>
-          <colspec colname='xxx2'/>
-          <colspec colname='xxx3'/>
-          <tbody>
-            <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Introduction'>Previous Page - Introduction</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Tour'>Next Page - Tour of the Desktop</ulink></para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
-      </para>
-    </section>
+    <para>
+      Recovering or replacing a password for a user account is not hard,
+      but it is beyond the scope of this guide. For an explanation and
+      details on how to do this, please refer to the
+      <ulink url='/wiki/Docs/Drafts/AdministrationGuide'>Fedora
+      Administration Guide</ulink>, which has a section on user
+      accounts, and
+      <ulink url='/wiki/Docs/Drafts/AdministrationGuide/UserAccounts'>password
+      recovery</ulink>.
+    </para>
   </section>
-</article>
+</chapter>
 
 <!--
 Local variables:


Index: Media.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Media.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Media.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ Media.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,153 +9,111 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/Media</title>
-  </articleinfo>
-
-  <section>
-    <title>Using Media</title>
+<chapter id="ch-Media">
+  <title>Using Media</title>
+  <para>
+    This chapter covers how to use media such as hard drives, DVDs, CDs,
+    and flash drives in Fedora. When these media are mounted, they are
+    called <emphasis>volumes</emphasis>.
+  </para>
+  <section id="sn-understanding-media">
+    <title>Understanding</title>
 
     <para>
-      This chapter covers how to use media such as hard drives, DVDs,
-      CDs, and flash drives in Fedora. When these media are mounted,
-      they are called <emphasis>volumes</emphasis>.
+      When you insert media into your computer, Fedora automatically
+      detects the volume. An icon is placed both on your desktop and in
+      the <emphasis>Places</emphasis> menu.
     </para>
 
-    <section>
-      <title>Understanding</title>
-
-      <para>
-        <anchor id='understanding'/>
-      </para>
+    <warning>
+      <title>System hard disk is already mounted</title>
 
       <para>
-        When you insert media into your computer, Fedora automatically
-        detects the volume. An icon is placed both on your desktop and
-        in the <emphasis>Places</emphasis> menu.
+        The hard disk drive that Fedora is installed on is mounted
+        during system boot and cannot be removed or ejected the way
+        other media can. Access this drive through the
+        <emphasis>Computer</emphasis> icon on the desktop or through
+        <emphasis>Places > Computer</emphasis>.
       </para>
+    </warning>
 
-      <itemizedlist>
-        <listitem>
-          <table>
-            <caption/>
-            <tgroup cols='1'>
-              <colspec colname='xxx1'/>
-              <tbody>
-                <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/alert.png' depth='15'/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role='strong'>System hard disk is already mounted</emphasis></para></entry>
-                </row>
-                <row>
-<entry><para> The hard disk drive that Fedora is installed on is mounted during system boot and cannot be removed or ejected the way other media can.  Access this drive through the <emphasis>Computer</emphasis> icon on the desktop or through <emphasis>Places > Computer</emphasis>. </para></entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        When you are finished using your media, alert Fedora that you
-        would like to remove this volume. To do this, right-click on the
-        device's icon and then select <emphasis>Unmount
-        Volume</emphasis> or <emphasis>Eject</emphasis>, depending on
-        what type of media you are using.
-      </para>
-    </section>
-
-    <section>
-      <title>Exploring Media</title>
-
-      <para>
-        <anchor id='exploring-media'/>
-      </para>
-
-      <para>
-        To view the contents of a volume, double-click on the icon on
-        the desktop, or choose the volume name from the
-        <emphasis>Places</emphasis> menu.
-      </para>
-
-      <para>
-        All of the contents of your volume are displayed in the window.
-      </para>
-    </section>
-
-    <section>
-      <title>Writing CDs or DVDs</title>
-
-      <para>
-        <anchor id='writing-media'/>
-      </para>
+    <para>
+      When you are finished using your media, alert Fedora that you
+      would like to remove this volume. To do this, right-click on the
+      device's icon and then select <emphasis>Unmount Volume</emphasis>
+      or <emphasis>Eject</emphasis>, depending on what type of media you
+      are using.
+    </para>
+  </section>
+  <section id="sn-exploring-media">
+    <title>Exploring Media</title>
 
-      <para>
-        Fedora includes support for writing to CDs and DVDs. To write to
-        a CD or DVD:
-      </para>
-      <orderedlist numeration='arabic'>
-        <listitem>
-          <para>
-            Open a <emphasis role='strong'>Nautilus</emphasis> window,
-            such as <emphasis>Home</emphasis> or
-            <emphasis>Computer</emphasis>.
-            <emphasis role='strong'>Nautilus</emphasis> is the graphical
-            file manager.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Select <emphasis>Places > CD/DVD Creator</emphasis>.
-          </para>
-        </listitem>
-        <listitem>Drag and drop the files you wish to burn into this new empty window. </listitem>
-        <listitem>
-          <para>
-            Click <emphasis>Write to Disc</emphasis>.
-          </para>
-        </listitem>
-        <listitem>In the dialog box, you can change the name of the disc and the write speed if they are incorrect. </listitem>
-        <listitem>
-          <para>
-            Click <emphasis>Write</emphasis>.
-          </para>
-        </listitem>
-      </orderedlist>
-    </section>
+    <para>
+      To view the contents of a volume, double-click on the icon on the
+      desktop, or choose the volume name from the
+      <emphasis>Places</emphasis> menu.
+    </para>
 
-    <section>
-      <title>Using a USB Drive</title>
+    <para>
+      All of the contents of your volume are displayed in the window.
+    </para>
+  </section>
+  <section id="sn-writing-media">
+    <title>Writing CDs or DVDs</title>
 
-      <para>
-        <anchor id='usb-drive'/>
-      </para>
+    <para>
+      Fedora includes support for writing to CDs and DVDs. To write to a
+      CD or DVD:
+    </para>
+    <orderedlist numeration='arabic'>
+      <listitem>
+        <para>
+          Open a <emphasis role='strong'>Nautilus</emphasis> window,
+          such as <emphasis>Home</emphasis> or
+          <emphasis>Computer</emphasis>.
+          <emphasis role='strong'>Nautilus</emphasis> is the graphical
+          file manager.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Select <emphasis>Places > CD/DVD Creator</emphasis>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Drag and drop the files you wish to burn into this new empty
+          window.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Click <emphasis>Write to Disc</emphasis>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          In the dialog box, you can change the name of the disc and the
+          write speed if they are incorrect.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Click <emphasis>Write</emphasis>.
+        </para>
+      </listitem>
+    </orderedlist>
+  </section>
+  <section id="sn-usb-drive">
+    <title>Using a USB Drive</title>
 
-      <para>
-        When you plug in a USB drive, Fedora automatically detects this
-        and puts an icon on your desktop. You may then use your USB
-        drive as you would any other volume.
-      </para>
-      <table>
-        <caption/>
-        <tgroup cols='3'>
-          <colspec colname='xxx1'/>
-          <colspec colname='xxx2'/>
-          <colspec colname='xxx3'/>
-          <tbody>
-            <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Tour'>Previous Page - Tour of the Desktop</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Web'>Next Page - Accessing the Web</ulink></para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
-      </para>
-    </section>
+    <para>
+      When you plug in a USB drive, Fedora automatically detects this
+      and puts an icon on your desktop. You may then use your USB drive
+      as you would any other volume.
+    </para>
   </section>
-</article>
+</chapter>
 
 <!--
 Local variables:


Index: Multimedia.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Multimedia.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Multimedia.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ Multimedia.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,281 +9,218 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/Multimedia</title>
-  </articleinfo>
-
-  <section>
-    <title>Playing Multimedia (Music &amp; Video)</title>
-
-    <para>
-      Fedora includes several tools for viewing video and listening to
-      audio. Access sound and video applications through the
-      <emphasis>Applications > Sound &amp; Video</emphasis> menu.
-    </para>
-
-    <para>
-      By default, Fedora provides four applications for audio and video:
-    </para>
-    <table>
-      <caption/>
-      <tgroup cols='2'>
-        <colspec colname='xxx1'/>
-        <colspec colname='xxx2'/>
-        <tbody>
-          <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Multimedia?action=AttachFile&amp;do=get&amp;target=cdplayericon.png'/></imageobject><textobject><phrase>attachment:cdplayericon.png</phrase></textobject></inlinemediaobject></para></entry>
+<chapter id="ch-Multimedia">
+  <title>Playing Multimedia (Music &amp; Video)</title>
+  <para>
+    Fedora includes several tools for viewing video and listening to
+    audio. Access sound and video applications through the
+    <emphasis>Applications > Sound &amp; Video</emphasis> menu.
+  </para>
+  <para>
+    By default, Fedora provides four applications for audio and video:
+  </para>
+  <table id="tb-multimedia-apps">
+    <title>Multimedia applications</title>
+    <tgroup cols='2'>
+      <colspec colnum="1" colname="Icon"/>
+      <colspec colnum="2" colname="Program"/>
+      <tbody>
+        <row>
+<entry><mediaobject><imageobject><imagedata align="center"
+fileref="./figs/cdplayericon.png" format="PNG"/></imageobject></mediaobject></entry>
 <entry><para>The <emphasis role='strong'>CD Player</emphasis> application is for listening to audio CDs.</para></entry>
-          </row>
-          <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Multimedia?action=AttachFile&amp;do=get&amp;target=soundjuicericon.png'/></imageobject><textobject><phrase>attachment:soundjuicericon.png</phrase></textobject></inlinemediaobject></para></entry>
+        </row>
+        <row>
+<entry><mediaobject><imageobject><imagedata align="center"
+fileref="./figs/soundjuicericon.png" format="PNG"/></imageobject></mediaobject></entry>
 <entry><para><emphasis role='strong'>Sound Juicer</emphasis> is an application for converting CDs to music files.</para></entry>
-          </row>
-          <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Multimedia?action=AttachFile&amp;do=get&amp;target=rhythmboxicon.png'/></imageobject><textobject><phrase>attachment:rhythmboxicon.png</phrase></textobject></inlinemediaobject></para></entry>
+        </row>
+        <row>
+<entry><mediaobject><imageobject><imagedata align="center"
+fileref="./figs/rhythmboxicon.png" format="PNG"/></imageobject></mediaobject></entry>
 <entry><para><emphasis role='strong'>Rhythmbox</emphasis> is a music player with tools for organizing music, CDs, Internet radio stations, and more.</para></entry>
-          </row>
-          <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Multimedia?action=AttachFile&amp;do=get&amp;target=totemplayericon.png'/></imageobject><textobject><phrase>attachment:totemplayericon.png</phrase></textobject></inlinemediaobject></para></entry>
+        </row>
+        <row>
+<entry><mediaobject><imageobject><imagedata align="center"
+fileref="./figs/totemplayericon.png" format="PNG"/></imageobject></mediaobject></entry>
 <entry><para><emphasis role='strong'>Totem Movie Player</emphasis> is for viewing videos.</para></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table>
-      <caption/>
-      <tgroup cols='1'>
-        <colspec colname='xxx1'/>
-        <tbody>
-          <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/idea.png' depth='15'/></imageobject><textobject><phrase>(!)</phrase></textobject></inlinemediaobject> <emphasis role='strong'>Media formats not included by default in Fedora</emphasis> </para></entry>
-          </row>
-          <row>
-<entry><para> Because of licensing and patent encumbrance, Fedora cannot ship with certain audio and video playing capabilities, known as <emphasis>codecs</emphasis>.  An example is the <emphasis>MP3</emphasis> codec. Refer to the section below on <ulink url='/wiki/Docs/DesktopUserGuide/Multimedia/'>Excluded Multimedia</ulink> for more information. </para></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <section>
-      <title>Playing Audio CDs</title>
-
-      <para>
-        <anchor id='playing-cds'/>
-      </para>
-
-      <para>
-        <emphasis role='strong'>CD Player</emphasis> is the default
-        application for playing CDs. Audio CDs begin playing
-        automatically when the disk is inserted into the CD-ROM drive.
-      </para>
-
-      <para>
-        This program can be started independently through the menu
-        <emphasis>Applications > Sound &amp; Video > CD
-        Player</emphasis>.
-      </para>
-    </section>
-
-    <section>
-      <title>Converting Audio CDs to Music Files</title>
-
-      <para>
-        <anchor id='converting-music'/>
-      </para>
-
-      <para>
-        <emphasis role='strong'>Sound Juicer</emphasis> is the
-        application that <emphasis>rips</emphasis> the CD into audio
-        files on your hard disk. <emphasis>Ripping</emphasis> is the
-        word for converting audio files from CD to file, with each music
-        track on the CD saved as a single file. The default file format
-        is <emphasis>Ogg Vorbis</emphasis>, a free and open alternative
-        to the <emphasis>MP3</emphasis> format.
-        <ulink url='http://www.vorbis.com/'>Vorbis</ulink> offers better
-        performance in a smaller file than MP3. When a ripping from a
-        commercially produced CD, <emphasis role='strong'>Sound
-        Juicer</emphasis> displays the music track names, downloading
-        the information from a free database on the Internet.
-      </para>
-      <table>
-        <caption/>
-        <tgroup cols='1'>
-          <colspec colname='xxx1'/>
-          <tbody>
-            <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='16' fileref='/wikidata/kindofblue/img/icon-info.png' depth='16'/></imageobject><textobject><phrase>{i}</phrase></textobject></inlinemediaobject> <emphasis role='strong'>Vorbis is a lossy format</emphasis> </para></entry>
-            </row>
-            <row>
-<entry><para> Similar to <emphasis>MP3</emphasis>, <emphasis>Vorbis</emphasis> compresses the music track to a smaller file with very little loss of musical range or quality.  Files can also be saved in the lossless <emphasis>WAV</emphasis> or <emphasis>FLAC</emphasis> formats.  However, the resulting files are much larger. </para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        The <emphasis>Sound Juicer Manual</emphasis> is available in the
-        application, by going through <emphasis>Help >
-        Contents</emphasis>.
-      </para>
-    </section>
-
-    <section>
-      <title>Organizing your Multimedia Files</title>
-
-      <para>
-        <anchor id='organizing-multimedia'/>
-      </para>
-
-      <para>
-        One can organize multimedia files using
-        <emphasis role='strong'>Rhythmbox</emphasis>. Access this
-        through <emphasis>Applications > Sound &amp; Video > Rhythmbox
-        Music Player</emphasis>.
-        <emphasis role='strong'>Rhythmbox</emphasis> provides a
-        front-end for music services, Internet radio stations, podcasts,
-        and your own library of multimedia.
-      </para>
-
-      <para>
-        To learn more about using <emphasis>Rhythmbox</emphasis>, you
-        can access the <emphasis>Rhythmbox Music Player
-        Manual</emphasis> through the <emphasis>Help >
-        Contents</emphasis> menu.
-      </para>
-    </section>
+        </row>
+      </tbody>
+    </tgroup>
+  </table>
+  <tip>
+    <title>Media formats not included by default in Fedora</title>
+    <para>
+      Because of licensing and patent encumbrance, Fedora cannot ship
+      with certain audio and video playing capabilities, known as
+      <emphasis>codecs</emphasis>. An example is the
+      <emphasis>MP3</emphasis> codec. Refer to the section below on
+      <ulink url='/wiki/Docs/DesktopUserGuide/Multimedia/'>Excluded
+      Multimedia</ulink> for more information.
+    </para>
+  </tip>
+  <section id="sn-playing-cds">
+    <title>Playing Audio CDs</title>
 
-    <section>
-      <title>Playing Videos</title>
+    <para>
+      <emphasis role='strong'>CD Player</emphasis> is the default
+      application for playing CDs. Audio CDs begin playing automatically
+      when the disk is inserted into the CD-ROM drive.
+    </para>
 
-      <para>
-        <anchor id='playing-videos'/>
-      </para>
+    <para>
+      This program can be started independently through the menu
+      <emphasis>Applications > Sound &amp; Video > CD Player</emphasis>.
+    </para>
+  </section>
+  <section id="sn-converting-music">
+    <title>Converting Audio CDs to Music Files</title>
 
-      <para>
-        The <emphasis role='strong'>Totem Movie Player</emphasis> can
-        play a variety of videos. Found at <emphasis>Applications >
-        Sound &amp; Video > Movie Player</emphasis>,
-        <emphasis role='strong'>Totem</emphasis> plays any format that
-        can be legally supplied with Fedora. For usage help, the
-        <emphasis>Totem Movie Player Manual</emphasis> is accessed
-        through the <emphasis>Help > Contents</emphasis> menu.
-      </para>
-    </section>
+    <para>
+      <emphasis role='strong'>Sound Juicer</emphasis> is the application
+      that <emphasis>rips</emphasis> the CD into audio files on your
+      hard disk. <emphasis>Ripping</emphasis> is the word for converting
+      audio files from CD to file, with each music track on the CD saved
+      as a single file. The default file format is <emphasis>Ogg
+      Vorbis</emphasis>, a free and open alternative to the
+      <emphasis>MP3</emphasis> format.
+      <ulink url='http://www.vorbis.com/'>Vorbis</ulink> offers better
+      performance in a smaller file than MP3. When a ripping from a
+      commercially produced CD, <emphasis role='strong'>Sound
+      Juicer</emphasis> displays the music track names, downloading the
+      information from a free database on the Internet.
+    </para>
 
-    <section>
-      <title>Fedora Project's Approach to Multimedia Support</title>
+    <note>
+      <title>Vorbis is a lossy format</title>
 
       <para>
-        <anchor id='approach-multimedia'/>
+        Similar to <emphasis>MP3</emphasis>, <emphasis>Vorbis</emphasis>
+        compresses the music track to a smaller file with very little
+        loss of musical range or quality. Files can also be saved in the
+        lossless <emphasis>WAV</emphasis> or <emphasis>FLAC</emphasis>
+        formats. However, the resulting files are much larger.
       </para>
+    </note>
 
-      <para>
-        The Fedora Project encourages the use of open formats in place
-        of restricted ones.
-      </para>
+    <para>
+      The <emphasis>Sound Juicer Manual</emphasis> is available in the
+      application, by going through <emphasis>Help >
+      Contents</emphasis>.
+    </para>
+  </section>
+  <section id="sn-organizing-multimedia">
+    <title>Organizing your Multimedia Files</title>
 
-      <para>
-        Fedora includes complete support for many freely-distributable
-        formats. These are the Ogg media format, Vorbis audio, Theora
-        video, Speex audio, and FLAC audio formats. These
-        freely-distributable formats are not encumbered by patent or
-        license restrictions. They provide powerful and flexible
-        alternatives to more popular, restricted formats such as MP3.
-      </para>
-    </section>
+    <para>
+      One can organize multimedia files using
+      <emphasis role='strong'>Rhythmbox</emphasis>. Access this through
+      <emphasis>Applications > Sound &amp; Video > Rhythmbox Music
+      Player</emphasis>. <emphasis role='strong'>Rhythmbox</emphasis>
+      provides a front-end for music services, Internet radio stations,
+      podcasts, and your own library of multimedia.
+    </para>
 
-    <section>
-      <title>MP3, DVD, and Other Excluded Multimedia</title>
+    <para>
+      To learn more about using <emphasis>Rhythmbox</emphasis>, you can
+      access the <emphasis>Rhythmbox Music Player Manual</emphasis>
+      through the <emphasis>Help > Contents</emphasis> menu.
+    </para>
+  </section>
+  <section id="sn-playing-videos">
+    <title>Playing Videos</title>
 
-      <para>
-        <anchor id='excluded_multimedia'/>
-      </para>
+    <para>
+      The <emphasis role='strong'>Totem Movie Player</emphasis> can play
+      a variety of videos. Found at <emphasis>Applications > Sound &amp;
+      Video > Movie Player</emphasis>,
+      <emphasis role='strong'>Totem</emphasis> plays any format that can
+      be legally supplied with Fedora. For usage help, the
+      <emphasis>Totem Movie Player Manual</emphasis> is accessed through
+      the <emphasis>Help > Contents</emphasis> menu.
+    </para>
+  </section>
+  <section id="sn-approach-multimedia">
+    <title>Fedora Project's Approach to Multimedia Support</title>
 
-      <para>
-        Fedora cannot include support for MP3 or DVD video playback or
-        recording. MP3 formats are patented, and the patent holders have
-        not provided the necessary licenses. DVD video formats are also
-        patented and equipped with an encryption scheme. Again, the
-        patent holders have not provided the necessary licenses, and the
-        code needed to decrypt CSS-encrypted discs may violate the
-        Digital Millennium Copyright Act, a copyright law of the United
-        States. Fedora also excludes other multimedia software due to
-        patent, copyright, or license restrictions, such as
-        <emphasis role='strong'>Adobe Flash Player</emphasis> and
-        <emphasis role='strong'>RealNetworks RealPlayer</emphasis>.
-      </para>
+    <para>
+      The Fedora Project encourages the use of open formats in place of
+      restricted ones.
+    </para>
 
-      <para>
-        While other MP3 options may be available for Fedora, Fluendo now
-        offers an MP3 plugin that is properly licensed for end users.
-        This plugin enables MP3 support in applications that use the
-        GStreamer framework as a backend. Fedora does not include this
-        plugin for licensing reasons, but Fluendo offers one solution to
-        playing MP3 in Fedora.
-      </para>
-    </section>
+    <para>
+      Fedora includes complete support for many freely-distributable
+      formats. These are the Ogg media format, Vorbis audio, Theora
+      video, Speex audio, and FLAC audio formats. These
+      freely-distributable formats are not encumbered by patent or
+      license restrictions. They provide powerful and flexible
+      alternatives to more popular, restricted formats such as MP3.
+    </para>
+  </section>
+  <section id="sn-excluded-multimedia">
+    <title>MP3, DVD, and Other Excluded Multimedia</title>
 
-    <section>
-      <title>For Further Information</title>
+    <para>
+      Fedora cannot include support for MP3 or DVD video playback or
+      recording. MP3 formats are patented, and the patent holders have
+      not provided the necessary licenses. DVD video formats are also
+      patented and equipped with an encryption scheme. Again, the patent
+      holders have not provided the necessary licenses, and the code
+      needed to decrypt CSS-encrypted discs may violate the Digital
+      Millennium Copyright Act, a copyright law of the United States.
+      Fedora also excludes other multimedia software due to patent,
+      copyright, or license restrictions, such as
+      <emphasis role='strong'>Adobe Flash Player</emphasis> and
+      <emphasis role='strong'>RealNetworks RealPlayer</emphasis>.
+    </para>
 
-      <para>
-        <anchor id='further-information'/>
-      </para>
+    <para>
+      While other MP3 options may be available for Fedora, Fluendo now
+      offers an MP3 plugin that is properly licensed for end users. This
+      plugin enables MP3 support in applications that use the GStreamer
+      framework as a backend. Fedora does not include this plugin for
+      licensing reasons, but Fluendo offers one solution to playing MP3
+      in Fedora.
+    </para>
+  </section>
+  <section id="sn-multimedia-further-information">
+    <title>For Further Information</title>
 
-      <para>
-        For additional information about multimedia in Fedora, refer to
-        the Multimedia section of the Fedora Project website:
-      </para>
+    <para>
+      For additional information about multimedia in Fedora, refer to
+      the Multimedia section of the Fedora Project website:
+    </para>
 
-      <para>
-        <ulink url='http://fedoraproject.org/wiki/Multimedia'>http://fedoraproject.org/wiki/Multimedia</ulink>
-      </para>
+    <para>
+      <ulink url='http://fedoraproject.org/wiki/Multimedia'>http://fedoraproject.org/wiki/Multimedia</ulink>
+    </para>
 
-      <para>
-        For more information on freely-distributable formats and how to
-        use them, refer to the Xiph.Org Foundation's web site at:
-      </para>
+    <para>
+      For more information on freely-distributable formats and how to
+      use them, refer to the Xiph.Org Foundation's web site at:
+    </para>
 
-      <para>
-        <ulink url='http://www.xiph.org/'>http://www.xiph.org/</ulink>
-      </para>
+    <para>
+      <ulink url='http://www.xiph.org/'>http://www.xiph.org/</ulink>
+    </para>
 
-      <para>
-        For more on licensed and copyrighted formats, please refer to:
-      </para>
+    <para>
+      For more on licensed and copyrighted formats, please refer to:
+    </para>
 
-      <para>
-        <ulink url='http://fedoraproject.org/wiki/ForbiddenItems'>http://fedoraproject.org/wiki/ForbiddenItems</ulink>
-      </para>
+    <para>
+      <ulink url='http://fedoraproject.org/wiki/ForbiddenItems'>http://fedoraproject.org/wiki/ForbiddenItems</ulink>
+    </para>
 
-      <para>
-        For more information on Fluendo, visit Fluendo's website at
-      </para>
+    <para>
+      For more information on Fluendo, visit Fluendo's website at
+    </para>
 
-      <para>
-        <ulink url='http://www.fluendo.com'>http://www.fluendo.com</ulink>
-      </para>
-      <table>
-        <caption/>
-        <tgroup cols='3'>
-          <colspec colname='xxx1'/>
-          <colspec colname='xxx2'/>
-          <colspec colname='xxx3'/>
-          <tbody>
-            <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Office'>Previous Page - Office Tools</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Games'>Next Page - Playing Games</ulink></para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
-      </para>
-    </section>
+    <para>
+      <ulink url='http://www.fluendo.com'>http://www.fluendo.com</ulink>
+    </para>
   </section>
-</article>
+</chapter>
 
 <!--
 Local variables:


Index: Office.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Office.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Office.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ Office.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,113 +9,97 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/Office</title>
-  </articleinfo>
-
-  <section>
-    <title>Office Tools</title>
-
-    <para>
-      Office productivity tools are available in the base Fedora
-      installation. This group of office tools include presentation,
-      spreadsheet, and word processing applications. These tools are
-      available through <emphasis>Applications > Office</emphasis> or as
-      icons on the menu bar.
-    </para>
-
-    <para>
-      The office tools available are:
-    </para>
-    <table>
-      <caption/>
-      <tgroup cols='2'>
-        <colspec colname='xxx1'/>
-        <colspec colname='xxx2'/>
-        <tbody>
-          <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Office?action=AttachFile&amp;do=get&amp;target=calicon.png'/></imageobject><textobject><phrase>attachment:calicon.png</phrase></textobject></inlinemediaobject></para></entry>
+<chapter id="ch-Office">
+  <title>Office Tools</title>
+  <para>
+    Office productivity tools are available in the base Fedora
+    installation. This group of office tools include presentation,
+    spreadsheet, and word processing applications. These tools are
+    available through <emphasis>Applications > Office</emphasis> or as
+    icons on the menu bar.
+  </para>
+  <para>
+    The office tools available are:
+  </para>
+  <table id="tb-office-tools">
+    <title>Available Office Tools</title>
+    <tgroup cols='2'>
+      <colspec colnum="1" colname="Icon"/>
+      <colspec colnum="2" colname="Program"/>
+      <tbody>
+        <row>
+<entry><mediaobject><imageobject><imagedata align="center"
+fileref="./figs/calicon.png" format="PNG"/></imageobject></mediaobject></entry>
 <entry><para><emphasis>Calendar</emphasis>, a component of the <emphasis role='strong'>Evolution</emphasis> application suite.</para></entry>
-          </row>
-          <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Office?action=AttachFile&amp;do=get&amp;target=openofficeorg-impress.png'/></imageobject><textobject><phrase>attachment:openofficeorg-impress.png</phrase></textobject></inlinemediaobject></para></entry>
+        </row>
+        <row>
+<entry><mediaobject><imageobject><imagedata align="center"
+fileref="./figs/openofficeorg-impress.png" format="PNG"/></imageobject></mediaobject></entry>
 <entry><para><emphasis>Presentation</emphasis> is the <emphasis role='strong'>OpenOffice.org Impress</emphasis> application, for creating and performing presentations.</para></entry>
-          </row>
-          <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Office?action=AttachFile&amp;do=get&amp;target=gnome-planner.png'/></imageobject><textobject><phrase>attachment:gnome-planner.png</phrase></textobject></inlinemediaobject></para></entry>
+        </row>
+        <row>
+<entry><mediaobject><imageobject><imagedata align="center"
+fileref="./figs/gnome-planner.png" format="PNG"/></imageobject></mediaobject></entry>
 <entry><para><emphasis>Project Management</emphasis> is the <emphasis role='strong'>Planner</emphasis> application, a powerful project planning tool.</para></entry>
-          </row>
-          <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Office?action=AttachFile&amp;do=get&amp;target=openofficeorg-calc.png'/></imageobject><textobject><phrase>attachment:openofficeorg-calc.png</phrase></textobject></inlinemediaobject></para></entry>
+        </row>
+        <row>
+<entry><mediaobject><imageobject><imagedata align="center"
+fileref="./figs/openofficeorg-calc.png" format="PNG"/></imageobject></mediaobject></entry>
 <entry><para><emphasis>Spreadsheet</emphasis> is the <emphasis role='strong'>OpenOffice.org Calc</emphasis> application, a spreadsheet program.</para></entry>
-          </row>
-          <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Office?action=AttachFile&amp;do=get&amp;target=tasksicon.png'/></imageobject><textobject><phrase>attachment:tasksicon.png</phrase></textobject></inlinemediaobject></para></entry>
+        </row>
+        <row>
+<entry><mediaobject><imageobject><imagedata align="center"
+fileref="./figs/tasksicon.png" format="PNG"/></imageobject></mediaobject></entry>
 <entry><para><emphasis>Tasks</emphasis>, a component of the <emphasis role='strong'>Evolution</emphasis> application suite.</para></entry>
-          </row>
-          <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Office?action=AttachFile&amp;do=get&amp;target=openofficeorg-writer.png'/></imageobject><textobject><phrase>attachment:openofficeorg-writer.png</phrase></textobject></inlinemediaobject></para></entry>
+        </row>
+        <row>
+<entry><mediaobject><imageobject><imagedata align="center"
+fileref="./figs/openofficeorg-writer.png" format="PNG"/></imageobject></mediaobject></entry>
 <entry><para><emphasis>Word Processor</emphasis> is the <emphasis role='strong'>OpenOffice.org Writer</emphasis> application, a word processing program.</para></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table>
-      <caption/>
-      <tgroup cols='1'>
-        <colspec colname='xxx1'/>
-        <tbody>
-          <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/star_on.png' depth='15'/></imageobject><textobject><phrase>{*}</phrase></textobject></inlinemediaobject> <emphasis role='strong'>Evolution applications require initial setup</emphasis> </para></entry>
-          </row>
-          <row>
-<entry><para> The <emphasis role='strong'>Evolution</emphasis> suite of applications, which includes <emphasis role='strong'>Calendar</emphasis> and <emphasis role='strong'>Tasks</emphasis>, requires an initial setup. See <ulink url='/wiki/Docs/DesktopUserGuide/Communications/'>Setting Up Your Email</ulink> for detailed directions. </para></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <section>
-      <title>OpenOffice.org Applications</title>
-
-      <para>
-        <anchor id='ooo-applications'/>
-      </para>
-
+        </row>
+      </tbody>
+    </tgroup>
+  </table>
+  <important>
+    <title>Evolution applications require initial setup</title>
+
+    <para>
+      The <emphasis role='strong'>Evolution</emphasis> suite of
+      applications, which includes
+      <emphasis role='strong'>Calendar</emphasis> and
+      <emphasis role='strong'>Tasks</emphasis>, requires an initial
+      setup. See
+      <ulink url='/wiki/Docs/DesktopUserGuide/Communications/'>Setting
+      Up Your Email</ulink> for detailed directions.
+    </para>
+  </important>
+  <section id="sn-ooo-applications">
+    <title>OpenOffice.org Applications</title>
+
+    <para>
+      With <emphasis role='strong'>OpenOffice.org</emphasis>, you can
+      create documents in formats based on open standards, such as
+      OpenDocument, Rich Text Format, and HTML. If necessary, you can
+      also read, edit, and write documents in Microsoft Office formats,
+      such as Word, Excel, and PowerPoint, with a high degree of
+      compatibility. You can also export files in PDF format without the
+      need of additional software.
+    </para>
+    <tip>
+      <title>OpenOffice.org is available for many computer platforms</title>
       <para>
-        With <emphasis role='strong'>OpenOffice.org</emphasis>, you can
-        create documents in formats based on open standards, such as
-        OpenDocument, Rich Text Format, and HTML. If necessary, you can
-        also read, edit, and write documents in Microsoft Office
-        formats, such as Word, Excel, and PowerPoint, with a high degree
-        of compatibility. You can also export files in PDF format
-        without the need of additional software.
+        The <emphasis role='strong'>OpenOffice.org</emphasis> suite is
+        also available without cost for other Linux distributions, Sun
+        Solaris, FreeBSD, Microsoft Windows and Mac OS X under X11. This
+        makes it possible to publish documents which are compatible
+        across many different computer platforms.
       </para>
-      <table>
-        <caption/>
-        <tgroup cols='1'>
-          <colspec colname='xxx1'/>
-          <tbody>
-            <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/idea.png' depth='15'/></imageobject><textobject><phrase>(!)</phrase></textobject></inlinemediaobject> <emphasis role='strong'>OpenOffice.org is available for many computer platforms</emphasis> </para></entry>
-            </row>
-            <row>
-<entry><para> The <emphasis role='strong'>OpenOffice.org</emphasis> suite is also available without cost for other Linux distributions, Sun Solaris, FreeBSD, Microsoft Windows and Mac OS X under X11. This makes it possible to publish documents which are compatible across many different computer platforms. </para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </section>
+    </tip>
   </section>
-
-  <section>
+  <section id="sn-office-further-information">
     <title>For Further Information</title>
 
     <para>
-      <anchor id='further-information'/>
-    </para>
-
-    <para>
       For more information on using
       <emphasis role='strong'>OpenOffice.org</emphasis>, refer to the
       following documentation and support pages:
@@ -145,13 +129,9 @@
       official project documentation and support site:
     </para>
 
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url='http://live.gnome.org/Planner'>http://live.gnome.org/Planner</ulink>
-        </para>
-      </listitem>
-    </itemizedlist>
+    <para>
+      <ulink url='http://live.gnome.org/Planner'>http://live.gnome.org/Planner</ulink>
+    </para>
 
     <para>
       For more information on using
@@ -159,33 +139,11 @@
       following official project documentation and support site:
     </para>
 
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url='http://www.gnome.org/projects/evolution/'>http://www.gnome.org/projects/evolution/</ulink>
-        </para>
-      </listitem>
-    </itemizedlist>
-    <table>
-      <caption/>
-      <tgroup cols='3'>
-        <colspec colname='xxx1'/>
-        <colspec colname='xxx2'/>
-        <colspec colname='xxx3'/>
-        <tbody>
-          <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Communications'>Previous Page - Communications (Email, IM)</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Multimedia'>Next Page - Playing Multimedia</ulink></para></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
     <para>
-      <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
+      <ulink url='http://www.gnome.org/projects/evolution/'>http://www.gnome.org/projects/evolution/</ulink>
     </para>
   </section>
-</article>
+</chapter>
 
 <!--
 Local variables:


Index: Photos.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Photos.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Photos.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ Photos.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,201 +9,152 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/Photos</title>
-  </articleinfo>
-
-  <section>
-    <title>Managing Photos</title>
+<chapter id="ch-Photos">
+  <title>Managing Photos</title>
+  <para>
+    Most USB-compatible cameras will work automatically with Fedora and
+    require very little configuration. If your digital camera offers a
+    choice of USB connection types, set the camera's USB setting to
+    <emphasis>PTP</emphasis>, or <emphasis>point-to-point</emphasis>
+    mode, before continuing with this tutorial. Consult your camera's
+    user manual to determine if this option is available and how to
+    choose it. If it is not available, the default settings should be
+    sufficient.
+  </para>
+  <section id="sn-connecting-camera">
+    <title>Connecting Your Camera</title>
 
     <para>
-      Most USB-compatible cameras will work automatically with Fedora
-      and require very little configuration. If your digital camera
-      offers a choice of USB connection types, set the camera's USB
-      setting to <emphasis>PTP</emphasis>, or
-      <emphasis>point-to-point</emphasis> mode, before continuing with
-      this tutorial. Consult your camera's user manual to determine if
-      this option is available and how to choose it. If it is not
-      available, the default settings should be sufficient.
+      To properly connect the camera to your Fedora system:
+    </para>
+    <orderedlist numeration='arabic'>
+      <listitem>
+        <para>
+          Make sure your camera is powered off.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Connect a USB cable from the camera to your computer.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          If your camera requires you to select a knob or dial setting
+          before connecting it to a computer, make that selection now.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Power the camera on.
+        </para>
+      </listitem>
+    </orderedlist>
+    <para>
+      After your camera powers on, an informational window should appear
+      on your desktop. If you would like to continue to import photos
+      from the camera, select the <emphasis>Import Photos</emphasis>
+      button. If you decide you do not want to import photos, select the
+      <emphasis>Ignore</emphasis> button. If you do not want to see this
+      dialog each time you connect a camera, you can select the
+      <emphasis>Always perform this action</emphasis> option in
+      conjunction with the <emphasis>Import Photos</emphasis> or
+      <emphasis>Ignore</emphasis> button to make one of the choices
+      permanent.
     </para>
+  </section>
+  <section id="sn-organizing-photos">
+    <title>Organizing and Importing Photos</title>
 
-    <section>
-      <title>Connecting Your Camera</title>
+    <para>
+      After you make your selection, Fedora loads
+      <emphasis>thumbnails</emphasis>, or previews, of the photos from
+      your camera into a new window. From this new window, you can tell
+      Fedora the destination of the imported images and how you want
+      your images organized as it loads them from your camera. In this
+      dialog, you can select and/or deselect photo(s) to import by
+      clicking on the corresponding thumbnail. To select all photos,
+      click any photo and then press the key combination
+      <emphasis role='strong'>[Ctrl]+[A]</emphasis>. To deselect all
+      photos, press
+      <emphasis role='strong'>[Ctrl]+[Shift]+[A]</emphasis>. Once all
+      desired photos for import are selected, click the
+      <emphasis>Import</emphasis> button. To cancel the entire import
+      process, click the <emphasis>Cancel</emphasis> button. For a more
+      detailed explanation of the options available when importing
+      images, see the information below.
+    </para>
+    <tip>
+      <title>What to do if you accidentally disconnect your camera.</title>
+      <para>
+        The camera button allows you to reload the thumbnails in case
+        your camera is accidentally disconnected from the computer. If
+        that happens, Fedora may display an additional dialog returning
+        you to the previous step. It is safe to select
+        <emphasis>Ignore</emphasis> in that dialog, return to this one,
+        and click the camera button again.
+      </para>
+    </tip>
+    <section id="sn-filing-method">
+      <title>Selecting a Filing Method</title>
 
       <para>
-        <anchor id='connecting-camera'/>
+        Use <emphasis>Destination</emphasis> to select a folder in which
+        to keep your photo images. Within a destination folder, you can
+        further organize your photos by date and time, or by any other
+        method you wish. If you enter text into the
+        <emphasis>Film</emphasis> box, Fedora uses this text to label
+        and organize the photos you import.
       </para>
 
       <para>
-        To properly connect the camera to your Fedora system:
-      </para>
-      <orderedlist numeration='arabic'>
-        <listitem>Make sure your camera is powered off. </listitem>
-        <listitem>Connect a USB cable from the camera to your computer. </listitem>
-        <listitem>If your camera requires you to select a knob or dial setting before connecting it to a computer, make that selection now. </listitem>
-        <listitem>Power the camera on. </listitem>
-      </orderedlist>
-      <para>
-        After your camera powers on, an informational window should
-        appear on your desktop. If you would like to continue to import
-        photos from the camera, select the <emphasis>Import
-        Photos</emphasis> button. If you decide you do not want to
-        import photos, select the <emphasis>Ignore</emphasis> button. If
-        you do not want to see this dialog each time you connect a
-        camera, you can select the <emphasis>Always perform this
-        action</emphasis> option in conjunction with the
-        <emphasis>Import Photos</emphasis> or
-        <emphasis>Ignore</emphasis> button to make one of the choices
-        permanent.
+        If you want Fedora to delete the images from your camera after
+        it imports them, select <emphasis>Delete imported images from
+        the camera</emphasis>. If you want it to use the filenames from
+        the camera, select <emphasis>Keep original filenames</emphasis>.
+        If you do not select this box, Fedora automatically numbers your
+        images using the order it imports them, starting with "00001."
       </para>
     </section>
 
-    <section>
-      <title>Organizing and Importing Photos</title>
+    <section id="sn-categorizing-photos">
+      <title>Categorizing Your Photos</title>
 
       <para>
-        <anchor id='organizing-photos'/>
+        The <emphasis>Categories</emphasis> box shows any special
+        category labels you select to mark the photos you import. If you
+        want to select any categories for your photos, click the
+        <emphasis>...</emphasis> button, which makes the category
+        selection dialog appear.
       </para>
 
       <para>
-        After you make your selection, Fedora loads
-        <emphasis>thumbnails</emphasis>, or previews, of the photos from
-        your camera into a new window. From this new window, you can
-        tell Fedora the destination of the imported images and how you
-        want your images organized as it loads them from your camera. In
-        this dialog, you can select and/or deselect photo(s) to import
-        by clicking on the corresponding thumbnail. To select all
-        photos, click any photo and then press the key combination
-        <emphasis role='strong'>[Ctrl]+[A]</emphasis>. To deselect all
-        photos, press
-        <emphasis role='strong'>[Ctrl]+[Shift]+[A]</emphasis>. Once all
-        desired photos for import are selected, click the
-        <emphasis>Import</emphasis> button. To cancel the entire import
-        process, click the <emphasis>Cancel</emphasis> button. For a
-        more detailed explanation of the options available when
-        importing images, see the information below.
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <table>
-            <caption/>
-            <tgroup cols='1'>
-              <colspec colname='xxx1'/>
-              <tbody>
-                <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/idea.png' depth='15'/></imageobject><textobject><phrase>(!)</phrase></textobject></inlinemediaobject> <emphasis role='strong'>What to do if you accidentally disconnect your camera.</emphasis> </para></entry>
-                </row>
-                <row>
-<entry><para> The camera button allows you to reload the thumbnails in case your camera is accidentally disconnected from the computer.  If that happens, Fedora may display an additional dialog returning you to the previous step.  It is safe to select <emphasis>Ignore</emphasis> in that dialog, return to this one, and click the camera button again.</para></entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-        </listitem>
-      </itemizedlist>
-
-      <section>
-        <title>Selecting a Filing Method</title>
-
-        <para>
-          <anchor id='filing-method'/>
-        </para>
-
-        <para>
-          Use <emphasis>Destination</emphasis> to select a folder in
-          which to keep your photo images. Within a destination folder,
-          you can further organize your photos by date and time, or by
-          any other method you wish. If you enter text into the
-          <emphasis>Film</emphasis> box, Fedora uses this text to label
-          and organize the photos you import.
-        </para>
-
-        <para>
-          If you want Fedora to delete the images from your camera after
-          it imports them, select <emphasis>Delete imported images from
-          the camera</emphasis>. If you want it to use the filenames
-          from the camera, select <emphasis>Keep original
-          filenames</emphasis>. If you do not select this box, Fedora
-          automatically numbers your images using the order it imports
-          them, starting with "00001."
-        </para>
-      </section>
-
-      <section>
-        <title>Categorizing Your Photos</title>
-
-        <para>
-          <anchor id='categorizing-photos'/>
-        </para>
-
-        <para>
-          The <emphasis>Categories</emphasis> box shows any special
-          category labels you select to mark the photos you import. If
-          you want to select any categories for your photos, click the
-          <emphasis>...</emphasis> button, which makes the category
-          selection dialog appear.
-        </para>
-
-        <para>
-          To label your images with a category, click the checkbox next
-          to the category name. Select as many as you wish. If you do
-          not see a category name you like, select the
-          <emphasis>New</emphasis> button and enter a new category name
-          to add to the list. If you want to remove a category name
-          permanently from the list, select the category by clicking on
-          its name and then select <emphasis>Delete</emphasis>.
-        </para>
-
-        <para>
-          As you select categories, they appear in the
-          <emphasis>Selected categories</emphasis> box. When you are
-          finished, select <emphasis>OK</emphasis> to save the category
-          names, or <emphasis>Cancel</emphasis> to forget any category
-          selection(s).
-        </para>
+        To label your images with a category, click the checkbox next to
+        the category name. Select as many as you wish. If you do not see
+        a category name you like, select the <emphasis>New</emphasis>
+        button and enter a new category name to add to the list. If you
+        want to remove a category name permanently from the list, select
+        the category by clicking on its name and then select
+        <emphasis>Delete</emphasis>.
+      </para>
 
-        <itemizedlist>
-          <listitem>
-            <table>
-              <caption/>
-              <tgroup cols='1'>
-                <colspec colname='xxx1'/>
-                <tbody>
-                  <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/idea.png' depth='15'/></imageobject><textobject><phrase>(!)</phrase></textobject></inlinemediaobject> <emphasis role='strong'>Selecting a category using a checkbox protects filing choices.</emphasis> </para></entry>
-                  </row>
-                  <row>
-<entry><para> It is easy to accidentally misfile images due to a typing mistake.  By using checkbox selection, images are correctly categorized every time. </para></entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-          </listitem>
-        </itemizedlist>
-        <table>
-          <caption/>
-          <tgroup cols='3'>
-            <colspec colname='xxx1'/>
-            <colspec colname='xxx2'/>
-            <colspec colname='xxx3'/>
-            <tbody>
-              <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Games'>Previous Page - Playing Games</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/SharingDesktop'>Next Page - Sharing Your Desktop</ulink></para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
+      <para>
+        As you select categories, they appear in the <emphasis>Selected
+        categories</emphasis> box. When you are finished, select
+        <emphasis>OK</emphasis> to save the category names, or
+        <emphasis>Cancel</emphasis> to forget any category selection(s).
+      </para>
+      <tip>
+        <title>Selecting a category using a checkbox protects filing choices.</title>
         <para>
-          <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
+          It is easy to accidentally misfile images due to a typing
+          mistake. By using checkbox selection, images are correctly
+          categorized every time.
         </para>
-      </section>
+      </tip>
     </section>
   </section>
-</article>
+</chapter>
 
 <!--
 Local variables:


Index: SharingDesktop.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/SharingDesktop.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SharingDesktop.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ SharingDesktop.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,153 +9,113 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/SharingDesktop</title>
-  </articleinfo>
-
-  <section>
-    <title>Sharing Your Desktop</title>
-
-    <itemizedlist>
-      <listitem>
-        <table>
-          <caption/>
-          <tgroup cols='1'>
-            <colspec colname='xxx1'/>
-            <tbody>
-              <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/attention.png' depth='15'/></imageobject><textobject><phrase>&lt;!></phrase></textobject></inlinemediaobject> <emphasis role='strong'>Use this capability carefully</emphasis> </para></entry>
-              </row>
-              <row>
-<entry><para> Remote desktop sharing can be a serious security risk. It should be turned on only when needed and not left active. </para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      Fedora provides a means to share a user's desktop remotely across
-      the network. This is useful for receiving technical support from a
-      remote location or for demonstrating a desktop feature to another
-      user. You may also find it a useful way to remotely access the
-      files on your desktop from another computer.
-    </para>
-
-    <para>
-      To activate desktop sharing, select <emphasis>System > Preferences
-      > Remote Desktop</emphasis> from the user menu. This opens the
-      <emphasis>Remote Desktop Preferences</emphasis> window:
-    </para>
-
-    <para>
-      <inlinemediaobject>
-        <imageobject>
-          <imagedata fileref='/wiki/Docs/DesktopUserGuide/SharingDesktop?action=AttachFile&amp;do=get&amp;target=remdesktopshare.png'/>
-        </imageobject>
-        <textobject>
-          <phrase>attachment:remdesktopshare.png</phrase>
-        </textobject>
-      </inlinemediaobject>
-    </para>
-
-    <para>
-      This procedure describes the most secure method to share a
-      desktop.
-    </para>
-    <orderedlist numeration='arabic'>
-      <listitem>
-        <para>
-          Under <emphasis>Sharing</emphasis>, check the box
-          <emphasis>Allow other users to view your desktop</emphasis>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Next, check <emphasis>Allow other users to control your
-          desktop</emphasis>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Make a note of the command listed under <emphasis>Users can
-          view your desktop using this command:</emphasis>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Under <emphasis>Security</emphasis>, check the box
-          <emphasis>Ask you for confirmation</emphasis>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Next, check <emphasis>Require the user to enter this
-          password</emphasis> and enter a password.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Finally, click on the <emphasis>Close</emphasis> button.
-        </para>
-      </listitem>
-    </orderedlist>
-    <para>
-      Be sure to inform the person performing remote technical
-      support/viewing the command from step three, as well as the
-      assigned password. When the person connects to your desktop, click
-      on the <emphasis>Yes</emphasis> button when asked for
-      confirmation.
-    </para>
-
-    <para>
-      Once the remote viewing feature is no longer needed, turn off
-      desktop sharing:
-    </para>
-    <orderedlist numeration='arabic'>
-      <listitem>
-        <para>
-          Select <emphasis>System > Preferences > Remote
-          Desktop</emphasis>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Uncheck the <emphasis>Allow other users to view your
-          desktop</emphasis> box
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Click on the <emphasis>Close</emphasis> button.
-        </para>
-      </listitem>
-    </orderedlist>
-    <para>
-      This turns off the remote desktop sharing feature.
-    </para>
-    <table>
-      <caption/>
-      <tgroup cols='3'>
-        <colspec colname='xxx1'/>
-        <colspec colname='xxx2'/>
-        <colspec colname='xxx3'/>
-        <tbody>
-          <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Photos'>Previous Page - Managing Photos</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Customizing'>Next Page - Customizing the Desktop</ulink></para></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <para>
-      <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
-    </para>
-  </section>
-</article>
+<chapter id="ch-Sharing-desktop">
+  <title>Sharing Your Desktop</title>
+  <warning>
+    <title>Use this capability carefully</title>
+
+    <para>
+      Remote desktop sharing can be a serious security risk. It should
+      be turned on only when needed and not left active.
+    </para>
+  </warning>
+  <para>
+    Fedora provides a means to share a user's desktop remotely across
+    the network. This is useful for receiving technical support from a
+    remote location or for demonstrating a desktop feature to another
+    user. You may also find it a useful way to remotely access the files
+    on your desktop from another computer.
+  </para>
+  <para>
+    To activate desktop sharing, select <emphasis>System > Preferences >
+    Remote Desktop</emphasis> from the user menu. This opens the
+    <emphasis>Remote Desktop Preferences</emphasis> window:
+  </para>
+  <figure id="figs-remote-desktop">
+    <title>Remote Desktop Preferences</title>
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="./figs/remdesktopshare.png"
+	  format="PNG"/>
+      </imageobject>
+      <textobject>
+        <phrase>Remote Desktop Preferences</phrase>
+      </textobject>
+    </mediaobject>
+  </figure>
+  <para>
+    This procedure describes the most secure method to share a desktop.
+  </para>
+  <orderedlist numeration='arabic'>
+    <listitem>
+      <para>
+        Under <emphasis>Sharing</emphasis>, check the box
+        <emphasis>Allow other users to view your desktop</emphasis>.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Next, check <emphasis>Allow other users to control your
+        desktop</emphasis>.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Make a note of the command listed under <emphasis>Users can view
+        your desktop using this command:</emphasis>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Under <emphasis>Security</emphasis>, check the box <emphasis>Ask
+        you for confirmation</emphasis>.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Next, check <emphasis>Require the user to enter this
+        password</emphasis> and enter a password.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Finally, click on the <emphasis>Close</emphasis> button.
+      </para>
+    </listitem>
+  </orderedlist>
+  <para>
+    Be sure to inform the person performing remote technical
+    support/viewing the command from step three, as well as the assigned
+    password. When the person connects to your desktop, click on the
+    <emphasis>Yes</emphasis> button when asked for confirmation.
+  </para>
+  <para>
+    Once the remote viewing feature is no longer needed, turn off
+    desktop sharing:
+  </para>
+  <orderedlist numeration='arabic'>
+    <listitem>
+      <para>
+        Select <emphasis>System > Preferences > Remote
+        Desktop</emphasis>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Uncheck the <emphasis>Allow other users to view your
+        desktop</emphasis> box
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Click on the <emphasis>Close</emphasis> button.
+      </para>
+    </listitem>
+  </orderedlist>
+  <para>
+    This turns off the remote desktop sharing feature.
+  </para>
+</chapter>
 
 <!--
 Local variables:


Index: Tour.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Tour.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Tour.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ Tour.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,397 +9,364 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/Tour</title>
-  </articleinfo>
-
-  <section>
-    <title>Tour of the Desktop</title>
+<chapter id="ch-Tour">
+  <title>Tour of the Desktop</title>
+  <para>
+    This chapter introduces the default desktop environment in Fedora.
+    By providing a common terminology for the elements on the desktop,
+    it is easier to explain how to use the desktop throughout this
+    guide.
+  </para>
+  <section id="sn-view-desktop">
+    <title>View of the Default Desktop</title>
 
     <para>
-      This chapter introduces the default desktop environment in Fedora.
-      By providing a common terminology for the elements on the desktop,
-      it is easier to explain how to use the desktop throughout this
-      guide.
+      Upon the initial login into Fedora, you will see
+      <ulink url='/wiki/Docs/DesktopUserGuide/Tour'>default desktop
+      shown here</ulink>:
+    </para>
+    <figure id="figs-fedora-desktop">
+      <title>Default Fedora Desktop</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/fc6desktop6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Default Fedora Desktop</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      The default desktop has three distinct areas. From top to bottom,
+      the areas are:
     </para>
 
-    <section>
-      <title>View of the Default Desktop</title>
-
-      <para>
-        <anchor id='view-desktop'/>
-      </para>
-
-      <para>
-        Upon the initial login into Fedora, you will see
-        <ulink url='/wiki/Docs/DesktopUserGuide/Tour'>default desktop
-        shown here</ulink>:
-      </para>
-
-      <para>
-        <anchor id='default-desktop-png'/>
-        <inlinemediaobject>
-          <imageobject>
-            <imagedata fileref='/wiki/Docs/DesktopUserGuide/Tour?action=AttachFile&amp;do=get&amp;target=fc6desktop6.png'/>
-          </imageobject>
-          <textobject>
-            <phrase>attachment:fc6desktop6.png</phrase>
-          </textobject>
-        </inlinemediaobject>
-      </para>
-
-      <para>
-        The default desktop has three distinct areas. From top to
-        bottom, the areas are:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            The <emphasis>menu panel</emphasis>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <emphasis>desktop area</emphasis>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <emphasis>window list panel</emphasis>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        The layout location of these items can be customized, but the
-        term used for each of them remains the same.
-      </para>
-
-      <para>
-        The menu panel stretches across the top of the screen. It
-        contains three menus and a number of default icons that start
-        software applications. It also provides a clock, volume control
-        applet, and a notification area.
-      </para>
-
-      <para>
-        The desktop area is the screen space between the menu panel and
-        the window list panel. The <emphasis>Computer</emphasis>,
-        <emphasis>Home Directory</emphasis>, and
-        <emphasis>Trash</emphasis> icons are located in the top left
-        corner of this area. Those users more familiar with Microsoft
-        Windows may equate these icons to the <emphasis>My
-        Computer</emphasis>, <emphasis>My Documents</emphasis>, and
-        <emphasis>Recycle Bin</emphasis>, respectively.
-      </para>
-
-      <para>
-        The window list panel is located at the bottom of the screen. It
-        features the <emphasis>Show Desktop</emphasis> icon, running
-        applications as icons, and it gives access to the workplace
-        switcher and the trash.
-      </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          The <emphasis>menu panel</emphasis>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The <emphasis>desktop area</emphasis>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The <emphasis>window list panel</emphasis>
+        </para>
+      </listitem>
+    </itemizedlist>
 
-      <para>
-        The following sections discuss the menu panel, desktop area, and
-        window list panel in further detail.
-      </para>
-    </section>
+    <para>
+      The layout location of these items can be customized, but the term
+      used for each of them remains the same.
+    </para>
 
-    <section>
-      <title>The Menu Panel</title>
+    <para>
+      The menu panel stretches across the top of the screen. It contains
+      three menus and a number of default icons that start software
+      applications. It also provides a clock, volume control applet, and
+      a notification area.
+    </para>
 
-      <para>
-        <anchor id='menu-panel'/>
-      </para>
+    <para>
+      The desktop area is the screen space between the menu panel and
+      the window list panel. The <emphasis>Computer</emphasis>,
+      <emphasis>Home Directory</emphasis>, and
+      <emphasis>Trash</emphasis> icons are located in the top left
+      corner of this area. Those users more familiar with Microsoft
+      Windows may equate these icons to the <emphasis>My
+      Computer</emphasis>, <emphasis>My Documents</emphasis>, and
+      <emphasis>Recycle Bin</emphasis>, respectively.
+    </para>
 
-      <para>
-        <inlinemediaobject>
-          <imageobject>
-            <imagedata fileref='/wiki/Docs/DesktopUserGuide/Tour?action=AttachFile&amp;do=get&amp;target=fc6menupanel3.png'/>
-          </imageobject>
-          <textobject>
-            <phrase>attachment:fc6menupanel3.png</phrase>
-          </textobject>
-        </inlinemediaobject>
-      </para>
+    <para>
+      The window list panel is located at the bottom of the screen. It
+      features the <emphasis>Show Desktop</emphasis> icon, running
+      applications as icons, and it gives access to the workplace
+      switcher and the trash.
+    </para>
 
-      <itemizedlist>
-        <listitem>
-          <para>
-            <emphasis>Applications</emphasis> - The
-            <emphasis>Applications</emphasis> menu contains a variety of
-            icons that start software applications. The icons are
-            ordered by category. It is similar to the Microsoft Windows
-            <emphasis>Start</emphasis> menu.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <emphasis>Places</emphasis> - The
-            <emphasis>Places</emphasis> menu contains a customizable
-            list of directories, <emphasis>mounted volumes</emphasis>,
-            recent documents, and a <emphasis>Search</emphasis>
-            function. Volumes that are mounted may be external USB
-            drives (flash, hard disk, CD, etc.), directories shared
-            across a network, or other media devices such as a portable
-            music player. Read more about this in
-            <ulink url='/wiki/Docs/DesktopUserGuide/Media'>Using
-            Media</ulink>.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <emphasis>System</emphasis> - The
-            <emphasis>System</emphasis> menu contains a variety of
-            items. <emphasis>Log Out</emphasis>,
-            <emphasis>About</emphasis>, and <emphasis>Help</emphasis>
-            are self-explanatory. <emphasis>Lock Screen</emphasis>
-            starts the screen saver or blanks the screen and prevents
-            the desktop from being used until a password is entered.
-            <emphasis>Preferences</emphasis> contains tools for
-            configuring peripherals and the desktop. <emphasis>System
-            Settings</emphasis> also contains configuration tools that
-            are for administrative purposes and usually require root
-            access; that is, when those applications are started, the
-            root password must be entered to continue.
-          </para>
-        </listitem>
-      </itemizedlist>
+    <para>
+      The following sections discuss the menu panel, desktop area, and
+      window list panel in further detail.
+    </para>
+  </section>
+  <section id="sn-menu-panel">
+    <title>The Menu Panel</title>
+    <figure id="figs-menu-panel">
+      <title>Gnome Menu Panel</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/fc6menupanel3.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Gnome Menu Panel</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <emphasis>Applications</emphasis> - The
+          <emphasis>Applications</emphasis> menu contains a variety of
+          icons that start software applications. The icons are ordered
+          by category. It is similar to the Microsoft Windows
+          <emphasis>Start</emphasis> menu.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis>Places</emphasis> - The <emphasis>Places</emphasis>
+          menu contains a customizable list of directories,
+          <emphasis>mounted volumes</emphasis>, recent documents, and a
+          <emphasis>Search</emphasis> function. Volumes that are mounted
+          may be external USB drives (flash, hard disk, CD, etc.),
+          directories shared across a network, or other media devices
+          such as a portable music player. Read more about this in
+          <ulink url='/wiki/Docs/DesktopUserGuide/Media'>Using
+          Media</ulink>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis>System</emphasis> - The <emphasis>System</emphasis>
+          menu contains a variety of items. <emphasis>Log
+          Out</emphasis>, <emphasis>About</emphasis>, and
+          <emphasis>Help</emphasis> are self-explanatory. <emphasis>Lock
+          Screen</emphasis> starts the screen saver or blanks the screen
+          and prevents the desktop from being used until a password is
+          entered. <emphasis>Preferences</emphasis> contains tools for
+          configuring peripherals and the desktop. <emphasis>System
+          Settings</emphasis> also contains configuration tools that are
+          for administrative purposes and usually require root access;
+          that is, when those applications are started, the root
+          password must be entered to continue.
+        </para>
+      </listitem>
+    </itemizedlist>
 
-      <para>
-        In addition to the menus, the menu panel contains a number of
-        icons for common software.
-      </para>
-      <table>
-        <caption/>
-        <tgroup cols='2'>
-          <colspec colname='xxx1'/>
-          <colspec colname='xxx2'/>
-          <tbody>
-            <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Tour?action=AttachFile&amp;do=get&amp;target=redhat-web-browser.png'/></imageobject><textobject><phrase>attachment:redhat-web-browser.png</phrase></textobject></inlinemediaobject></para></entry>
+    <para>
+      In addition to the menus, the menu panel contains a number of
+      icons for common software.
+    </para>
+    <table id="tb-tour-icons">
+      <title>Some Desktop Icons</title>
+      <tgroup cols="2">
+        <colspec colnum="1" colname="Icon"/>
+        <colspec colnum="2" colname='Program'/>
+        <tbody>
+          <row>
+<entry>
+                  <mediaobject><imageobject><imagedata align="center" fileref="./figs/redhat-web-browser.png" format="PNG"/></imageobject></mediaobject>
+                </entry>
 <entry><para><emphasis role='strong'>Mozilla Firefox</emphasis> web browser.</para></entry>
-            </row>
-            <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Tour?action=AttachFile&amp;do=get&amp;target=redhat-email.png'/></imageobject><textobject><phrase>attachment:redhat-email.png</phrase></textobject></inlinemediaobject></para></entry>
+          </row>
+          <row>
+<entry>
+                  <mediaobject><imageobject><imagedata align="center" fileref="./figs/redhat-email-en_US.png" format="PNG"/></imageobject></mediaobject>
+                </entry>
 <entry><para><emphasis role='strong'>Evolution</emphasis> mail client and personal information manager.</para></entry>
-            </row>
-            <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Tour?action=AttachFile&amp;do=get&amp;target=openofficeorg-writer.png'/></imageobject><textobject><phrase>attachment:openofficeorg-writer.png</phrase></textobject></inlinemediaobject></para></entry>
+          </row>
+          <row>
+<entry>
+                  <mediaobject><imageobject><imagedata align="center" fileref="./figs/openofficeorg-writer.png" format="PNG"/></imageobject></mediaobject>
+                </entry>
 <entry><para><emphasis role='strong'>OpenOffice.org Writer</emphasis> is a word processing program.</para></entry>
-            </row>
-            <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Tour?action=AttachFile&amp;do=get&amp;target=openofficeorg-impress.png'/></imageobject><textobject><phrase>attachment:openofficeorg-impress.png</phrase></textobject></inlinemediaobject></para></entry>
+          </row>
+          <row>
+<entry>
+                  <mediaobject><imageobject><imagedata align="center" fileref="./figs/openofficeorg-impress.png" format="PNG"/></imageobject></mediaobject>
+                </entry>
 <entry><para><emphasis role='strong'>OpenOffice.org Impress</emphasis> is for creating and giving presentations.</para></entry>
-            </row>
-            <row>
-<entry><para><inlinemediaobject><imageobject><imagedata fileref='/wiki/Docs/DesktopUserGuide/Tour?action=AttachFile&amp;do=get&amp;target=openofficeorg-calc.png'/></imageobject><textobject><phrase>attachment:openofficeorg-calc.png</phrase></textobject></inlinemediaobject></para></entry>
+          </row>
+          <row>
+<entry>
+                  <mediaobject><imageobject><imagedata align="center" fileref="./figs/openofficeorg-calc.png" format="PNG"/></imageobject></mediaobject>
+                </entry>
 <entry><para><emphasis role='strong'>OpenOffice.org Calc</emphasis> is a spreadsheet tool.</para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <table>
-        <caption/>
-        <tgroup cols='1'>
-          <colspec colname='xxx1'/>
-          <tbody>
-            <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='16' fileref='/wikidata/kindofblue/img/icon-info.png' depth='16'/></imageobject><textobject><phrase>{i}</phrase></textobject></inlinemediaobject> <emphasis role='strong'>Writer</emphasis>, <emphasis role='strong'>Impress</emphasis>, and <emphasis role='strong'>Calc</emphasis> are displayed only if <emphasis>Office and Productivity Tools</emphasis> was selected during installation.  The Add/Remove program application, <emphasis role='strong'>Pirut</emphasis>, can be used to install these office tools at any time. </para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        You can add program icons that start an application to the menu
-        panel. These icons are called <emphasis>launchers</emphasis>.
-        Right-click on the panel, and select <emphasis>Add to
-        Panel</emphasis>.
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+    <note>
+      <title>Office and Productivity Tools</title>
+
+      <para>
+        <emphasis role='strong'>Writer</emphasis>,
+        <emphasis role='strong'>Impress</emphasis>, and
+        <emphasis role='strong'>Calc</emphasis> are displayed only if
+        <emphasis>Office and Productivity Tools</emphasis> was selected
+        during installation. The Add/Remove program application,
+        <emphasis role='strong'>Pirut</emphasis>, can be used to install
+        these office tools at any time.
       </para>
-      <table>
-        <caption/>
-        <tgroup cols='1'>
-          <colspec colname='xxx1'/>
-          <tbody>
-            <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/idea.png' depth='15'/></imageobject><textobject><phrase>(!)</phrase></textobject></inlinemediaobject> There is another way to add an application launcher to the menu panel if the application is already listed in the Applications menu.  Navigate to the application in the Applications menu, right-click on the application, and select <emphasis>Add this launcher to panel</emphasis>. </para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        The appearance of the panel can also be customized. Right-click
-        on the panel and select <emphasis>Properties</emphasis>.
-      </para>
-    </section>
-
-    <section>
-      <title>The Desktop Area</title>
+    </note>
 
+    <para>
+      You can add program icons that start an application to the menu
+      panel. These icons are called <emphasis>launchers</emphasis>.
+      Right-click on the panel, and select <emphasis>Add to
+      Panel</emphasis>.
+    </para>
+    <tip>
+      <title>Alternative</title>
       <para>
-        <anchor id='desktop-area'/>
+        There is another way to add an application launcher to the menu
+        panel if the application is already listed in the Applications
+        menu. Navigate to the application in the Applications menu,
+        right-click on the application, and select <emphasis>Add this
+        launcher to panel</emphasis>.
       </para>
+    </tip>
+    <para>
+      The appearance of the panel can also be customized. Right-click on
+      the panel and select <emphasis>Properties</emphasis>.
+    </para>
+  </section>
+  <section id="sn-desktop-area">
+    <title>The Desktop Area</title>
 
-      <para>
-        Before any additional icons are added to the desktop, the
-        desktop area contains three icons by default:
-      </para>
-      <orderedlist numeration='arabic'>
-        <listitem>
-          <para>
-            <emphasis>Computer</emphasis> - This contains all volumes
-            (or disks) mounted on the computer. These are also listed in
-            the <emphasis>Places</emphasis> menu.
-            <emphasis>Computer</emphasis> is equivalent to <emphasis>My
-            Computer</emphasis> on Microsoft Windows.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <emphasis>Home</emphasis> - This is where the logged-in user
-            stores all files by default, such as music, movies, and
-            documents. There is a different home directory for each
-            user, and by default users cannot access each others' home
-            directories. <emphasis>Home</emphasis> is equivalent to
-            <emphasis>My Documents</emphasis> on Microsoft Windows.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <emphasis>Trash</emphasis> - Deleted files are moved to
-            <emphasis>Trash</emphasis>. Empty <emphasis>Trash</emphasis>
-            by right-clicking the icon and clicking <emphasis>Empty
-            Trash</emphasis>.
-          </para>
-        </listitem>
-      </orderedlist>
-      <table>
-        <caption/>
-        <tgroup cols='1'>
-          <colspec colname='xxx1'/>
-          <tbody>
-            <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wikidata/kindofblue/img/idea.png' depth='15'/></imageobject><textobject><phrase>(!)</phrase></textobject></inlinemediaobject> <emphasis role='strong'>Permanently deleting files</emphasis> </para></entry>
-            </row>
-            <row>
-<entry><para> To permanently delete a file and bypass the file's move to <emphasis>Trash</emphasis>, hold down the <emphasis role='strong'>[Shift]</emphasis> key when deleting the file. </para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        Right-clicking on the desktop presents a menu of actions related
-        to the desktop area. For example, clicking on <emphasis>Change
-        Desktop Background</emphasis> lets you choose a different image
-        or photograph to display on the desktop. This is similar to
-        changing the desktop <emphasis>wallpaper</emphasis> on a
-        Microsoft Windows desktop. It is possible to choose not to have
-        any desktop background.
+    <para>
+      Before any additional icons are added to the desktop, the desktop
+      area contains three icons by default:
+    </para>
+    <orderedlist numeration='arabic'>
+      <listitem>
+        <para>
+          <emphasis>Computer</emphasis> - This contains all volumes (or
+          disks) mounted on the computer. These are also listed in the
+          <emphasis>Places</emphasis> menu.
+          <emphasis>Computer</emphasis> is equivalent to <emphasis>My
+          Computer</emphasis> on Microsoft Windows.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis>Home</emphasis> - This is where the logged-in user
+          stores all files by default, such as music, movies, and
+          documents. There is a different home directory for each user,
+          and by default users cannot access each others' home
+          directories. <emphasis>Home</emphasis> is equivalent to
+          <emphasis>My Documents</emphasis> on Microsoft Windows.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis>Trash</emphasis> - Deleted files are moved to
+          <emphasis>Trash</emphasis>. Empty <emphasis>Trash</emphasis>
+          by right-clicking the icon and clicking <emphasis>Empty
+          Trash</emphasis>.
+        </para>
+      </listitem>
+    </orderedlist>
+    <tip>
+      <title>Permanently deleting files</title>
+
+      <para>
+        To permanently delete a file and bypass the file's move to
+        <emphasis>Trash</emphasis>, hold down the
+        <emphasis role='strong'>[Shift]</emphasis> key when deleting the
+        file.
       </para>
-    </section>
+    </tip>
 
-    <section>
-      <title>The Window List Panel</title>
+    <para>
+      Right-clicking on the desktop presents a menu of actions related
+      to the desktop area. For example, clicking on <emphasis>Change
+      Desktop Background</emphasis> lets you choose a different image or
+      photograph to display on the desktop. This is similar to changing
+      the desktop <emphasis>wallpaper</emphasis> on a Microsoft Windows
+      desktop. It is possible to choose not to have any desktop
+      background.
+    </para>
+  </section>
+  <section id="sn-window-list">
+    <title>The Window List Panel</title>
+    <figure id="figs-window-list">
+      <title>Fedora Window List</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/fc6winlist3.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Fedora Window List</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      The window list panel has three components:
+    </para>
 
-      <para>
-        <anchor id='window-list'/>
-      </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          The Show Desktop button
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The Workspace Switcher
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The Trash icon
+        </para>
+      </listitem>
+    </itemizedlist>
 
-      <para>
-        <inlinemediaobject>
-          <imageobject>
-            <imagedata fileref='/wiki/Docs/DesktopUserGuide/Tour?action=AttachFile&amp;do=get&amp;target=fc6winlist3.png'/>
-          </imageobject>
-          <textobject>
-            <phrase>attachment:fc6winlist3.png</phrase>
-          </textobject>
-        </inlinemediaobject>
-      </para>
+    <para>
+      Clicking on the show desktop button hides all open windows and
+      shows the desktop area. This is useful when the number of open
+      applications windows becomes cluttered. The windows are minimized
+      and can be displayed by clicking on the minimized window in the
+      window list panel.
+    </para>
 
-      <para>
-        The window list panel has three components:
-      </para>
+    <para>
+      Open applications appear as button icons in the middle part of the
+      window list panel; these are the <emphasis>open windows</emphasis>
+      being listed.
+    </para>
 
-      <itemizedlist>
-        <listitem>The Show Desktop button </listitem>
-        <listitem>The Workspace Switcher </listitem>
-        <listitem>The Trash icon </listitem>
-      </itemizedlist>
+    <para>
+      The application window that has <emphasis>focus</emphasis> appears
+      as a depressed button. Usually, this is the application whose
+      window is on top of all the others on the screen. Switch from one
+      running application to another by clicking on the desired
+      application's button in the window list.
+    </para>
 
-      <para>
-        Clicking on the show desktop button hides all open windows and
-        shows the desktop area. This is useful when the number of open
-        applications windows becomes cluttered. The windows are
-        minimized and can be displayed by clicking on the minimized
-        window in the window list panel.
-      </para>
+    <tip>
+      <title>Use the key combination [Alt]+[Tab] to switch between open windows.</title>
 
       <para>
-        Open applications appear as button icons in the middle part of
-        the window list panel; these are the <emphasis>open
-        windows</emphasis> being listed.
+        Holding down the <emphasis role='strong'>[Alt]</emphasis> key
+        while you tap the <emphasis role='strong'>[Tab]</emphasis> key
+        allows you to cycle through all open applications.
       </para>
+    </tip>
 
-      <para>
-        The application window that has <emphasis>focus</emphasis>
-        appears as a depressed button. Usually, this is the application
-        whose window is on top of all the others on the screen. Switch
-        from one running application to another by clicking on the
-        desired application's button in the window list.
-      </para>
-      <table>
-        <caption/>
-        <tgroup cols='1'>
-          <colspec colname='xxx1'/>
-          <tbody>
-            <row>
-<entry><para> <inlinemediaobject><imageobject><imagedata width='16' fileref='/wikidata/kindofblue/img/icon-info.png' depth='16'/></imageobject><textobject><phrase>{i}</phrase></textobject></inlinemediaobject> <emphasis role='strong'>Use the key combination [Alt]+[Tab] to switch between open windows.</emphasis> </para></entry>
-            </row>
-            <row>
-<entry><para> Holding down the <emphasis role='strong'>[Alt]</emphasis> key while you tap the <emphasis role='strong'>[Tab]</emphasis> key allows you to cycle through all open applications. </para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        The workspace switcher is situated on the far right. Workspaces
-        have long been a feature of UNIX and Linux desktop environments.
-        Each workspace provides a separate desktop where applications
-        can be organized. The workspace switcher allows you to switch
-        from one workspace to another. Each workspace has separate
-        desktop areas with a matching window list panel. However, the
-        menu panel and background image is the same on all desktops.
-      </para>
+    <para>
+      The workspace switcher is situated on the far right. Workspaces
+      have long been a feature of UNIX and Linux desktop environments.
+      Each workspace provides a separate desktop where applications can
+      be organized. The workspace switcher allows you to switch from one
+      workspace to another. Each workspace has separate desktop areas
+      with a matching window list panel. However, the menu panel and
+      background image is the same on all desktops.
+    </para>
 
-      <para>
-        The <emphasis>Trash</emphasis> icon on the right end of the
-        window list panel works the same as the
-        <emphasis>Trash</emphasis> icon in the desktop area.
-      </para>
-      <table>
-        <caption/>
-        <tgroup cols='3'>
-          <colspec colname='xxx1'/>
-          <colspec colname='xxx2'/>
-          <colspec colname='xxx3'/>
-          <tbody>
-            <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Login'>Previous Page - Logging into the Desktop</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Media'>Next Page - Using Media</ulink></para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
-      </para>
-    </section>
+    <para>
+      The <emphasis>Trash</emphasis> icon on the right end of the window
+      list panel works the same as the <emphasis>Trash</emphasis> icon
+      in the desktop area.
+    </para>
   </section>
-</article>
+</chapter>
 
 <!--
 Local variables:


Index: Web.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Web.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Web.xml	25 Feb 2007 17:38:39 -0000	1.6
+++ Web.xml	26 Feb 2007 14:47:12 -0000	1.7
@@ -9,110 +9,80 @@
 
 ]>
 
-<article>
-  <articleinfo>
-    <title>Docs/DesktopUserGuide/Web</title>
-  </articleinfo>
-
-  <section>
-    <title>Accessing the Web</title>
+<chapter id="ch-Web">
+  <title>Accessing the Web</title>
+  <para>
+    Fedora uses <emphasis role='strong'>Mozilla Firefox</emphasis> by
+    default to access the World Wide Web (<emphasis>Web</emphasis>).
+    <emphasis role='strong'>Firefox</emphasis> is a multi platform,
+    standards-compliant Web browser.
+  </para>
+  <para>
+    Features of <emphasis role='strong'>Mozilla Firefox</emphasis>
+    include:
+  </para>
+  <itemizedlist>
+    <listitem>
+      <para>
+        Tabbed Browsing: Separate tabs for each Webpage are provided,
+        all within one <emphasis role='strong'>Firefox</emphasis>
+        window.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Extensions and Plugins: Various extensions and plugins are
+        available that support new features, such as search fields
+        directly in the toolbar.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Small and Fast: By focusing on providing an extendable Web
+        browser, <emphasis role='strong'>Firefox</emphasis> is smaller
+        and faster than other browers
+      </para>
+    </listitem>
+  </itemizedlist>
+  <section id="sn-starting-firefox">
+    <title>Starting Firefox</title>
 
     <para>
-      Fedora uses <emphasis role='strong'>Mozilla Firefox</emphasis> by
-      default to access the World Wide Web (<emphasis>Web</emphasis>).
-      <emphasis role='strong'>Firefox</emphasis> is a multi platform,
-      standards-compliant Web browser.
+      <anchor id='starting-firefox'/>
     </para>
 
     <para>
-      Features of <emphasis role='strong'>Mozilla Firefox</emphasis>
-      include:
+      You can start <emphasis role='strong'>Firefox</emphasis> by
+      selecting <emphasis>Applications > Internet > Firefox Web
+      Browser</emphasis> or by using the menu panel icon:
     </para>
+    <figure id="figs-browser-icon">
+      <title>Browser Icon</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/redhat-web-browser.png" format="PNG"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+  </section>
+  <section id="sn-going-furter">
+    <title>Going Further</title>
 
-    <itemizedlist>
-      <listitem>
-        <para>
-          Tabbed Browsing: Separate tabs for each Webpage are provided,
-          all within one <emphasis role='strong'>Firefox</emphasis>
-          window.
-        </para>
-      </listitem>
-      <listitem>Extensions and Plugins: Various extensions and plugins are available that support new features, such as search fields directly in the toolbar. </listitem>
-      <listitem>
-        <para>
-          Small and Fast: By focusing on providing an extendable Web
-          browser, <emphasis role='strong'>Firefox</emphasis> is smaller
-          and faster than other browers
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <section>
-      <title>Starting Firefox</title>
-
-      <para>
-        <anchor id='starting-firefox'/>
-      </para>
-
-      <para>
-        You can start <emphasis role='strong'>Firefox</emphasis> by
-        selecting <emphasis>Applications > Internet > Firefox Web
-        Browser</emphasis> or by using the menu panel icon:
-      </para>
-
-      <para>
-        <inlinemediaobject>
-          <imageobject>
-            <imagedata fileref='/wiki/Docs/DesktopUserGuide/Web?action=AttachFile&amp;do=get&amp;target=firefoxicon.png'/>
-          </imageobject>
-          <textobject>
-            <phrase>attachment:firefoxicon.png</phrase>
-          </textobject>
-        </inlinemediaobject>
-      </para>
-    </section>
-
-    <section>
-      <title>Going Further</title>
-
-      <para>
-        <anchor id='going-further'/>
-      </para>
-
-      <para>
-        <emphasis role='strong'>Firefox</emphasis> has support for
-        different plugins that extend its capabilities. This framework
-        allows anyone to create extensions and plugins.
-      </para>
+    <para>
+      <emphasis role='strong'>Firefox</emphasis> has support for
+      different plugins that extend its capabilities. This framework
+      allows anyone to create extensions and plugins.
+    </para>
 
-      <para>
-        You can find more information on Firefox at:
-      </para>
+    <para>
+      You can find more information on Firefox at:
+    </para>
 
-      <para>
-        <ulink url='http://www.mozilla.org/support/firefox/'>http://www.mozilla.org/support/firefox/</ulink>
-      </para>
-      <table>
-        <caption/>
-        <tgroup cols='3'>
-          <colspec colname='xxx1'/>
-          <colspec colname='xxx2'/>
-          <colspec colname='xxx3'/>
-          <tbody>
-            <row>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Media'>Previous Page - Using Media</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide'>Table of Contents</ulink></para></entry>
-<entry><para><ulink url='/wiki/Docs/DesktopUserGuide/Communications'>Next Page - Communications (Email, IM)</ulink></para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>
-        <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
-      </para>
-    </section>
+    <para>
+      <ulink url='http://www.mozilla.org/support/firefox/'>http://www.mozilla.org/support/firefox/</ulink>
+    </para>
   </section>
-</article>
+</chapter>
 
 <!--
 Local variables:


Index: desktop-user-guide.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/desktop-user-guide.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- desktop-user-guide.xml	25 Feb 2007 17:36:08 -0000	1.5
+++ desktop-user-guide.xml	26 Feb 2007 14:47:12 -0000	1.6
@@ -23,9 +23,73 @@
 
 <!-- Welcome -->
 
+  <xi:include href="./Introduction.xml"
+      xpointer="element(ch-Introduction)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Login -->
+
+  <xi:include href="./Login.xml"
+      xpointer="element(ch-Login)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Tour -->
+
+  <xi:include href="./Tour.xml"
+      xpointer="element(ch-Tour)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Media -->
+
+  <xi:include href="./Media.xml"
+      xpointer="element(ch-Media)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Web -->
+
+  <xi:include href="./Web.xml"
+      xpointer="element(ch-Web)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Communications -->
+
   <xi:include href="./Communications.xml"
       xpointer="element(ch-Communications)"
       xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Office -->
+
+  <xi:include href="./Office.xml" 
+      xpointer="element(ch-Office)" 
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Multimedia -->
+
+  <xi:include href="./Multimedia.xml" 
+      xpointer="element(ch-Multimedia)" 
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Games -->
+
+  <xi:include href="./Games.xml" 
+      xpointer="element(ch-Games)" 
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Photos -->
+  <xi:include href="./Photos.xml"
+      xpointer="element(ch-Photos)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Share Desktop -->
+  <xi:include href="./SharingDesktop.xml"
+      xpointer="element(ch-Sharing-desktop)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- Customizing Desktop -->
+  <xi:include href="./Customizing.xml"
+      xpointer="element(ch-Customizing)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
+
 </book>
 
 <!--




More information about the docs-commits mailing list