Don't requires entities here

2004-09-13  Rodney Dawes  <dobey@novell.com>

	* xmldocs.make: Don't requires entities here

	* C/Makefile.am: Add new figures to the list of images
	Generate versioned xml/omf files based on $(BASE_VERSION)
	Fix up CLEANFILES to include the stuff we generate

	* C/POTFILES.in:
	* C/apx-*.xml:
	* C/config-*.xml:
	* C/evolution-1.5-C.omf:
	* C/evolution-1.5.xml:
	* C/legal.xml:
	* C/menuref.xml:
	* C/preface.xml:
	* C/topic.dat:
	* C/usage-*.xml:
	Remove all of these files from CVS

	* C/evolution-C.omf:
	* C/evolution.xml:
	Add these files to replace the removed files above

	* C/figure/*_a.(png|gif): Add new screenshots

svn path=/trunk/; revision=27253

1 files changed, 0 insertions, 1106 deletions

diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
deleted file mode 100644
index 95182747ec..0000000000
--- a/help/C/config-prefs.xml
+++ /dev/null
@@ -1,1106 +0,0 @@
-<chapter id="config-prefs">
-
-      <title>Advanced Configuration</title>
-      <para>
-        Perhaps your mail server has changed names.  Perhaps you've
-        grown tired of a certain layout for your appointments.
-        Whatever the reason, you want to change your
-        Evolution settings.  This chapter
-        will tell you how to do just that.
-      </para>
-      <para>
-        You can reach the Evolution settings window 
-        by choosing <menuchoice>
-        <guimenu>Tools</guimenu>
-        <guimenuitem>Settings</guimenuitem></menuchoice>, no matter
-        where you are in Evolution. On the left half of the settings
-        window is a column, similar to the Evolution shortcut bar,
-        which lets you choose which portion of Evolution to
-        customize. The right half of the window is where you'll make
-        your actual changes.
-      </para>
-
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-mail-fig">
-	<title>Changing Mail Settings</title>
-	<screenshot>
-	  <screeninfo>Changing Mail Settings</screeninfo>
-	  <mediaobject><imageobject><imagedata fileref="figures/config-mail" format="PNG" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-
-  <para>
-    There are six items you can customize. From top to bottom, they
-    are:
-    <variablelist>
-      <varlistentry>
-	<term><guiicon>Mail Accounts</guiicon></term>
-	<listitem>
-	  <para>
-             Add or change information about your email
-             accounts: the servers to which you connect, the way you
-             download mail, your password authentication mode, and so
-             forth. This is the most complex item in the list, and is
-             covered in <xref linkend="config-prefs-mail-identity"/>.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term><guiicon>Autocompletion</guiicon></term>
-	<listitem>
-	  <para>
-            Set the contact groups to be used when completing email
-            addresses in the message composer.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term><guiicon>Mail Preferences</guiicon></term>
-	<listitem>
-	  <para>
-             These are overall mail reading preferences: display
-             settings, notification options, security, and so
-            forth. Settings that vary per-account are in the Mail
-            Accounts tool, described in <xref
-            linkend="config-prefs-mail-identity"/>, but most of the
-            mail settings are here.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term><guiicon>Composer Preferences</guiicon></term>
-	<listitem>
-	  <para>
-             Settings for the way that you use the mail composer:
-             shortcuts, signatures, spelling, and so forth. One fun
-             feature here is the ability to substitute graphical
-             smiley-faces for "emoticons" such as :) that many people
-             use in email. This tool is covered in <xref
-             linkend="config-prefs-mail-composer"/>.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term><guiicon>Calendar and Tasks</guiicon></term>
-	<listitem>
-	  <para>
-             Here, you can set the way the calendar behaves, including
-             your time zone and the length of your work-week.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term><guiicon>Certificates</guiicon></term>
-	<listitem>
-	  <para>
-            Certificate handling for S/MIME security systems.
-          </para>
-	</listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </para>
-  <para>
-    Previous versions of Evolution included directory servers, folder
-    settings, and Exchange delegation in the settings tool. Directory
-    servers can now be set up as contacts groups in the
-    <guilabel>Contacts</guilabel> tool, you can change folder settings
-    in the folder right-click menu, and Exchange delegation is
-    available in the <guimenu>Actions</guimenu> menu of the
-    <guilabel>Exchange</guilabel> tool.
-  </para>
-
-   <sect1 id="config-prefs-mail-identity">
-      <title>Working with Mail Accounts</title> 
-      <para>
-          Evolution allows you to maintain multiple accounts, or
-        identities.  When you are writing an email
-         message, you can which account to use by selecting from the
-         drop-down list next to the <guilabel>From</guilabel> entry in
-         the message composer.
-       </para>
-
-       <para>
-         Clicking <guilabel>Send/Receive</guilabel> will check all
-       mail sources that are not disabled. If you don't want to check
-       mail for a given account, select it
-         in the <guilabel>Mail Accounts</guilabel> tab and click the
-         <guilabel>Disable</guilabel> button.
-       </para>
-       
-      <para>
-         To add a new account, click <guilabel>Add</guilabel>
-         to open the mail configuration assistant. To alter an
-         existing identity, select it in the
-         <interface>Preferences</interface> window, and then click
-         <guilabel>Edit</guilabel> to open the account editor
-         dialog.
-      </para>
-
-     <para>
-         The account editor dialog has six sections:
- 
-         <variablelist>
-
-	  <varlistentry> 
-	    <term><guilabel>Identity</guilabel></term>
-           <listitem>
-	    <para>
-              Here, enter the name and email address for this 
-              account. You may also choose a default signature to
-              insert into messages sent from this account.
-            </para>
-	  </listitem>
-	  </varlistentry>
-
-          <varlistentry> 
-          <term><guilabel>Receiving Mail</guilabel></term>
-          <listitem>
-	    <para>
-             Select the way you will be getting mail: you may
-             download mail from a server (<link
-             linkend="pop">POP</link>), read and keep it on the
-             server (Microsoft Exchange, Novell GroupWise, or <link
-             linkend="imap">IMAP</link>), or read it from files
-             that already exist on your desktop computer.  Your server 
-            require you to use a Secure Socket Layer (SSL) connection.
-            You may select <guilabel>Always</guilabel>,
-            <guilabel>Whenever Possible</guilabel>, or
-            <guilabel>Never</guilabel> as your SSL choice. If one
-            doesn't work, try another.
-        
-          <note id="config-arbitrary-port">
-            <title>Specifying Port Numbers</title>
-            <para>
-              Your system administrator may ask you to connect to a specific port on
-              a mail server. To specify which port you use, just type a colon and
-              the port number after the server name. For example, to connect to port
-              143 on the server smtp.omniport.com, you would enter
-              as
-              <userinput>
-                smtp.omniport.com:143
-              </userinput> as the server name.
-            </para>
-          </note>
-
-        </para>
-      </listitem>
-    </varlistentry>
-    
-    <varlistentry> 
-    <term><guilabel>Receiving Options</guilabel></term>
-           <listitem>
-	    <para>
-              Here, decide whether you'd like to check for mail
-              automatically and how often, as well as other message
-              retrieval options.
-
-              <variablelist>
-                <varlistentry>
-                   <term>If you chose POP:</term>
-                   <listitem>
-                     <para>
-                   <itemizedlist>
-			  <listitem>
-			    <para><guilabel>Checking for new mail:</guilabel> If you would
-	                     like Evolution
-	                     to check for new mail automatically,
-	                     check the box and select a frequency in
-	                     minutes.
-                           </para>
-			  </listitem>
-
-			  <listitem>
-			    <para>
-                             <guilabel>Leave messages on server:</guilabel> If you'd like to store
-	                      copies of your mail on the server, check
-	                      this option.
-                           </para>
-			  </listitem>
-		
-			
-                           <listitem>
-                             <para><guilabel>Disable support for all
-                             POP3 extensions:</guilabel> Some email
-                             servers refuse to work with the extended
-                             POP3 command set; select this item to
-                             have Evolution use a more limited set of
-                             interactions with the server. If your
-                             server periodically drops your
-                             connection, this option may help.
-                           </para>
-			  </listitem>
-	               </itemizedlist>
-                      </para>
-		    </listitem>
-                  </varlistentry> 
-
-                <varlistentry>
-                   <term>If you chose Microsoft Exchange:</term>
-                   <listitem>
-                     <para>
-
-	    <itemizedlist> <listitem>
-		<para><guilabel>Checking for new mail</guilabel>: If you would like
-                Evolution to check for new mail automatically, check
-                the box and select a frequency in minutes.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-                  <guilabel>Global Catalog server name</guilabel>: enter the name of your
-                  Global Catalog server to create a folder for your
-                  organization's Global Address List.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para><guilabel>Limit number of Responses</guilabel>: Select a maximum number
-		of results for an address search. Lowering the maximum
-		number the load on your system and on your
-                network. Most servers will not send more than 1000
-                results, regardless of the value you select here.
-		  </para>
-	      </listitem>
-
-	      <listitem>
-		<para><guilabel>Mailbox Name</guilabel>: Enter your mailbox name.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-                <guilabel>OWA Path</guilabel>: Enter the path used with Outlook Web Access on your server.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-                  <guilabel>Public Folder Server</guilabel>: Enter the name of your public
-                  folder server, if it differs from your Exchange server.
-		</para>
-	      </listitem>
-	      <listitem>
-		<para>
-                  <guilabel>Apply Filters to new messages in Inbox on this
-                  server</guilabel>: check this box if you wish to apply filters
-                  to this account.
-		</para>
-	      </listitem>
-	    </itemizedlist>                       
-                     </para>
-                   </listitem>
-                  </varlistentry> 
-
-                <varlistentry>
-                   <term>If you chose IMAP:</term>
-                   <listitem>
-                     <para>
-                      
-         <itemizedlist>
-	  <listitem>
-	    <para><guilabel>Checking for new mail</guilabel>: If you would like
-	    Evolution to check for new mail
-	    automatically, check the box and select a frequency in
-	    minutes.  
-            </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>If you want Evolution
-	    to check for new messages in <emphasis>all</emphasis> your
-	    IMAP folders, make sure the <guilabel>Check for new
-	    messages in all folders</guilabel> box is selected.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para><guilabel>Show only subscribed folders</guilabel>: Check this box if you
-	    have more folders in your IMAP view than you want to
-	    read.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-              <guilabel>Override server-supplied namespace</guilabel>: If you like, enter a
-              specific directory where your server stores mail for
-              you.  Typical values are "mail" and "Mail."  For more
-              information about how to use IMAP mail, see <xref
-              linkend="usage-mail-subscriptions"/>.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para><guilabel>Apply filters to new messages in INBOX on this
-	    server</guilabel>: If you'd like your filters to work on this
-            account, check this box.
-          </para>
-	  </listitem>
-	</itemizedlist>
-                     </para>
-                   </listitem>
-                  </varlistentry> 
-
-                <varlistentry>
-                   <term>If you chose GroupWise:</term>
-                   <listitem>
-                     <para>
-                      
-         <itemizedlist>
-	  <listitem>
-	    <para><guilabel>Checking for new mail</guilabel>: If you would like
-	    Evolution to check for new mail
-	    automatically, check the box and select a frequency in
-	    minutes.  
-            </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>If you want Evolution
-            to check for new messages in all your GroupWise folders,
-            make sure the <guilabel>Check for new messages in all
-            folders</guilabel> box is selected.</para>
-	  </listitem>
-
-
-	  <listitem>
-	    <para><guilabel>Apply filters to new messages in INBOX on this
-	    server</guilabel>: If you'd like your filters to work on this
-            account, check this box.
-          </para>
-	  </listitem>
-
-
-	  <listitem>
-	    <para><guilabel>Automatically synchronize remote mail
-            locally</guilabel>: Download all mail immediately, instead of waiting
-            until you try to open the message to check it. This
-            setting will make Evolution slower at first, but faster
-            after the download. Leaving it unchecked means that
-            Evolution will take longer to display each additional
-            message, but will not waste time trying to download every
-            single message if you can tell from the subjects that you
-            do not need to read them all.
-          </para>
-	  </listitem>
-
-
-	  <listitem>
-	    <para><guilabel>Address Book and Calendar: Post Office
-            Agent SOAP Port</guilabel>: If your post office agent uses
-            a SOAP port other than the default, enter it here. The
-            SOAP port is what allows Evolution to access the GroupWise
-            address book and calendar. Your system administrator will
-            know the port. If there are not many Linux users in your
-            organization, you may also need to request that the SOAP
-            service be enabled.
-          </para>
-	  </listitem>
-
-	</itemizedlist>
-                     </para>
-                   </listitem>
-                  </varlistentry> 
-
-             
-                  </variablelist>  
-     </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Sending Mail</guilabel></term>
-           <listitem>
-	    <para>
-              In this section, you will choose and configure a method
-              for sending mail.  You may choose <link
-              linkend="smtp">SMTP</link>, Microsoft Exchange (if
-              you have installed the Evolution Connector for Microsoft
-              Exchange) or <link
-              linkend="sendmail">sendmail</link>.
-             </para>
-             <para>
-               If you choose Exchange or Sendmail, you're done with
-               this tab. SMTP offers you a choice of hostname,
-               connection security level, and authentication type,
-               which you will recognize as similar to those for
-               IMAP and POP servers in the <guilabel>Receiving
-               Mail</guilabel> tab.
-             </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Defaults</guilabel></term>
-           <listitem>
-	    <para>
-              Here, you can decide where this account will store the
-              messages that it has sent, and the messages that you
-              save as drafts. If you wish to revert to the "factory"
-              settings, click the <guilabel>Restore
-            Defaults</guilabel> button.
-            </para>
-            <para>
-              If you wish to send someone a copy of every message from
-              this account, check the box labeled <guilabel>Always
-              carbon-copy (Cc) to:</guilabel> or <guilabel>Always
-              blind carbon-copy (Bcc) to:</guilabel>, and enter one or
-              more addresses.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Security</guilabel></term>
-           <listitem>
-	    <para>
-              In this section, you will set the security options for
-              this account. If you use encryption, enter your PGP
-              key id (see <xref linkend="encryption"/> for more
-              information) and select among the four options below to
-            determine key and signature handling.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect1>
-  
-    <sect1 id="config-prefs-mail">
-      <title>Mail Preferences</title>
-      <para>
-        The <guilabel>Mail Preferences</guilabel> tool lets you choose how
-        to display citations, how long to wait before marking a
-        message as read, and other mail display settings. There are
-        three categories of settings: General, HTML Mail, and
-        Colors.
-      </para>
-      <para>
-        For information on individual email account settings, see <xref
-        linkend="config-prefs-mail-identity" />.
-      </para>
-
-      <sect2 id="config-prefs-mail-general">
-        <title>General Mail Settings</title>
-
-      <para>
-        In the <guilabel>General</guilabel> tab, your options are:
-     <variablelist>
-       <varlistentry>
-         <term><guilabel>Message Fonts</guilabel></term>
-         <listitem>
-           <para>
-             Normally, Evolution will use the same fonts as other
-             GNOME applications. To choose different fonts, uncheck
-             the box <guilabel>Use the same fonts as other
-           applications</guilabel> and select one font for standard typefaces and 
-           a second for monospace, or terminal, display.
-           </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-         <term><guilabel>Message Display</guilabel></term>
-         <listitem>
-           <para>
-             These three settings handle the way messages appear to
-             you. 
-             <variablelist>
-               <varlistentry>
-                 <term><guilabel>Mark Messages as Read...</guilabel></term>
-                 <listitem>
-                   <para> 
-                   Normally, Evolution will mark a message as read as soon
-                   as it is displayed. If you prefer, you may set this to
-                   happen only after a delay, or disable it entirely and
-                   mark messages as read only when you choose to do so.
-                 </para>
-                 </listitem>
-               </varlistentry>
-           
-               <varlistentry>
-                 <term><guilabel>Default Character Encoding</guilabel></term>
-                 <listitem>
-                   <para>
-                     This setting allows you to select character
-                     interpretation sets so that Evolution can display
-                     different alphabets.  If you are not sure, pick
-                     Unicode (UTF-8), which will work for a large
-                     number of languages and character sets.
-                   </para>
-                 </listitem>
-               </varlistentry>
-           
-               <varlistentry>
-                 <term><guilabel>Highlight Quotations</guilabel></term>
-                 <listitem>
-                   <para>
-                     Choose a color to highlight quotations from other
-                     messages.
-                   </para>
-                 </listitem>
-               </varlistentry>
-             </variablelist>
-           </para>
-         </listitem>
-       </varlistentry>
-       
-       <varlistentry>
-         <term><guilabel>Deleting Mail</guilabel></term>
-         <listitem>
-           <para>
-             Here, choose whether to delete messages automatically
-             when quitting Evolution, and whether you wish to
-             explicitly confirm the final deletion of messages.
-           </para>
-         </listitem>
-       </varlistentry>
-           
-       <varlistentry>
-         <term><guilabel>New Mail Notification</guilabel></term>
-         <listitem>
-           <para>
-              Evolution can alert you to the arrival of new mail with
-             a beep or by playing a sound file. Choose your alert
-             noise, or select none, as you wish.
-           </para>
-         </listitem>
-       </varlistentry>
-     </variablelist>
-   </para>
- </sect2>
-
- <sect2 id="mail-prefs-html">
-   <title>HTML Mail Preferences</title>
-
-   <para>
-     The options in the <guilabel>HTML Mail</guilabel> tab are:
-   <variablelist>
-    
-
-       <varlistentry>
-         <term><guilabel>Show animated images</guilabel></term>
-         <listitem>
-           <para>
-             Turn animation on or off here.
-           </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-         <term><guilabel>Prompt when sending HTML messages to contacts that don't want them</guilabel></term>
-         <listitem>
-           <para>
-             Some people do not like HTML mail, and you can set
-             Evolution to warn you. This warning will appear only
-             when you send HTML mail to people in your contacts 
-             who are listed as disliking HTML.
-           </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-         <term><guilabel>Loading Image</guilabel></term>
-         <listitem>
-           <para>
-             You can embed a image in an email and have it load only
-             when the message arrives. However, spammers can use image loading
-             patterns to confirm "live" addresses and invade your
-             privacy. You may elect never to load images
-             automatically, to load images only if the sender is in
-             your contacts, or always load images.
-           </para>
-           <para>
-             If you have chosen not to load images automatically, you
-             can choose to see the images in one message at a time by selecting <menuchoice>
-             <guimenu>View</guimenu><guisubmenu>Message Display</guisubmenu>
-             <guimenuitem>Load Images</guimenuitem></menuchoice>.
-           </para>
-         </listitem>
-       </varlistentry>
-
-     </variablelist>
-   </para>
-   <para>
-     The <guilabel>Colors</guilabel> tab lets you select different
-   color labels for individual messages. You can return to the default
-   settings by clicking the <guilabel>Restore Defaults</guilabel>
-   button.
- </para>
-</sect2>
-<sect2 id="mail-prefs-colors">
-  <title>Mail Color Preferences</title>
-  <para>
-    The Mail Color preferences tool lets you select color labels for
-    different kinds of messages.  Click a color to change the color, or
-    change the label associated with that color.
-  </para>
-</sect2>
- 
-
-<sect2 id="mail-prefs-headers">
-  <title>Mail Header Preferences</title>
-  <para>
-    The headers on an incoming message are the information about the
-    message that isn't the content of the message itself: the sender,
-    the time it was sent, and so forth.  Check the boxes here to show
-    or hide different amounts of information about the messages you read.
-  </para>
-</sect2>
- 
-
- 
-
-<sect2 id="mail-prefs-junk">
-  <title>Junk Mail Preferences</title>
-  <para>
-    There are only two items here: <guilabel>Check Incoming Mail for
-  Junk</guilabel> and <guilabel>Include Remote Tests.</guilabel>
-  Checking for junk mail uses the SpamAssassin tool with trainable
-  bayesian filters. It also includes online tests, like checking for
-  blacklisted message senders and ISPs. Online tests can make
-  filtering slower, but more accurate. Check the boxes here to choose
-  your mail filtering method.
-  </para>
-</sect2>
- 
-
-</sect1>
-
-
-    <sect1 id="config-prefs-mail-composer">
-      <title>Composer Preferences</title>
-      <para>
-        There are three  tabs of settings you can change for the
-        message composer. The <guilabel>General</guilabel> tab covers shortcuts and
-        assorted behavior, and the other two control signatures and
-        spell checking.  In the <guilabel>General</guilabel> tab, you can set:
-
-         <variablelist>
-
-	  <varlistentry>
-	    <term>Default Behavior</term>
-	    <listitem>
-	      <para>
-                 Choose how you will normally forward and reply
-                 messages, what character set they will use, whether
-                 they will be in HTML, and whether that HTML can
-                 contain smiley face images.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Alerts</term>
-	    <listitem>
-	      <para>
-                 There are two optional alerts here:
-                 <variablelist>
-	         <varlistentry>
-		    <term><guilabel>Prompt when sending messages with an empty subject line</guilabel></term>
-		    <listitem>
-		      <para>
-			 The composer will warn you if you try to send a
-			 message without a subject.
-		       </para>
-		    </listitem>
-		  </varlistentry>
-
-		  <varlistentry>
-		    <term><guilabel>Prompt when sending messages with only Bcc recipients defined</guilabel></term>
-		    <listitem>
-		      <para>
-			 The composer will warn you if you try to send a
-			 message that has only <guilabel>Bcc</guilabel>
-			 recipients. This is important because some mail
-			 servers will fail to honor blind carbon copy if you
-			 do not have at least one recipient that is visible to
-			 all readers.
-		       </para>
-		    </listitem>
-		  </varlistentry>
-	      </variablelist>
-               </para>
-	    </listitem>
-	  </varlistentry>
-      </variablelist>
-    </para>
-
-     <para>
-         The signature editor allows you to create several different
-         signatures in plain text or in HTML, and to specify which of
-         them will be added to emails you create in the message
-         composer.  If you prefer to use an alternate signature or
-         none at all, you can select it from the mail composer itself.
-    </para>
-    <para>
-      To choose a spell-checking language, select it here.  Note that
-      you must install the gnome-spell package, available through Red
-      Carpet, for spell-checking to be available in
-      Evolution. Alternate dictionaries are also available through
-      Red Carpet and are detected automatically if you have installed
-       them. 
-      To have the composer automatically check your spelling while you
-      type, check the box labeled <guilabel>Check spelling while I type.</guilabel>
-    </para>
-    <para>
-      You can check the spelling of messages by selecting
-      <menuchoice><guimenu>Edit</guimenu><guimenuitem>Spell Check
-      Document</guimenuitem></menuchoice>. 
-  </para>
-</sect1>
-
-
-    <sect1 id="config-prefs-cal">
-       <title>Calendar and Tasks Settings</title>
-       <para>
-          The calendar configuration tool has two tabs
-          <guilabel>General</guilabel> and
-          <guilabel>Display</guilabel>, and is illustrated in <xref
-          linkend="config-prefs-cal-fig"/>.
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-cal-fig">
-	<title>Calendar Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>Calendar Configuration</screeninfo>
-	  <mediaobject><imageobject><imagedata fileref="figures/config-cal" format="PNG" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-        </para>
-
-      <para>
-        The General tab lets you set the
-        following:
-        <variablelist>
-	  <varlistentry>
-	    <term><guilabel>Time zone</guilabel></term>
-	    <listitem>
-	      <para>
-		The city you're located in, to judge your time zone.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Time format</guilabel></term>
-	    <listitem>
-	      <para>You may choose between twelve-hour (AM/PM) and
-	      twenty-four hour time formats here by clicking the
-	      appropriate radio button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Week Starts</guilabel></term>
-	    <listitem>
-	      <para>Select the day you wish to be displayed as the first in each week.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Day Begins</guilabel></term>
-	    <listitem>
-	      <para>
-                For Evolution, a normal work day begins at 9 AM and
-                ends at 5PM. You can select your preferred hours to
-                make sure that all your events are displayed properly.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Day Ends</guilabel></term>
-	    <listitem>
-	      <para>
-		Set the end of a normal workday.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Alerts</guilabel></term>
-	    <listitem>
-	      <para>
-		If you'd like to be warned before you delete any
-		appointment, or to have a reminder automatically
-		appear for each event, select the check boxes here.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-
-      <para>
-	The Display tab lets you choose how
-	your appointments and tasks will appear in your calendar.
-      </para>
-      <para>The display properties you can set are:
-
-	<variablelist>
-	  <varlistentry>
-	    <term><guilabel>Time divisions</guilabel></term>
-	    <listitem>
-              <para>
-                Sets the time increments shown as fine lines on the
-                daily view in the calendar.
-              </para>
-            </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Show appointment end times in week and month views</guilabel></term>
-	    <listitem>
-	      <para>
-		If there is space, Evolution will show the end
-		times in the week and month views for each
-		appointment.
-              </para>
-            </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Compress weekends in month view</guilabel></term>
-	    <listitem>
-	      <para>
-		If checked, your weekends will be shown in one box,
-		instead of one for each day in the month view.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Show week numbers in date navigator</guilabel></term>
-	    <listitem>
-              <para>
-		This will show the week numbers next to the respective
-		weeks in the calendar.
-	      </para>
-            </listitem>
-	  </varlistentry>
-
-	 <varlistentry>
-	   <term><guilabel>Tasks due today</guilabel></term>
-	    <listitem>
-	      <para>
-                Select the color for tasks due today.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Overdue tasks</guilabel></term>
-	    <listitem>
-	      <para>
-		Choose the color for overdue tasks.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Hide Completed Tasks</guilabel></term>
-	    <listitem>
-	      <para>
-                Check this box to have completed tasks hidden after a
-                period of time measured in days, hours,
-                or minutes.  If you leave the box unchecked,
-                completed tasks will remain in your task list, marked
-                as complete.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-  </sect1>
-  <sect1 id="config-prefs-contact">
-    <title>Directory Servers</title>
-    <para>
-       Autocompletion is available in the main settings tool. 
-      The other major contact configuration task is creating new
-      directory servers or remote contacts groups. 
-    </para>
-      
-      <para>
-        To add a new group of contacts, either local or remote, do the following:
-    </para>
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-              Go to the contacts tool by clicking the
-              <guilabel>Contacts</guilabel> button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              Select <menuchoice><guimenu>New</guimenu> <guimenuitem>Contacts Group</guimenuitem></menuchoice>.
-	    </para>
-	  </listitem>
-          <listitem>
-            <para>
-              Select a name and location for the contact group. The name
-              is for display only.  </para>
-
-            </listitem>
-
-            <listitem>
-              <para>
-                Click <guilabel>Forward</guilabel>.  If the contact
-              group is stored locally, then you don't have to
-              provide any more information. Click
-              <guilabel>OK</guilabel> and you are done.
-              </para>
-            </listitem>
-
-
-	  <listitem>
-
-	    <para>
-              If you are creating an <link
-              linkend="ldap">LDAP</link> server, enter the server information
-            as requested by the assistant:
-	    <variablelist>
-		<varlistentry>
-                  <term><guilabel>Server name</guilabel></term>
-		  <listitem>
-		    <para>
-		      Internet address of the contact server you'll be using.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-                  <term><guilabel>Login Method</guilabel></term>
-		  <listitem>
-		    <para>
-		      Specify whether your login is anonymous, using
-                      an email address, or a "distinguished name." If
-                      the login is not anonymous, enter the email
-                      address or distinguished name (DN) required by
-                      the server.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-                  <term><guilabel>Port</guilabel></term>
-		  <listitem>
-		    <para>
-		      The internet port
-		      Evolution connects to
-		      in order to access the LDAP database.  This is
-		      normally 389.
-		    </para>
-		  </listitem>
-		</varlistentry>
-                <varlistentry>
-                  <term><guilabel>Use SSL/TLS</guilabel></term>
-		  <listitem>
-		    <para>
-                      SSL and TLS are security mechanisms. If you
-                      select <guilabel>Always</guilabel>, Evolution
-                    will not connect unless
-                    secure connections are available. The default value is
-                    <guilabel>Whenever Possible</guilabel>, which uses
-                    secure connections if they are available,
-                    but does not cause failure if they are not.
-		    </para>
-		  </listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-                  <term><guilabel>Search base</guilabel></term>
-		  <listitem>
-		    <para>
-		      The <link linkend="search-base">search
-                    base</link> is the starting point for a directory search. 
-		      Contact your network administrator for information about
-		      the correct settings.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-                  <term><guilabel>Search scope</guilabel></term>
-		  <listitem>
-		    <para>
-                      The <link linkend="search-scope">search
-                    scope</link> is the breadth of a given search. 
-		    The  following options are available:
-		      <variablelist>
-			<varlistentry>
-			  <term><guilabel>One</guilabel></term>
-			  <listitem>
-			    <para>
-			      Searches the Search Base and one entry
-			      below it.
-			    </para>
-			  </listitem>
-			</varlistentry>
-			<varlistentry>
-			  <term><guilabel>Sub</guilabel></term>
-			  <listitem>
-			    <para>
-			      Searches the Search Base and all entries
-			      below it.
-			    </para>
-			  </listitem>
-			</varlistentry>
-                      </variablelist>
-                    </para>
-                  </listitem>
-                </varlistentry>
-
-                <varlistentry>
-                  <term><guilabel>Timeout (minutes)</guilabel></term>
-		  <listitem>
-		    <para>
-                      This is the maximum time Evolution will attempt to
-                      download data from the server before giving up.
-		    </para>
-		  </listitem>
-		</varlistentry>
-
-
-                <varlistentry>
-                  <term><guilabel>Download Limit</guilabel></term>
-		  <listitem>
-		    <para>
-		      Set the maximum number of results for a given
-                      search. Most servers refuse to send more than
-                      500, but you can set the number lower if you
-                      want to shorten downloads for very broad
-                      searches.
-		    </para>
-		  </listitem>
-		</varlistentry>
-
-
-                <varlistentry>
-                  <term><guilabel>Display name</guilabel></term>
-		  <listitem>
-		    <para>
-		      This is the name you will use to label this
-                      folder, and may be any name you choose.
-		    </para>
-		  </listitem>
-		</varlistentry>
-
-	      </variablelist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guilabel>Apply</guilabel>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-        <para>
-          Editing a directory server account means changing that same
-          information, although it is displayed in a slightly different order.
-        </para>
-    </sect1>
-
-
-</chapter>
\ No newline at end of file