desktop-user-guide/FC-6/en_US Communications.xml, 1.9, 1.10 Customizing.xml, 1.4, 1.5 Games.xml, 1.4, 1.5 Introduction.xml, 1.4, 1.5 Login.xml, 1.4, 1.5 Media.xml, 1.4, 1.5 Multimedia.xml, 1.4, 1.5 Office.xml, 1.4, 1.5 Photos.xml, 1.4, 1.5 SharingDesktop.xml, 1.4, 1.5 Tour.xml, 1.4, 1.5 Web.xml, 1.4, 1.5 desktop-user-guide.xml, 1.4, 1.5 doc-entities.xml, 1.2, 1.3

Karsten Wade (kwade) fedora-docs-commits at redhat.com
Sun Feb 25 17:36:11 UTC 2007


Author: kwade

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

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 
	doc-entities.xml 
Log Message:
doing an xmlformat normalization before doing some changes; those changes should now provide a sane diff, as long as I do another format just before committing


Index: Communications.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Communications.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Communications.xml	24 Feb 2007 18:00:25 -0000	1.9
+++ Communications.xml	25 Feb 2007 17:36:08 -0000	1.10
@@ -3,415 +3,449 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd">
 
 <chapter id="ch-Communications">
-    <title>Communications (Email, IM)</title>
+  <title>Communications (Email, IM)</title>
+  <para>
+    Fedora can be used to send electronic mail and communicate in real
+    time with people around the world. By default,
+    <emphasis role='strong'>Evolution</emphasis> is used to send
+    electronic mail (<emphasis>email</emphasis>), and
+    <emphasis role='strong'>Gaim</emphasis> is used to send instant
+    messages (<emphasis>IM</emphasis>).
+  </para>
+  <para>
+    <emphasis role='strong'>Evolution</emphasis> is more than an email
+    program. It is also a <emphasis>personal information
+    manager</emphasis>. You can maintain a calendar, manage a list of
+    tasks, and keep an address book of contacts.
+  </para>
+  <para>
+    <emphasis role='strong'>Gaim</emphasis> is an instant messaging
+    program (<emphasis>client</emphasis>) that can access MSN, AOL,
+    Yahoo!, Jabber, and other IM and chat networks.
+  </para>
+  <note>
+    <title>Accounts must already exist</title>
+
     <para>
-      Fedora can be used to send electronic mail and communicate in real
-      time with people around the world. By default,
-      <emphasis role='strong'>Evolution</emphasis> is used to send
-      electronic mail (<emphasis>email</emphasis>), and
-      <emphasis role='strong'>Gaim</emphasis> is used to send instant
-      messages (<emphasis>IM</emphasis>).
-    </para>
-    <para>
-      <emphasis role='strong'>Evolution</emphasis> is more than an email
-      program. It is also a <emphasis>personal information
-      manager</emphasis>. You can maintain a calendar, manage a list of
-      tasks, and keep an address book of contacts.
-    </para>
-    <para>
-      <emphasis role='strong'>Gaim</emphasis> is an instant messaging
-      program (<emphasis>client</emphasis>) that can access MSN, AOL,
-      Yahoo!, Jabber, and other IM and chat networks.
-    </para>
-    <note>
-	<title>Accounts must already exist</title>
-	<para> <emphasis role='strong'>Gaim</emphasis> requires an existing account on each of the IM networks, created via the normal account creation process.  For example, <emphasis role='strong'>Gaim</emphasis> cannot be used to create a <emphasis role='strong'>Yahoo Instant Messenger</emphasis> account. Instead, visit <ulink url='http://messenger.yahoo.com'>http://messenger.yahoo.com</ulink> to set up the account, then access it using <emphasis role='strong'>Gaim</emphasis>. </para>
-    </note>
+      <emphasis role='strong'>Gaim</emphasis> requires an existing
+      account on each of the IM networks, created via the normal account
+      creation process. For example,
+      <emphasis
+	role='strong'>Gaim</emphasis> cannot be used to create
+      a <emphasis role='strong'>Yahoo Instant Messenger</emphasis>
+      account. Instead, visit
+      <ulink
+	url='http://messenger.yahoo.com'>http://messenger.yahoo.com</ulink>
+      to set up the account, then access it using
+      <emphasis
+	role='strong'>Gaim</emphasis>.
+    </para>
+  </note>
+<!-- In emacs, I used C-c C-q to normalize/indent the paragraph above;
+    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>
+    <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
+      available at:
+    </para>
+
+    <para>
+      <ulink url='http://www.gnome.org/projects/evolution/documentation.shtml'>http://www.gnome.org/projects/evolution/documentation.shtml</ulink>
+    </para>
+
+    <para>
+      To start <emphasis role='strong'>Evolution</emphasis>, select
+      <emphasis>Applications > Internet > Email </emphasis> from the
+      menu panel, or use the <emphasis>application launcher</emphasis>
+      icon from the menu panel:
+    </para>
+
     <para/>
-    <section>
-      <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 available at:
-      </para>
-      <para>
-        <ulink url='http://www.gnome.org/projects/evolution/documentation.shtml'>http://www.gnome.org/projects/evolution/documentation.shtml</ulink>
-      </para>
-      <para>
-        To start <emphasis role='strong'>Evolution</emphasis>, select
-        <emphasis>Applications > Internet > Email </emphasis> from the
-        menu panel, or use the <emphasis>application launcher</emphasis>
-        icon from the menu panel:
-      </para>
-      <para/>
-      <figure id="fig-redhat-email">
-	<title>E-mail Icon</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/redhat-email.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>E-mail Icon</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        Running the software for the first time displays the
-        <emphasis>Evolution Setup Assistant</emphasis> wizard, which is
-        used to configure an initial email account. The first screen
-        displays a welcome message. Click <emphasis>Forward</emphasis>
-        to bring up the next screen, titled
-        <emphasis>Identity</emphasis>.
-      </para>
-      <para/>
-      <para/>
-      <para>
-        <emphasis>Identity</emphasis> is for configuring the initial
-        values relating to personal email accounts. The screen contains
-        fields for required information, including <emphasis>Full
-        Name</emphasis> and <emphasis>Email Address</emphasis>. Beneath
-        this is <emphasis>Optional Information</emphasis>, which has a
-        <emphasis>Reply to</emphasis> value, should the reply address be
-        different to that entered in the <emphasis>Email
-        Address</emphasis>. This area also allows the user to add an
-        <emphasis>Organization</emphasis> name. Once completed, clicking
-        <emphasis>Forward</emphasis> continues to the next screen.
-      </para>
-      <figure id="fig-identity-screen">
-	<title>Identity screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/evol_setup_2a-6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Identity screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        The next screen is <emphasis>Receiving Email</emphasis>, which
-        is for configuring the retrieval settings for the initial email
-        account. The user must choose the type of server from a drop
-        down menu. This information is supplied by your internet service
-        provider (<emphasis>ISP</emphasis>) or email administrator. By
-        default, <emphasis role='strong'>Evolution</emphasis> allows the
-        following to be configured: <emphasis>None</emphasis>,
-        <emphasis>Hula</emphasis>, <emphasis>IMAP</emphasis>,
-        <emphasis>Novell Group<code></code>Wise</emphasis>,
-        <emphasis>POP</emphasis>,
-        <emphasis>Use<code></code>Net</emphasis>, <emphasis>Local
-        Delivery</emphasis>, <emphasis>MH-format</emphasis>,
-        <emphasis>Maildir-format</emphasis>, and <emphasis>mbox
-        spools</emphasis>.
-      </para>
-      <tip>
-	<title>Most popular formats</title>
-	<para>The most popular mail formats are POP and IMAP.</para>
-      </tip>
-      <para/>
-      <figure id="fig-server-type">
-	<title>Server type selection</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/evol_setup_3-6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Server type selection</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        Once an option is selected, other fields become active that need
-        to be considered. Most users require either the POP or IMAP
-        server type to be selected. Selecting one of them brings up
-        fields for <emphasis>Server</emphasis> and
-        <emphasis>Username</emphasis>, as well as security settings.
-        This information is available from the ISP or administrator for
-        the email account.
-      </para>
-      <figure id="fig-recieving-email-screen">
-	<title>Recieving Email Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/evol_setup_4-6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Recieving Email Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        The next screen, <emphasis>Receiving Options</emphasis>, allows
-        further configuration for incoming email.
-        <emphasis>Automatically check for new mail every X
-        minutes</emphasis> polls the server at set intervals.
-        <emphasis>Leave messages on server</emphasis> prevents the mail
-        client from downloading messages and removing them from the
-        server. <emphasis>Disable support for all POP3
-        extensions</emphasis> is only needed in a small number of cases.
-      </para>
-      <figure id="fig-recieving-options-screen">
-	<title>Recieving Options Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/evol_setup_5-6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Recieving Options Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        The <emphasis>Sending Email</emphasis> screen is for configuring
-        servers and settings for outgoing messages. The user may select
-        <emphasis>SMTP</emphasis> or <emphasis>Sendmail</emphasis>;
-        SMTP, or <emphasis>simple mail transport protocol</emphasis>, is
-        most common. <emphasis>Server Configuration</emphasis> requires
-        a hostname under <emphasis>Server</emphasis> and is where
-        potential authentication settings are entered. These settings,
-        when used, are provided by the ISP or administrator for the
-        email account.
-      </para>
-      <figure id="fig-sending-email-screen">
-	<title>Sending Email Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/evol_setup_7-6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Sending Email Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        In this example, the server type is SMTP and the authentication
-        method is PLAIN. The username <emphasis>fcuser</emphasis> is
-        used for server authentication.
-      </para>
-      <figure id="fig-sending-email-screen-2">
-	<title>Sending Email Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/evol_setup_8-6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Sending Email Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        <emphasis>Account Management</emphasis> contains a single field
-        for the user to name the account for easy identification. Often
-        this is a simple description of the email account, such as
-        <emphasis>Work Email</emphasis>.
-      </para>
-      <figure id="fig-account-management">
-	<title>Account Management Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/evol_setup_9-6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Account Management Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        Select a timezone in the <emphasis>Timezone</emphasis> screen.
-      </para>
-      <figure id="fig-timezone">
-	<title>Timezone Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/evol_setup_10-6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Timezone screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        The final screen, <emphasis>Done</emphasis>, indicates that the
-        account setup is complete. Clicking on the
-        <emphasis role='strong'>[Apply]</emphasis> button completes the
-        setup process.
-      </para>
-      <figure id="fig-evol-done">
-	<title>Finished Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/evol_setup_11-6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Finished Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        This completes the initial setup and enters the user into the
-        main <emphasis role='strong'>Evolution</emphasis> mail client.
-      </para>
-      <figure id="fig-evol-main">
-	<title>Evolution Main Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/evol_setup_12-6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Evolution Main Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para/>
-    </section>
-    <section>
-      <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
-        <emphasis role='strong'>Gaim</emphasis>, refer to:
-      </para>
-      <para>
-        <ulink url='http://gaim.sourceforge.net/documentation.php'>http://gaim.sourceforge.net/documentation.php</ulink>
-      </para>
-      <para>
-        To start and configure <emphasis role='strong'>Gaim</emphasis>,
-        select <emphasis>Applications > Internet > Internet
-        Messenger</emphasis> from the menu panel. Starting
-        <emphasis role='strong'>Gaim</emphasis> for the first time goes
-        directly into the <emphasis>Accounts</emphasis> configuration:
-      </para>
-      <para/>
-      <figure id="fig-gaim-account">
-	<title>Gaim Accounts Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/Gaim_accounts_1.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Gaim Accounts Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        Click on the <emphasis role='strong'>[Add]</emphasis> button to
-        bring up the <emphasis>Add Account</emphasis> window:
-      </para>
-      <figure id="fig-gaim-add-account">
-	<title>Gaim Add Account Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/Gaim_accounts_2.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Gaim Add Account Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        In the <emphasis>Add Account</emphasis> window, under
-        <emphasis role='strong'>Login Options</emphasis>, click on the
-        right side of the <emphasis>Protocol</emphasis> dropdown menu to
-        show the available protocols. In this example,
-        <emphasis>AIM/ICQ</emphasis> is selected.
-      </para>
-      <figure id="fig-gaim-add-account-2">
-	<title>Gaim Add Account Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/Gaim_accounts_3.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Gaim Add Account Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        Enter details for the selected account, including
-        <emphasis>Screen name</emphasis>, <emphasis>Password</emphasis>,
-        and <emphasis>Alias</emphasis>. Select <emphasis>Remember
-        password</emphasis> if desired. Click on the
-        <emphasis role='strong'>[Save]</emphasis> button to add the
-        account to the account list.
-      </para>
-      <figure id="fig-gaim-add-account-3">
-	<title>Gaim Add Account Screen</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/Gaim_accounts_4.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Gaim Add Account Screen</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        Once the account is added, the <emphasis>Accounts</emphasis>
-        windows displays the new account:
-      </para>
-      <figure id="fig-gaim-accounts-list">
-	<title>Gaim Accounts List</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/Gaim_accounts_5.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Gaim Accounts List</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        The <emphasis>Accounts</emphasis> windows also displays the next
-        time <emphasis role='strong'>Gaim</emphasis> is launched. Repeat
-        this procedure for each account to be added.
-      </para>
-      <para/>
-    </section>
-    <section>
-      <title>Using Gaim</title>
-      <para>
-        <anchor id='using-gaim'/>
-      </para>
+    <figure id="fig-redhat-email">
+      <title>E-mail Icon</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/redhat-email.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>E-mail Icon</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      Running the software for the first time displays the
+      <emphasis>Evolution Setup Assistant</emphasis> wizard, which is
+      used to configure an initial email account. The first screen
+      displays a welcome message. Click <emphasis>Forward</emphasis> to
+      bring up the next screen, titled <emphasis>Identity</emphasis>.
+    </para>
+
+    <para/>
+
+    <para/>
+
+    <para>
+      <emphasis>Identity</emphasis> is for configuring the initial
+      values relating to personal email accounts. The screen contains
+      fields for required information, including <emphasis>Full
+      Name</emphasis> and <emphasis>Email Address</emphasis>. Beneath
+      this is <emphasis>Optional Information</emphasis>, which has a
+      <emphasis>Reply to</emphasis> value, should the reply address be
+      different to that entered in the <emphasis>Email
+      Address</emphasis>. This area also allows the user to add an
+      <emphasis>Organization</emphasis> name. Once completed, clicking
+      <emphasis>Forward</emphasis> continues to the next screen.
+    </para>
+    <figure id="fig-identity-screen">
+      <title>Identity screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/evol_setup_2a-6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Identity screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      The next screen is <emphasis>Receiving Email</emphasis>, which is
+      for configuring the retrieval settings for the initial email
+      account. The user must choose the type of server from a drop down
+      menu. This information is supplied by your internet service
+      provider (<emphasis>ISP</emphasis>) or email administrator. By
+      default, <emphasis role='strong'>Evolution</emphasis> allows the
+      following to be configured: <emphasis>None</emphasis>,
+      <emphasis>Hula</emphasis>, <emphasis>IMAP</emphasis>,
+      <emphasis>Novell Group<code></code>Wise</emphasis>,
+      <emphasis>POP</emphasis>,
+      <emphasis>Use<code></code>Net</emphasis>, <emphasis>Local
+      Delivery</emphasis>, <emphasis>MH-format</emphasis>,
+      <emphasis>Maildir-format</emphasis>, and <emphasis>mbox
+      spools</emphasis>.
+    </para>
+    <tip>
+      <title>Most popular formats</title>
       <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.
+        The most popular mail formats are POP and IMAP.
       </para>
-      <figure id="fig-gaim-buddylist">
-	<title>Gaim Buddylist</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="./figs/Gaim_accounts_6.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Gaim Buddylist</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>
-        All 9 supported protocols are available at the same time within
-        <emphasis role='strong'>Gaim</emphasis>.
+    </tip>
+    <para/>
+    <figure id="fig-server-type">
+      <title>Server type selection</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/evol_setup_3-6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Server type selection</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      Once an option is selected, other fields become active that need
+      to be considered. Most users require either the POP or IMAP server
+      type to be selected. Selecting one of them brings up fields for
+      <emphasis>Server</emphasis> and <emphasis>Username</emphasis>, as
+      well as security settings. This information is available from the
+      ISP or administrator for the email account.
+    </para>
+    <figure id="fig-recieving-email-screen">
+      <title>Recieving Email Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/evol_setup_4-6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Recieving Email Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      The next screen, <emphasis>Receiving Options</emphasis>, allows
+      further configuration for incoming email. <emphasis>Automatically
+      check for new mail every X minutes</emphasis> polls the server at
+      set intervals. <emphasis>Leave messages on server</emphasis>
+      prevents the mail client from downloading messages and removing
+      them from the server. <emphasis>Disable support for all POP3
+      extensions</emphasis> is only needed in a small number of cases.
+    </para>
+    <figure id="fig-recieving-options-screen">
+      <title>Recieving Options Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/evol_setup_5-6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Recieving Options Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      The <emphasis>Sending Email</emphasis> screen is for configuring
+      servers and settings for outgoing messages. The user may select
+      <emphasis>SMTP</emphasis> or <emphasis>Sendmail</emphasis>; SMTP,
+      or <emphasis>simple mail transport protocol</emphasis>, is most
+      common. <emphasis>Server Configuration</emphasis> requires a
+      hostname under <emphasis>Server</emphasis> and is where potential
+      authentication settings are entered. These settings, when used,
+      are provided by the ISP or administrator for the email account.
+    </para>
+    <figure id="fig-sending-email-screen">
+      <title>Sending Email Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/evol_setup_7-6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Sending Email Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      In this example, the server type is SMTP and the authentication
+      method is PLAIN. The username <emphasis>fcuser</emphasis> is used
+      for server authentication.
+    </para>
+    <figure id="fig-sending-email-screen-2">
+      <title>Sending Email Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/evol_setup_8-6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Sending Email Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      <emphasis>Account Management</emphasis> contains a single field
+      for the user to name the account for easy identification. Often
+      this is a simple description of the email account, such as
+      <emphasis>Work Email</emphasis>.
+    </para>
+    <figure id="fig-account-management">
+      <title>Account Management Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/evol_setup_9-6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Account Management Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      Select a timezone in the <emphasis>Timezone</emphasis> screen.
+    </para>
+    <figure id="fig-timezone">
+      <title>Timezone Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/evol_setup_10-6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Timezone screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      The final screen, <emphasis>Done</emphasis>, indicates that the
+      account setup is complete. Clicking on the
+      <emphasis role='strong'>[Apply]</emphasis> button completes the
+      setup process.
+    </para>
+    <figure id="fig-evol-done">
+      <title>Finished Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/evol_setup_11-6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Finished Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      This completes the initial setup and enters the user into the main
+      <emphasis role='strong'>Evolution</emphasis> mail client.
+    </para>
+    <figure id="fig-evol-main">
+      <title>Evolution Main Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/evol_setup_12-6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Evolution Main Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para/>
+  </section>
+  <section>
+    <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
+      <emphasis role='strong'>Gaim</emphasis>, refer to:
+    </para>
+
+    <para>
+      <ulink url='http://gaim.sourceforge.net/documentation.php'>http://gaim.sourceforge.net/documentation.php</ulink>
+    </para>
+
+    <para>
+      To start and configure <emphasis role='strong'>Gaim</emphasis>,
+      select <emphasis>Applications > Internet > Internet
+      Messenger</emphasis> from the menu panel. Starting
+      <emphasis role='strong'>Gaim</emphasis> for the first time goes
+      directly into the <emphasis>Accounts</emphasis> configuration:
+    </para>
+
+    <para/>
+    <figure id="fig-gaim-account">
+      <title>Gaim Accounts Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_1.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Gaim Accounts Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      Click on the <emphasis role='strong'>[Add]</emphasis> button to
+      bring up the <emphasis>Add Account</emphasis> window:
+    </para>
+    <figure id="fig-gaim-add-account">
+      <title>Gaim Add Account Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_2.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Gaim Add Account Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      In the <emphasis>Add Account</emphasis> window, under
+      <emphasis role='strong'>Login Options</emphasis>, click on the
+      right side of the <emphasis>Protocol</emphasis> dropdown menu to
+      show the available protocols. In this example,
+      <emphasis>AIM/ICQ</emphasis> is selected.
+    </para>
+    <figure id="fig-gaim-add-account-2">
+      <title>Gaim Add Account Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_3.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Gaim Add Account Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      Enter details for the selected account, including <emphasis>Screen
+      name</emphasis>, <emphasis>Password</emphasis>, and
+      <emphasis>Alias</emphasis>. Select <emphasis>Remember
+      password</emphasis> if desired. Click on the
+      <emphasis role='strong'>[Save]</emphasis> button to add the
+      account to the account list.
+    </para>
+    <figure id="fig-gaim-add-account-3">
+      <title>Gaim Add Account Screen</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_4.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Gaim Add Account Screen</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      Once the account is added, the <emphasis>Accounts</emphasis>
+      windows displays the new account:
+    </para>
+    <figure id="fig-gaim-accounts-list">
+      <title>Gaim Accounts List</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_5.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Gaim Accounts List</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      The <emphasis>Accounts</emphasis> windows also displays the next
+      time <emphasis role='strong'>Gaim</emphasis> is launched. Repeat
+      this procedure for each account to be added.
+    </para>
+
+    <para/>
+  </section>
+  <section>
+    <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.
+    </para>
+    <figure id="fig-gaim-buddylist">
+      <title>Gaim Buddylist</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="./figs/Gaim_accounts_6.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase>Gaim Buddylist</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+    <para>
+      All 9 supported protocols are available at the same time within
+      <emphasis role='strong'>Gaim</emphasis>.
     </para>
     <tip>
       <title>Not all features supported</title>
-      <para><emphasis role='strong'>Gaim</emphasis> does not support
-	features of all included protocols. <emphasis
-	  role='strong'>Gaim</emphasis> is useful for chatting via text
-	across 9 different IM protocols, but not all the features in
-	each IM system are supported.  For example, video is not fully
-	supported at this time.</para>
+      <para>
+        <emphasis role='strong'>Gaim</emphasis> does not support
+        features of all included protocols.
+        <emphasis
+	  role='strong'>Gaim</emphasis> is useful for
+        chatting via text across 9 different IM protocols, but not all
+        the features in each IM system are supported. For example, video
+        is not fully supported at this time.
+      </para>
     </tip>
-    </section>
-  </chapter>
+  </section>
+</chapter>
 
 <!--
 Local variables:


Index: Customizing.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Customizing.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Customizing.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ Customizing.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,6 +18,7 @@
 
   <section>
     <title>Customizing the Desktop</title>
+
     <para>
       It is possible to customize the <emphasis>look and feel</emphasis>
       of your desktop in several ways. All of the graphical elements of
@@ -26,25 +28,32 @@
       elements, designed to give a common look and to fit together, and
       bundled for the desktop.
     </para>
+
     <para/>
+
     <section>
       <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>
+
       <para>
         The default theme is Clearlooks. Fedora Core 6 comes with many
         other themes.
       </para>
+
       <para>
         To change the desktop theme, choose <emphasis>System >
         Preferences > Theme</emphasis>. The <emphasis>Theme
         Preferences</emphasis> window appears:
       </para>
+
       <para>
         <inlinemediaobject>
           <imageobject>
@@ -55,13 +64,17 @@
           </textobject>
         </inlinemediaobject>
       </para>
+
       <para/>
     </section>
+
     <section>
       <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
@@ -71,6 +84,7 @@
         add your own images by clicking <emphasis>Add
         Wallpaper</emphasis>.
       </para>
+
       <para>
         To set a color or gradient, select <emphasis>No
         Wallpaper</emphasis>. Then change the color under
@@ -89,11 +103,14 @@
       </table>
       <para/>
     </section>
+
     <section>
       <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
@@ -102,6 +119,7 @@
         <emphasis>Forward</emphasis> and <emphasis>Back</emphasis>
         buttons.
       </para>
+
       <para>
         To change this, double-click on <emphasis>Computer</emphasis> on
         the desktop, click <emphasis>Edit</emphasis> and then
@@ -111,7 +129,9 @@
         click on the box next to the text <emphasis>Always open in
         browser windows</emphasis>.
       </para>
+
       <para/>
+
       <para></para>
       <table>
         <caption/>
@@ -127,6 +147,7 @@
         </tgroup>
       </table>
       <para/>
+
       <para>
         <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
       </para>


Index: Games.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Games.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Games.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ Games.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,6 +18,7 @@
 
   <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.
@@ -27,15 +29,19 @@
       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>
+
     <para/>
+
     <para/>
   </section>
 
   <section>
     <title>Brief Description of Each Game</title>
+
     <para>
       <anchor id='description-game'/>
     </para>
@@ -112,7 +118,9 @@
       For information about using these games, refer to the individual
       <emphasis>Help > Contents</emphasis> menu within each game.
     </para>
+
     <para/>
+
     <para></para>
     <table>
       <caption/>
@@ -130,6 +138,7 @@
       </tgroup>
     </table>
     <para/>
+
     <para>
       <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
     </para>


Index: Introduction.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Introduction.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Introduction.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ Introduction.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,11 +18,13 @@
 
   <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>
@@ -36,12 +39,16 @@
       </listitem>
       <listitem>How to customize your new Fedora desktop </listitem>
     </itemizedlist>
+
     <para/>
+
     <section>
       <title>About this Document</title>
+
       <para>
         <anchor id='about-document'/>
       </para>
+
       <para>
         Volunteer contributors from the Fedora Documentation Project
         created this guide, and many others, for each release of Fedora.
@@ -49,20 +56,26 @@
         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>
+
       <para/>
+
       <para></para>
       <table>
         <caption/>
@@ -80,7 +93,9 @@
         </tgroup>
       </table>
       <para/>
+
       <para/>
+
       <para>
         <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
       </para>


Index: Login.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Login.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Login.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ Login.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,6 +18,7 @@
 
   <section>
     <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
@@ -29,10 +31,12 @@
       <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>
@@ -43,6 +47,7 @@
         </textobject>
       </inlinemediaobject>
     </para>
+
     <para>
       To login, type your username into the horizontal field containing
       a blinking black bar (the <emphasis>cursor</emphasis>). Next,
@@ -50,6 +55,7 @@
       type your password into the same field you typed your username,
       then press the <emphasis role='strong'>[Enter]</emphasis> key.
     </para>
+
     <itemizedlist>
       <listitem>
         <table>
@@ -101,7 +107,9 @@
         </table>
       </listitem>
     </itemizedlist>
+
     <para/>
+
     <para>
       After a correct username and password are entered, the login
       screen will be replaced by the <emphasis>splash screen</emphasis>.
@@ -109,12 +117,16 @@
       Fedora 6 desktop. Congratulations! The computer is now ready for
       use.
     </para>
+
     <para/>
+
     <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
@@ -128,6 +140,7 @@
         privileges, that help maintain your computer system. One example
         of a system account is the Xscreensaver program.
       </para>
+
       <itemizedlist>
         <listitem>
           <table>
@@ -143,6 +156,7 @@
           </table>
         </listitem>
       </itemizedlist>
+
       <itemizedlist>
         <listitem>
           <table>
@@ -158,6 +172,7 @@
           </table>
         </listitem>
       </itemizedlist>
+
       <para>
         Administrative accounts are accounts with elevated privileges,
         such as the <emphasis>root</emphasis> account, that enable the
@@ -170,6 +185,7 @@
         <ulink url='/wiki/Docs/Drafts/AdministrationGuide'>Fedora
         Administration Guide</ulink>.
       </para>
+
       <itemizedlist>
         <listitem>
           <table>
@@ -188,13 +204,17 @@
           </table>
         </listitem>
       </itemizedlist>
+
       <para/>
     </section>
+
     <section>
       <title>I Cannot Login: HELP!</title>
+
       <para>
         <anchor id='cannot-login'/>
       </para>
+
       <para>
         Recovering or replacing a password for a user account is not
         hard, but it is beyond the scope of this guide. For an
@@ -205,7 +225,9 @@
         <ulink url='/wiki/Docs/Drafts/AdministrationGuide/UserAccounts'>password
         recovery</ulink>.
       </para>
+
       <para/>
+
       <para></para>
       <table>
         <caption/>
@@ -223,6 +245,7 @@
         </tgroup>
       </table>
       <para/>
+
       <para>
         <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
       </para>


Index: Media.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Media.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Media.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ Media.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,22 +18,28 @@
 
   <section>
     <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>
+
     <para/>
+
     <section>
       <title>Understanding</title>
+
       <para>
         <anchor id='understanding'/>
       </para>
+
       <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.
       </para>
+
       <itemizedlist>
         <listitem>
           <table>
@@ -51,6 +58,7 @@
           </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
@@ -58,28 +66,37 @@
         Volume</emphasis> or <emphasis>Eject</emphasis>, depending on
         what type of media you are using.
       </para>
+
       <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>
+
       <para/>
     </section>
+
     <section>
       <title>Writing CDs or DVDs</title>
+
       <para>
         <anchor id='writing-media'/>
       </para>
+
       <para>
         Fedora includes support for writing to CDs and DVDs. To write to
         a CD or DVD:
@@ -114,17 +131,22 @@
       </orderedlist>
       <para/>
     </section>
+
     <section>
       <title>Using a USB Drive</title>
+
       <para>
         <anchor id='usb-drive'/>
       </para>
+
       <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>
+
       <para/>
+
       <para></para>
       <table>
         <caption/>
@@ -142,6 +164,7 @@
         </tgroup>
       </table>
       <para/>
+
       <para>
         <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
       </para>


Index: Multimedia.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Multimedia.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Multimedia.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ Multimedia.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,12 +18,15 @@
 
   <section>
     <title>Playing Multimedia (Music & Video)</title>
+
     <para>
       Fedora includes several tools for viewing video and listening to
       audio. Access sound and video applications through the
       <emphasis>Applications > Sound & Video</emphasis> menu.
     </para>
+
     <para/>
+
     <para>
       By default, Fedora provides four applications for audio and video:
     </para>
@@ -66,29 +70,38 @@
       </tgroup>
     </table>
     <para/>
+
     <para/>
+
     <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 & Video > CD
         Player</emphasis>.
       </para>
+
       <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
@@ -118,18 +131,23 @@
         </tgroup>
       </table>
       <para/>
+
       <para>
         The <emphasis>Sound Juicer Manual</emphasis> is available in the
         application, by going through <emphasis>Help >
         Contents</emphasis>.
       </para>
+
       <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
@@ -139,19 +157,24 @@
         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>
+
       <para/>
     </section>
+
     <section>
       <title>Playing Videos</title>
+
       <para>
         <anchor id='playing-videos'/>
       </para>
+
       <para>
         The <emphasis role='strong'>Totem Movie Player</emphasis> can
         play a variety of videos. Found at <emphasis>Applications >
@@ -161,17 +184,22 @@
         <emphasis>Totem Movie Player Manual</emphasis> is accessed
         through the <emphasis>Help > Contents</emphasis> menu.
       </para>
+
       <para/>
     </section>
+
     <section>
       <title>Fedora Project's Approach to Multimedia Support</title>
+
       <para>
         <anchor id='approach-multimedia'/>
       </para>
+
       <para>
         The Fedora Project encourages the use of open formats in place
         of restricted ones.
       </para>
+
       <para>
         Fedora includes complete support for many freely-distributable
         formats. These are the Ogg media format, Vorbis audio, Theora
@@ -180,13 +208,17 @@
         license restrictions. They provide powerful and flexible
         alternatives to more popular, restricted formats such as MP3.
       </para>
+
       <para/>
     </section>
+
     <section>
       <title>MP3, DVD, and Other Excluded Multimedia</title>
+
       <para>
         <anchor id='excluded_multimedia'/>
       </para>
+
       <para>
         Fedora cannot include support for MP3 or DVD video playback or
         recording. MP3 formats are patented, and the patent holders have
@@ -201,6 +233,7 @@
         <emphasis role='strong'>Real<code></code>Networks
         Real<code></code>Player</emphasis>.
       </para>
+
       <para>
         While other MP3 options may be available for Fedora, Fluendo now
         offers an MP3 plugin that is properly licensed for end users.
@@ -209,40 +242,53 @@
         plugin for licensing reasons, but Fluendo offers one solution to
         playing MP3 in Fedora.
       </para>
+
       <para/>
     </section>
+
     <section>
       <title>For Further Information</title>
+
       <para>
         <anchor id='further-information'/>
       </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>
         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>
         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>
         For more information on Fluendo, visit Fluendo's website at
       </para>
+
       <para>
         <ulink url='http://www.fluendo.com'>http://www.fluendo.com</ulink>
       </para>
+
       <para/>
+
       <para></para>
       <table>
         <caption/>
@@ -260,6 +306,7 @@
         </tgroup>
       </table>
       <para/>
+
       <para>
         <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
       </para>


Index: Office.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Office.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Office.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ Office.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,6 +18,7 @@
 
   <section>
     <title>Office Tools</title>
+
     <para>
       Office productivity tools are available in the base Fedora
       installation. This group of office tools include presentation,
@@ -24,8 +26,11 @@
       available through <emphasis>Applications > Office</emphasis> or as
       icons on the menu bar.
     </para>
+
     <para/>
+
     <para/>
+
     <para>
       The office tools available are:
     </para>
@@ -77,11 +82,14 @@
       </tgroup>
     </table>
     <para/>
+
     <section>
       <title>OpenOffice.org Applications</title>
+
       <para>
         <anchor id='ooo-applications'/>
       </para>
+
       <para>
         With
         <emphasis role='strong'>Open<code></code>Office.org</emphasis>,
@@ -108,20 +116,24 @@
         </tgroup>
       </table>
       <para/>
+
       <para/>
     </section>
   </section>
 
   <section>
     <title>For Further Information</title>
+
     <para>
       <anchor id='further-information'/>
     </para>
+
     <para>
       For more information on using
       <emphasis role='strong'>Open<code></code>Office.org</emphasis>,
       refer to the following documentation and support pages:
     </para>
+
     <itemizedlist>
       <listitem>
         <para>
@@ -139,13 +151,17 @@
         </para>
       </listitem>
     </itemizedlist>
+
     <para/>
+
     <para></para>
+
     <para>
       For more information on using
       <emphasis role='strong'>Planner</emphasis>, refer to the following
       official project documentation and support site:
     </para>
+
     <itemizedlist>
       <listitem>
         <para>
@@ -153,13 +169,17 @@
         </para>
       </listitem>
     </itemizedlist>
+
     <para/>
+
     <para></para>
+
     <para>
       For more information on using
       <emphasis role='strong'>Evolution</emphasis>, refer to the
       following official project documentation and support site:
     </para>
+
     <itemizedlist>
       <listitem>
         <para>
@@ -167,7 +187,9 @@
         </para>
       </listitem>
     </itemizedlist>
+
     <para/>
+
     <para></para>
     <table>
       <caption/>
@@ -185,6 +207,7 @@
       </tgroup>
     </table>
     <para/>
+
     <para>
       <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
     </para>


Index: Photos.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Photos.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Photos.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ Photos.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,6 +18,7 @@
 
   <section>
     <title>Managing Photos</title>
+
     <para>
       Most USB-compatible cameras will work automatically with Fedora
       and require very little configuration. If your digital camera
@@ -27,12 +29,16 @@
       this option is available and how to choose it. If it is not
       available, the default settings should be sufficient.
     </para>
+
     <para/>
+
     <section>
       <title>Connecting Your Camera</title>
+
       <para>
         <anchor id='connecting-camera'/>
       </para>
+
       <para>
         To properly connect the camera to your Fedora system:
       </para>
@@ -55,13 +61,17 @@
         <emphasis>Ignore</emphasis> button to make one of the choices
         permanent.
       </para>
+
       <para/>
     </section>
+
     <section>
       <title>Organizing and Importing Photos</title>
+
       <para>
         <anchor id='organizing-photos'/>
       </para>
+
       <para>
         After you make your selection, Fedora loads
         <emphasis>thumbnails</emphasis>, or previews, of the photos from
@@ -80,6 +90,7 @@
         more detailed explanation of the options available when
         importing images, see the information below.
       </para>
+
       <itemizedlist>
         <listitem>
           <table>
@@ -98,12 +109,16 @@
           </table>
         </listitem>
       </itemizedlist>
+
       <para/>
+
       <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,
@@ -112,6 +127,7 @@
           <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
@@ -121,13 +137,17 @@
           automatically numbers your images using the order it imports
           them, starting with "00001."
         </para>
+
         <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
@@ -135,6 +155,7 @@
           <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
@@ -144,6 +165,7 @@
           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
@@ -151,6 +173,7 @@
           names, or <emphasis>Cancel</emphasis> to forget any category
           selection(s).
         </para>
+
         <itemizedlist>
           <listitem>
             <table>
@@ -169,7 +192,9 @@
             </table>
           </listitem>
         </itemizedlist>
+
         <para/>
+
         <para></para>
         <table>
           <caption/>
@@ -187,6 +212,7 @@
           </tgroup>
         </table>
         <para/>
+
         <para>
           <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
         </para>


Index: SharingDesktop.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/SharingDesktop.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SharingDesktop.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ SharingDesktop.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,6 +18,7 @@
 
   <section>
     <title>Sharing Your Desktop</title>
+
     <itemizedlist>
       <listitem>
         <table>
@@ -35,6 +37,7 @@
         </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
@@ -42,12 +45,15 @@
       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/>
+
     <para>
       <inlinemediaobject>
         <imageobject>
@@ -58,6 +64,7 @@
         </textobject>
       </inlinemediaobject>
     </para>
+
     <para>
       This procedure describes the most secure method to share a
       desktop.
@@ -106,6 +113,7 @@
       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:
@@ -132,7 +140,9 @@
     <para>
       This turns off the remote desktop sharing feature.
     </para>
+
     <para/>
+
     <para></para>
     <table>
       <caption/>
@@ -150,6 +160,7 @@
       </tgroup>
     </table>
     <para/>
+
     <para>
       <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
     </para>


Index: Tour.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Tour.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Tour.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ Tour.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,23 +18,29 @@
 
   <section>
     <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>
+
     <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>
@@ -45,10 +52,12 @@
           </textobject>
         </inlinemediaobject>
       </para>
+
       <para>
         The default desktop has three distinct areas. From top to
         bottom, the areas are:
       </para>
+
       <itemizedlist>
         <listitem>
           <para>
@@ -66,16 +75,19 @@
           </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>,
@@ -86,23 +98,29 @@
         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>
+
       <para>
         The following sections discuss the menu panel, desktop area, and
         window list panel in further detail.
       </para>
+
       <para/>
     </section>
+
     <section>
       <title>The Menu Panel</title>
+
       <para>
         <anchor id='menu-panel'/>
       </para>
+
       <para>
         <inlinemediaobject>
           <imageobject>
@@ -113,6 +131,7 @@
           </textobject>
         </inlinemediaobject>
       </para>
+
       <itemizedlist>
         <listitem>
           <para>
@@ -155,6 +174,7 @@
           </para>
         </listitem>
       </itemizedlist>
+
       <para>
         In addition to the menus, the menu panel contains a number of
         icons for common software.
@@ -220,13 +240,17 @@
         The appearance of the panel can also be customized. Right-click
         on the panel and select <emphasis>Properties</emphasis>.
       </para>
+
       <para/>
     </section>
+
     <section>
       <title>The Desktop Area</title>
+
       <para>
         <anchor id='desktop-area'/>
       </para>
+
       <para>
         Before any additional icons are added to the desktop, the
         desktop area contains three icons by default:
@@ -283,13 +307,17 @@
         Microsoft Windows desktop. It is possible to choose not to have
         any desktop background.
       </para>
+
       <para/>
     </section>
+
     <section>
       <title>The Window List Panel</title>
+
       <para>
         <anchor id='window-list'/>
       </para>
+
       <para>
         <inlinemediaobject>
           <imageobject>
@@ -300,14 +328,17 @@
           </textobject>
         </inlinemediaobject>
       </para>
+
       <para>
         The window list panel has three components:
       </para>
+
       <itemizedlist>
         <listitem>The Show Desktop button </listitem>
         <listitem>The Workspace Switcher </listitem>
         <listitem>The Trash icon </listitem>
       </itemizedlist>
+
       <para>
         Clicking on the show desktop button hides all open windows and
         shows the desktop area. This is useful when the number of open
@@ -315,11 +346,13 @@
         minimized and can be displayed by clicking on the minimized
         window in the window list panel.
       </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>
+
       <para>
         The application window that has <emphasis>focus</emphasis>
         appears as a depressed button. Usually, this is the application
@@ -350,12 +383,15 @@
         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>
+
       <para/>
+
       <para></para>
       <table>
         <caption/>
@@ -373,6 +409,7 @@
         </tgroup>
       </table>
       <para/>
+
       <para>
         <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
       </para>


Index: Web.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/Web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Web.xml	24 Feb 2007 17:05:01 -0000	1.4
+++ Web.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.docbook.org/xml/4.4/docbookx.dtd" [
 
 <!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
@@ -17,16 +18,19 @@
 
   <section>
     <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>
@@ -44,17 +48,22 @@
         </para>
       </listitem>
     </itemizedlist>
+
     <para/>
+
     <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>
@@ -65,25 +74,33 @@
           </textobject>
         </inlinemediaobject>
       </para>
+
       <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>
         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>
+
       <para/>
+
       <para></para>
       <table>
         <caption/>
@@ -101,6 +118,7 @@
         </tgroup>
       </table>
       <para/>
+
       <para>
         <ulink url='/wiki/CategoryDocumentation'>CategoryDocumentation</ulink>
       </para>


Index: desktop-user-guide.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/desktop-user-guide.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- desktop-user-guide.xml	24 Feb 2007 16:30:02 -0000	1.4
+++ desktop-user-guide.xml	25 Feb 2007 17:36:08 -0000	1.5
@@ -15,7 +15,7 @@
 <!-- &FDP-INFO; -->
 
 <!-- Generated info file  -->
-  
+
   <xi:include href="fdp-info.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
@@ -23,10 +23,9 @@
 
 <!-- Welcome -->
 
-    <xi:include href="./Communications.xml"
+  <xi:include href="./Communications.xml"
       xpointer="element(ch-Communications)"
       xmlns:xi="http://www.w3.org/2001/XInclude" />
-
 </book>
 
 <!--


Index: doc-entities.xml
===================================================================
RCS file: /cvs/docs/desktop-user-guide/FC-6/en_US/doc-entities.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- doc-entities.xml	24 Feb 2007 16:16:29 -0000	1.2
+++ doc-entities.xml	25 Feb 2007 17:36:08 -0000	1.3
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
 <!DOCTYPE entities SYSTEM "../../../docs-common/common/entities/entities.dtd">
+
 <entities>
   <title>Local entities for Desktop User Guide</title>
   <group name="Document revision markings">
@@ -17,7 +19,8 @@
     </entity>
     <entity name="DOCID">
       <comment>Document ID</comment>
-      <text><use entity="DOCNAME"/>-<use entity="DOCVERSION"/> (<use
+      <text>
+        <use entity="DOCNAME"/>-<use entity="DOCVERSION"/> (<use
 	  entity="DOCDATE"/>)</text>
     </entity>
   </group>




More information about the Fedora-docs-commits mailing list