aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--help/C/apx-authors.sgml6
-rw-r--r--help/C/evolution.sgml34
-rw-r--r--help/C/preface.sgml123
-rw-r--r--help/C/usage-contact.sgml2
-rw-r--r--help/C/usage-mail.sgml381
-rw-r--r--help/C/usage-mainwindow.sgml324
-rw-r--r--help/ChangeLog20
7 files changed, 462 insertions, 428 deletions
diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
index c0c06d355b..a1664ab0a5 100644
--- a/help/C/apx-authors.sgml
+++ b/help/C/apx-authors.sgml
@@ -75,7 +75,13 @@ and other dedicated GNOME programmers.
<listitem><para>
Hector Garcia Alvarez for .es
</para></listitem>
+
+ <listitem><para>
+ Kjartaan Marass for .no
+ </para></listitem>
+
</itemizedlist>
+
</para>
</appendix>
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index ae8aebfd5a..1138c0d0f1 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -30,7 +30,7 @@ implemented. -->
<book id="index">
<bookinfo>
- <title>A User's Guide to Evolution</title>
+ <title>A User's Guide to Ximian Evolution</title>
<authorgroup>
<author><firstname>Aaron</firstname><surname>Weber</surname></author>
<author><firstname>Kevin</firstname><surname>Breit</surname></author>
@@ -68,7 +68,7 @@ implemented. -->
</legalnotice>
<releaseinfo>
- This is version 0.11 of the Evolution manual.
+ This is version 0.11 of the Ximian Evolution manual.
</releaseinfo>
</bookinfo>
@@ -76,11 +76,11 @@ implemented. -->
&PREFACE;
<part id="usage">
- <title>Getting Started with Evolution 1.0</title>
+ <title>Getting Started with Ximian Evolution</title>
<partintro>
<para>
- Part one of the <application>Evolution</application> manual
- describes how to use <application>Evolution</application> for
+ Part one of the <application>Ximian Evolution</application> manual
+ describes how to use <application>Ximian Evolution</application> for
email, contact management, and appointment and task
scheduling. You'll find as you go along that there's more
than one way to do things, and you can pick whichever method
@@ -99,19 +99,21 @@ implemented. -->
&USAGE-PRINT;
</part>
<part id="config">
- <title>Configuring and Managing Evolution</title>
+ <title>Configuring and Managing Ximian Evolution</title>
<partintro>
<para>
- <application>Evolution</application> is highly configurable.
- Usually, when developers say that, they mean that they didn't
- test it out thoroughly and have left it to other programmers
- to "configure" themselves a working system. In the case of
- <application>Evolution</application>, "configurable", it means that, while you can expect the
- program to work perfectly well in its default settings, it's
- also easy to alter its behavior in a wide variety of ways, so
- that it fits your needs exactly. This part of the book will
- describe that process, from the quickest glimpse of the Setup
- Assistant to an in-depth tour of the preferences dialogs.
+ <application>Ximian Evolution</application> is highly
+ configurable. Usually, when developers say that, they mean
+ that they didn't test it out thoroughly and have left it to
+ other programmers to "configure" themselves a working
+ system. In the case of <application>Ximian
+ Evolution</application>, "configurable", it means that, while
+ you can expect the program to work perfectly well in its
+ default settings, it's also easy to alter its behavior in a
+ wide variety of ways, so that it fits your needs exactly.
+ This part of the book will describe that process, from the
+ quickest glimpse of the Setup Assistant to an in-depth tour of
+ the preferences dialogs.
</para>
</partintro>
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index fa03971fc9..839dbdcb93 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -1,112 +1,10 @@
<!--
<!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-->
-
<preface id="introduction">
-<!-- =============Introduction ============================= -->
- <title>Introduction</title>
-
- <sect1 id="what">
- <title>What is Evolution, and What Can It Do for Me?</title>
- <para>
- Information is useless unless it's organized and accessible;
- it's hardly even worth the name if you can't look at it and be
- <emphasis>informed</emphasis>.
- <application>Evolution</application>'s goal is to make the
- tasks of storing, organizing, and retrieving your personal
- information easier, so you can work and communicate with
- others. That is, it's a highly evolved <glossterm
- linkend="groupware">groupware</glossterm> program, an integral
- part of the Internet-connected desktop.
- </para>
- <para>
- Without all the hot air, that means it's a tool to help you
- get your work done.
- </para>
- <para>
- Because it's part of the GNOME project,
- <application>Evolution</application> is Free Software. The
- program and its source code are released under the terms of
- the GNU <ulink type="help" url="gnome-help:gpl"><citetitle>General
- Public License (GPL)</citetitle></ulink>, and the
- documentation falls under the <ulink type="help"
- url="gnome-help:fdl"><citetitle>Free Documentation
- License</citetitle></ulink> (FDL). For more information about
- the GPL and the FDL, visit the Free Software Foundation's
- website at <ulink
- url="http://www.fsf.org">http://www.fsf.org</ulink>.
- </para>
-
- <para>
- <application>Evolution</application> can help you work in a
- group by handling email, address and other contact
- information, and one or more calendars. It can do that on one
- or several computers, connected directly or over a network,
- for one person or for large groups.
- </para>
- <para>
- The <application>Evolution</application> project has four
- central goals:
-
- <itemizedlist>
- <listitem>
- <para>
- The application must be <emphasis>both powerful and easy
- to use</emphasis>. In other words, it needs a familiar
- and intuitive interface that users can customize to their
- liking, and users should have access to shortcuts for
- complex tasks.
- </para>
- </listitem>
- <listitem>
- <para>
- <application>Evolution</application> must meet and
- exceed the standards set by other groupware products.
- It must include support for major network <glossterm
- linkend="protocol">protocols</glossterm> so that it can
- integrate seamlessly with existing hardware and network
- environments.
- </para>
- </listitem>
- <listitem>
- <para>
- The project must support open standards and be open to
- expansion, so that it can become a development platform
- as well as an application. From the simplest scripting
- to the most complex network and component programming,
- <application>Evolution</application> must offer
- developers an environment for cutting-edge application
- development.
- </para>
- </listitem>
- <listitem>
- <para>
- Data must be safe: <application>Evolution</application>
- must not lose mail, corrupt mailbox files or other data,
- execute arbitrary <glossterm
- linkend="script">scripts</glossterm>, or delete files from
- your hard disk.
- </para>
- </listitem>
- </itemizedlist>
- </para>
- <para>
- <application>Evolution</application> is designed to make most
- daily tasks faster. For example, it takes only one or two
- clicks to enter an appointment or an address card sent to you
- by email, or to send email to a contact or appointment.
- <application>Evolution</application> makes displays faster and
- more efficient, so searches are faster and memory usage is
- lower. People who get lots of mail will appreciate advanced
- features like <link linkend="usage-mail-organize-vFolders">
- Virtual Folders</link>, which let you save searches as though
- they were ordinary mail folders.
- </para>
-
- </sect1>
-
- <sect1 id="aboutbook">
- <title>About This Book</title>
+ <title>About this Book</title>
+ <sect1 id="organization">
+ <title>Organization</title>
<para>
This book is divided into two parts, with several
appendices. The first part is a <link linkend="usage">guided
@@ -119,14 +17,16 @@
<application>Evolution</application> looks or acts can benefit
from reading it.
</para>
- <formalpara>
+ </sect1>
+
+ <sect1 id="typography">
<title>Typographical conventions</title>
<para>
- Some kinds of words are marked off with special typography:
+ In this book, we'll mark some words with special typography:
<simplelist>
<member><application>Applications</application></member>
- <member><command>Commands</command> typed at the command line</member>
- <member><guilabel>Labels</guilabel> for interface items</member>
+ <member><command>Commands</command> you type at the command line</member>
+ <member><guilabel>Labels</guilabel> for </member>
<member> Menu selections look like this:
<menuchoice>
@@ -153,7 +53,7 @@
<example>
<title>Example Example</title>
<para>
- This is what an example looks like.
+ This is what an example looks like.
</para>
</example>
@@ -164,7 +64,6 @@
</para>
</warning>
</para>
- </formalpara>
- </sect1>
+ </sect1>
</preface>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 209b73d4ab..80c438283d 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -526,7 +526,7 @@
</sect1>
<sect1 id="contact-automation-lists">
- <title>Managing a Mailing list</title>
+ <title>Sending Mail to Categories of Contacts</title>
<para>
You already know that when you are writing an email, you can
address it to one or more people, and that
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 6bcad754ed..04215bcaba 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -108,13 +108,22 @@
choose <guilabel>Delete</guilabel>.
</para>
<note>
- <title>Deleted but still here?</title>
+ <title>Why do I still see deleted mail?</title>
<para>
- When you do this, your message is marked to be
- deleted. Your email is not gone until you have
- expunged it. When you "Expunge" a folder, you remove
- all the mail that you have marked for deletion.
+ When you press <guibutton>Delete</guibutton> or click
+ the trash button, your mail isn't actually deleted,
+ but is marked for deletion. Your email is not gone
+ until you have expunged it. When you "Expunge" a
+ folder, you remove all the mail that you have marked
+ for deletion.
</para>
+ <para>
+ If you don't like this behavior, select
+ <menuchoice><guimenu>View</guimenu><guimenuitem>Hide
+ Deleted Messages</guimenuitem></menuchoice>. Then,
+ you will only see deleted messages when you look in
+ your <guilabel>Trash</guilabel> folder.
+ </para>
</note>
</listitem>
<listitem>
@@ -184,7 +193,7 @@
</sect1>
<sect1 id="usage-mail-getnsend-get">
- <title>Checking Mail</title>
+ <title>Checking for New Mail</title>
<para>
Now that you've had a look around the
<interface>Inbox</interface>, it's time to check for new mail.
@@ -232,7 +241,7 @@
<!-- NOT FOR 1.0
<sect2 id="usage-mail-getnsend-get-news">
- <title>Using Evolution for News </title>
+ <title>Using Evolution for News</title>
<para>
Newsgroups are so similar to email that there's no reason not
to read them side by side. If you want to do that, add a
@@ -245,7 +254,8 @@
</para>
</sect2>
-->
- <sect2 id="usage-mail-getnsend-get-attach">
+
+ <sect2 id="usage-mail-getnsend-get-attach">
<title>Working with Attachments and HTML Mail</title>
<para>
If someone sends you an <glossterm>attachment</glossterm>,
@@ -256,63 +266,96 @@
as part of the message, rather than at the end of the
message as an attachment.
</para>
+
+ <sect3 id="usage-mail-getnsend-get-attach-actions">
+ <title>Saving or Opening Attachments</title>
+ <para>
+ If you get an attachment with an email message,
+ <application>Ximian Evolution</application> can help you save
+ it or open it with the appropriate applications.
+ </para>
<para>
- To Save an Attachment to Disk:
+ To save an attachment to disk:
<orderedlist numeration="arabic">
<listitem>
<para>
- Open up the desired email
+ Click the downward pointing arrow on the attachment icon
+ and select <guimenuitem>Save to Disk</guimenuitem>.
</para>
</listitem>
<listitem>
<para>
- Click on the down arrow at the bottom of the email for the desired
- attachment.
+ Choose a location and name for the file.
</para>
</listitem>
<listitem>
<para>
- Select <guibutton>Save to Disk</guibutton>.
- </para>
- </listitem>
- <listitem>
- <para>
- Choose the directory and filename you wish.
- </para>
- </listitem>
- <listitem>
- <para>
- Click <guibutton>OK</guibutton>
+ Click <guibutton>OK</guibutton>.
</para>
</listitem>
</orderedlist>
</para>
+
<para>
- When someone sends you HTML mail, and includes an image in
- the actual mail (that is, they use the <menuchoice>
- <guimenu>Insert</guimenu> <guimenuitem>Image</guimenuitem>
- </menuchoice> tool, not the <guibutton>Attach</guibutton>
- tool), <application>Evolution</application> will display the
- image inside the message.
+ To Open an Attachment in a Program:
+ <orderedlist numeration="arabic">
+ <listitem>
+ <para>
+ Open the mail message with the attachment you want to read.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Click the arrow next the attachment icon.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Select the program you'd like to use. It will start up
+ and open the document.
+ </para>
+ </listitem>
+ </orderedlist>
</para>
<para>
- If an HTML mail uses a link to an image, and asks
- <application>Evolution</application> to download the image
- from the Internet, <application>Evolution</application> will
- not display the image unless you ask it to. This is because
- remotely hosted images can slow down your system, and can be
- used by spammers to track who reads their email. Having
- images not load automatically helps protect your privacy.
</para>
+ </sect3>
+
+ <sect3 id="usage-mail-getnsend-get-attach-html">
+ <title>Images in HTML Mail</title>
<para>
- If you want the images to load, select
+ When someone sends you HTML mail that includes an image in
+ the body of the message&mdash; like the welcome message in
+ your Inbox when you first started <application>Ximian
+ Evolution</application>&mdash;
+ <application>Evolution</application> will display the image
+ inside the message. You can create messages like this by
+ using the
+ <menuchoice><guimenu>Insert</guimenu><guimenuitem>Image</guimenuitem></menuchoice>
+ tool in the message composer.
+ </para>
+
+ <para>
+ If the image isn't included in the message, but is, instead,
+ a link to an image, <application>Evolution</application> can
+ download the image from the Internet for you. However,
+ <application>Evolution</application> will not display the
+ image unless you ask it to. This is because remotely hosted
+ images can be slow to load and display, and can even be used
+ by spammers to track who reads their email. Having images
+ not load automatically helps protect your privacy.
+ </para>
+ <para>
+ If you want the images to load for one message, select
<menuchoice>
<guimenu>View</guimenu>
<guisubmenu>Message Display</guisubmenu>
<guimenuitem>Load Images</guimenuitem>
</menuchoice>.
- You can also set image loading behavior in the
- <guilabel>Display</guilabel> tab of the
+
+ If you want <application>Ximian Evolution</application> to
+ load remotely hosted images more often, go to the
+ <guilabel>Display</guilabel> tab of the
<menuchoice>
<guimenu>Tools</guimenu>
<guimenuitem>Mail Settings</guimenuitem>
@@ -324,7 +367,8 @@
If you use an HTTP proxy,
<application>Evolution</application> must be able to find
it through the <systemitem>gnome-vfs</systemitem> subsystem
- before it can load iamges from the net.
+ before it can load iamges from the Internet. You can set
+ this in one of two ways:
<variablelist>
<varlistentry>
<term>Configure it with Nautilus</term>
@@ -405,33 +449,12 @@
</variablelist>
</para>
</note>
-
- <para>
- To Open an Attachment in a Program:
- <orderedlist numeration="arabic">
- <listitem>
- <para>
- Open the mail message with the attachment you want to read.
- </para>
- </listitem>
- <listitem>
- <para>
- Click the arrow next the attachment icon.
- </para>
- </listitem>
- <listitem>
- <para>
- Select the program you'd like to use. It will start up
- and open the document.
- </para>
- </listitem>
- </orderedlist>
- </para>
+ </sect3>
</sect2>
</sect1>
<sect1 id="usage-mail-getnsend-send">
- <title>Writing and Sending Mail</title>
+ <title>Composing New Email Messages</title>
<para>
You can start writing a new email message by selecting
<menuchoice> <guimenu>File</guimenu>
@@ -455,30 +478,42 @@
<!-- ==============End of Figure=================================== -->
<para>
- Enter an address in the <guilabel>To:</guilabel> field. If you wish
- enter a subject in the <guilabel>Subject:</guilabel> and a message in
- the big empty box at the bottom of the window. Once you have revised
- your message, press <guibutton>Send</guibutton>.
+ Enter an address in the <guilabel>To:</guilabel> field. If you
+ wish, enter a subject in the <guilabel>Subject:</guilabel>, and
+ a message in the big empty box at the bottom of the window.
+ Once you have written your message, press
+ <guibutton>Send</guibutton>.
</para>
<sect2 id="usage-mail-getnsend-send-delay">
- <title>Saving Messages for Later</title>
+ <title>Sending Composed Messages Later</title>
<para>
- <application>Evolution</application> will send mail immediately unless you tell it to
- do otherwise by selecting <menuchoice>
- <guimenu>File</guimenu> <guimenuitem>Send
+ <application>Evolution</application> will send mail
+ immediately unless you tell it to do otherwise by selecting
+ <menuchoice> <guimenu>File</guimenu> <guimenuitem>Send
Later</guimenuitem></menuchoice>. This will add your
- messages to the <guilabel>Outbox</guilabel> queue. Then,
- when you press <guibutton>Send</guibutton> in another
- message, or <guibutton>Get Mail</guibutton> in the main
- mail window, all your unsent messages will go out at once.
- You might want to use "Send Later" becuase it gives
- you a chance to change your mind about a message before you send it.
+ messages to the <guilabel>Outbox</guilabel> queue. The
+ "Send Later" feature is particularly useful if you use a
+ modem to connect to the Internet and pay per-minute
+ charges: you can remain offline until you need to send
+ mail, then connect and send all your mail at once.
</para>
<para>
To learn more about how you can specify message queue and
filter behavior, see <xref linkend="config-prefs-mail">.
</para>
+ <note>
+ <title>Working Offline</title>
+ <para>
+ Select
+ <menuchoice><guimenu>File</guimenu><guimenuitem>Work
+ Offline</guimenuitem></menuchoice> to have
+ <application>Ximian Evolution</application> disconnect
+ from the Internet while you work. When you want to
+ reconnect, choose
+ <menuchoice><guimenu>File</guimenu><guimenuitem>Work
+ Online</guimenuitem></menuchoice>
+ </note>
<para>
You can also choose to save messages as drafts or as text
@@ -512,7 +547,7 @@
</sect2>
<sect2 id="usage-mail-getnsend-send-compose">
- <title>Advanced Mail Composition</title>
+ <title>More About Mail Composition</title>
<para>
In the next few sections, you'll see how
<application>Evolution</application> handles advanced email
@@ -560,7 +595,7 @@
</sect3>
<sect3 id="usage-mail-getnsend-send-to-types">
- <title>Types of Recipients</title>
+ <title>Specifying Recipients for Email</title>
<para>
<application>Evolution</application>, like most email
programs, recognizes three types of addressee: primary
@@ -588,40 +623,6 @@
groups of people, especially if they don't know each other
or if privacy is a concern.
</para>
-
- <example id="ex-mail-cc">
- <title>Using the Cc: field</title>
- <para>
- When Susan sends an email to a client, she puts her
- co-worker, Tim, in the in the
- <guilabel>Cc:</guilabel> field, so that he know
- what's going on. The client can see that Tim also
- received the message, and knows that he can talk to
- Tim about the message as well.
- </para>
- </example>
-
- <para>
-
- <example id="ex-mail-bcc">
- <title>Using the Bcc: field</title>
- <para>
- Tim is sending an email announcement to all of his
- company's clients, some of whom are in competition
- with each other, and all of whom value their
- privacy. He needs to use the
- <guilabel>Bcc:</guilabel> field here. If he puts
- every address from his address book's "Clients"
- category into the <guilabel>To:</guilabel> or
- <guilabel>Cc:</guilabel> fields, he'll make the
- company's <emphasis>entire</emphasis> client list
- public. But putting his "Clients" addressbook
- into the Bcc: section, that will cause them to be hidden
- from the competition. It seems insignificant, but it can
- make a huge difference in some situations.
- </para>
- </example>
- </para>
</sect3>
<sect3 id="usage-mail-getnsend-send-to">
@@ -633,11 +634,16 @@
drop down list of possible address completions from your
address book. If you enter a name or nickname that can go
with more than one card, Evolution will open a dialog box to
- ask you which person you meant. Also,
- <application>Evolution</application> will add a domain to
- any unqualified addresses. By default, this is your domain,
- but you can choose which one mail preferences dialog.
+ ask you which person you meant.
+
+ <!-- Also, <application>Evolution</application> will add a
+ domain to any unqualified addresses. By default, this is
+ your domain, but you can choose which one mail preferences
+ dialog. NOTE: Bug filed on this-- it's not available now,
+ but may be in the future.-->
+
</para>
+
<para>
Alternately, you can click on the
<guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
@@ -657,7 +663,7 @@
</sect2>
<sect2 id="usage-mail-getnsend-send-reply">
- <title>Replying to Messages</title>
+ <title>Replying to Email Messages</title>
<para>
To reply to a message, press the
<guibutton>Reply:</guibutton> button while it is selected,
@@ -810,14 +816,13 @@ with quoted materials and the relevant replies interspersed-->
<title>Enhance your email with HTML</title>
<para>
Normally, you can't set text styles or insert pictures in
- emails, which is why you've probably seen people use far
- too many exclamation points for emphasis, or use
- text drawn facial expressions to
- convey their feelings. However, most newer email programs
- can display images and text styles as well as basic
- alignment and paragraph formatting. They do this with
- <glossterm linkend="html">HTML</glossterm>, just like web
- pages do.
+ emails, which is why email is often regarded as
+ uncommunicative and cold, and why people often resort to
+ using far too many exclamation points to convey their
+ feelings. However, most newer email programs can display
+ images and text styles as well as basic alignment and
+ paragraph formatting. They do this with <glossterm
+ linkend="html">HTML</glossterm>, just like web pages do.
</para>
<note>
<title>HTML Mail is not a Default Setting</title>
@@ -827,13 +832,20 @@ with quoted materials and the relevant replies interspersed-->
slower to download and display. Because some people may
prefer not to get HTML mail,
<application>Evolution</application> sends plain text
- unless you explicitly ask for HTML. To send HTML mail,
- you will need to select <menuchoice>
+ unless you explicitly ask for HTML.
+ </para>
+ </note>
+
+ <para> You can change the format of an email message between
+ plain text and HTML by choosing <menuchoice>
<guimenu>Format</guimenu> <guimenuitem>
- HTML</guimenuitem></menuchoice>. To send all your mail as
- HTML, you can set your default mail format preferences in
- the mail configuration dialog. See <xref
- linkend="config-prefs-mail-other"> for more information.
+ HTML</guimenuitem></menuchoice>.
+ </para>
+ <para>
+ To send all your mail as HTML by default, set your mail
+ format preferences in the mail configuration dialog. See
+ <xref linkend="config-prefs-mail-other"> for more
+ information.
</para>
</note>
<para>
@@ -956,16 +968,21 @@ with quoted materials and the relevant replies interspersed-->
</listitem>
<listitem>
<para>
- Make the email HTML mail by clicking
+ Make sure that you have the
<menuchoice>
<guimenu>Format</guimenu>
<guimenuitem>HTML</guimenuitem>
</menuchoice>
+ selector checked.
</para>
</listitem>
<listitem>
<para>
- Click the <guibutton>Image</guibutton> button in the <guilabel>Toolbar</guilabel>.
+ Click the <guibutton>Insert Image</guibutton> button in the toolbar, or select
+ <menuchoice>
+ <guimenu>Insert</guimenu>
+ <guimenuitem>Image</guimenuitem>
+ </menuchoice>.
</para>
</listitem>
<listitem>
@@ -999,11 +1016,12 @@ with quoted materials and the relevant replies interspersed-->
</listitem>
<listitem>
<para>
- Make the email HTML mail by clicking
+ Make sure that you have the
<menuchoice>
<guimenu>Format</guimenu>
<guimenuitem>HTML</guimenuitem>
</menuchoice>
+ selector checked.
</para>
</listitem>
<listitem>
@@ -1013,9 +1031,25 @@ with quoted materials and the relevant replies interspersed-->
</listitem>
<listitem>
<para>
- Select the template to use for the rule.
+ Select the type of rule. You can use a plain
+ line, a 3D line, or a yellow line with flowers.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Choose the size of the line, as a percentage of the width of the email window.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Choose the alignment and style. For the plain
+ line, you can choose the thickness of the line,
+ and whether it will be shaded, or solid. For the
+ other types, you can only choose alignment.
</para>
</listitem>
+
<listitem>
<para>
Click <guibutton>Insert</guibutton> to insert the rule.
@@ -1030,7 +1064,7 @@ with quoted materials and the relevant replies interspersed-->
<orderedlist numeration="arabic">
<listitem>
<para>
- Select the text you want to link from
+ Select the text you want to display as a link.
</para>
</listitem>
<listitem>
@@ -1051,55 +1085,55 @@ with quoted materials and the relevant replies interspersed-->
</para>
</listitem>
</orderedlist>
- </para>
- <para>
+</para>
+
+<para>
To add an image to your HTML message:
<orderedlist numeration="arabic">
<listitem>
<para>
- Click
+ Select
<menuchoice>
<guimenu>Insert</guimenu>
<guimenuitem>Image</guimenuitem>
- </menuchoice>
+ </menuchoice>.
</para>
</listitem>
<listitem>
<para>
- Click <guibutton>Browse</guibutton>
+ Click <guibutton>Browse</guibutton> to select the image
+ you want to include in your email.
</para>
</listitem>
+
<listitem>
<para>
- Select the image you want to include in your email.
+ Along the right side of the window, choose the alignment,
+ border, and other attributes of the image. If you change
+ the size attributes, the image will be shrunk or stretched
+ to fit the size you have chosen.
</para>
</listitem>
+
<listitem>
<para>
- Press <guibutton>OK</guibutton>
+ If you would like to make the image a clickable link,
+ enter a URL in the <guilabel>Link</guilabel> tab of the
+ window.
</para>
</listitem>
+
<listitem>
<para>
- Press <guibutton>Insert</guibutton>
+ When you are finished, press
+ <guibutton>Insert</guibutton> to include the image in
+ your message.
</para>
</listitem>
</orderedlist>
</para>
- <note>
- <title>A Technical note on HTML Tags</title>
- <para>
- The composer is a <acronym>WYSIWYG</acronym>
- (What You See Is What You Get)
- editor for HTML. That means that if you enter HTML
- directly into the composer&mdash; say,
- <markup role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
- the composer will assume you meant exactly that string
- of characters, and not "make this text bold," as an HTML
- composition tool or text editor would.
- </para>
- </note>
+
<sect3 id="html-templates">
<title>HTML Templates</title>
<para>
@@ -1159,7 +1193,11 @@ with quoted materials and the relevant replies interspersed-->
<sect3 id="composer-tables">
<title>Tables in Email</title>
<para>
- <application>Evolution</application> allows you to put tables in your HTML email to help organize your thoughts. These tables are a simplified version of what you might find in a spreadsheet program such as <application>Gnumeric</application>.
+ <application>Evolution</application> allows you to put
+ tables in your HTML email to help organize your thoughts.
+ These tables are a simplified version of what you might find
+ in a spreadsheet program like
+ <application>Gnumeric</application>.
</para>
<para>
To include a table in your email:
@@ -1171,7 +1209,7 @@ with quoted materials and the relevant replies interspersed-->
</listitem>
<listitem>
<para>
- Enable HTML in your email by clicking
+ Make sure you have the
<menuchoice>
<guimenu>
Format
@@ -1180,16 +1218,35 @@ with quoted materials and the relevant replies interspersed-->
HTML
</guimenuitem>
</menuchoice>
+ selector checked.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Select
+ <menuchoice>
+ <guimenu>
+ Insert
+ </guimenu>
+ <guimenuitem>
+ Table
+ </guimenuitem>
+ </menuchoice>
+ or click the <guiicon>Table</guiicon> button in the
+ toolbar.
</para>
</listitem>
+
<listitem>
<para>
- Select the template to use for the table.
+ Select the template, or style, you want to use for the
+ table.
</para>
</listitem>
<listitem>
<para>
- Set up how many rows and columns you want.
+ Set the number of rows and columns you want.
</para>
</listitem>
<listitem>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 6d902ad5c6..80e00b6e31 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -3,24 +3,93 @@
-->
<chapter id="usage-mainwindow">
- <title>Getting Started with Evolution</title>
+ <title>Getting Started with Ximian Evolution</title>
+
+ <sect1 id="what">
+ <title>What is Ximian Evolution, and What Can It Do for Me?</title>
+ <para>
+ Information is useless unless it's organized and accessible;
+ it's hardly even worth the name if you can't look at it and be
+ <emphasis>informed</emphasis>. The goal of
+ <application>Ximian Evolution</application> is to make the
+ tasks of storing, organizing, and retrieving your personal
+ information easier, so you can work and communicate with
+ others. That is, it's a highly evolved <glossterm
+ linkend="groupware">groupware</glossterm> program, an integral
+ part of the Internet-connected desktop.
+ </para>
+ <para>
+ In other words, <application>Ximian Evolution</application> is
+ a tool to help you get your work done.
+ </para>
+ <para>
+ <application>Ximian Evolution</application> is Free Software. The
+ program and its source code are released under the terms of
+ the GNU <ulink type="help"
+ url="gnome-help:gpl"><citetitle>General Public License
+ (GPL)</citetitle></ulink>, and the documentation falls under
+ the <ulink type="help" url="gnome-help:fdl"><citetitle>Free
+ Documentation License</citetitle></ulink> (FDL). For more
+ information about the GPL and the FDL, visit the Free Software
+ Foundation's website at <ulink
+ url="http://www.fsf.org">http://www.fsf.org</ulink>.
+ </para>
+
+ <para>
+ <application>Ximian Evolution</application> can help you work in a
+ group by handling email, address and other contact
+ information, and one or more calendars. It can do that on one
+ or several computers, connected directly or over a network,
+ for one person or for large groups.
+ </para>
+ </para>
+ <para>
+ With <application>Ximian Evolution</application>, you can
+ accomplish your most common daily tasks faster. For example, it
+ takes only one or two clicks to enter an appointment or an
+ address card sent to you by email, or to send email to a contact
+ or appointment. <application>Ximian Evolution</application>
+ makes displays faster and more efficient, so searches are faster
+ and memory usage is lower. People who get lots of mail will
+ appreciate advanced features like <link
+ linkend="usage-mail-organize-vFolders"> Virtual Folders</link>,
+ which let you save searches as though they were ordinary mail
+ folders.
+ </para>
+ </sect1>
+
<sect1 id="usage-mainwindow-starting">
- <title>The First Time you Start Evolution</title>
+ <title>The First Time you Start Ximian Evolution</title>
<para>
- Start <application>Evolution</application> by selecting
- <guimenuitem>Evolution</guimenuitem> from your
- <guimenu>Programs</guimenu> menu, or by typing
- <command>evolution</command> at the command line. The first
- time you run the program, it will create a directory called
- <filename>evolution</filename> in your home directory, where it
- will keep all your <application>Evolution</application>-related
- files. Then, it will offer to help you set up mail accounts and
- import data from other applications.
+ To start <application>Ximian Evolution</application>, do either
+ of the following:
+ <itemizedlist>
+ <listitem>
+ <para>
+ Select <menuchoice><guimenu>Programs</guimenu>
+ <guimenuitem>Evolution</guimenuitem> </menuchoice> from your
+ menu panel.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Type <command>evolution</command> at the command line.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+
+ <para>
+ The first time you run the program, it will create a directory
+ called <filename>evolution</filename> in your home directory,
+ where it will store all of its local data. Then, it will open a
+ first-run assistant to help you set up mail accounts and import
+ data from other applications.
</para>
<para>
- The first screen welcomes you to the assistant. It is estimated that
- configuring your mail will take 2 to 5 minutes and importing mail will
- take 1 to 2 minutes.
+ Using the first-run assistant will take approximately two to
+ five minutes.
</para>
<sect2 id="first-step">
@@ -70,7 +139,7 @@
<listitem>
<para>
Server Type &mdash; There are numerous types of servers which
- <application>Evolution</application> can download your email from:
+ <application>Ximian Evolution</application> can download your email from:
<itemizedlist>
<listitem>
<para>
@@ -128,7 +197,7 @@
<para>
Authentication Type &mdash; Chances are you are using
<guilabel>Password</guilabel>. Ask your administrator for more
- details. You can have <application>Evolution</application> check
+ details. You can have <application>Ximian Evolution</application> check
by clicking <guibutton>Check for supported types</guibutton>.
</para>
<para>
@@ -139,9 +208,13 @@
</itemizedlist>
</para>
<tip id="exchange-info">
- <title>Does Evolution Talk to Exchange?</title>
+ <title>Can Ximian Evolution Talk to Exchange?</title>
<para>
- <application>Evolution</application> will only work with the popular email server, Microsoft Exchange, if you have <application>Exchange</application> set to use standard protocols such as POP or IMAP. Support for shared calendars is not supported at this time.
+ <application>Ximian Evolution</application> can work with the
+ <application>Microsoft Exchange</application> server over
+ standard protocols such as POP or IMAP. Check with your
+ system administrator to see if you can get POP or IMAP
+ access to your email server.
</para>
</tip>
</sect2>
@@ -154,7 +227,7 @@
<listitem>
<para>
Server Type &mdash; There are numerous server types that
- <application>Evolution</application> supports for sending your
+ <application>Ximian Evolution</application> supports for sending your
mail.
<itemizedlist>
<listitem>
@@ -189,7 +262,7 @@
Authentication Type &mdash; Chances are you are using
<guilabel>Password</guilabel>. If you're not sure, ask
your system administrator or ISP, or have
- <application>Evolution</application> check for you by
+ <application>Ximian Evolution</application> check for you by
clicking <guibutton>Check for supported
types</guibutton>.
</para>
@@ -215,11 +288,13 @@
<sect2 id="fourth-step">
<title>Importing Mail (Optional)</title>
<para>
- If <application>Evolution</application> finds mail or address
+ If <application>Ximian Evolution</application> finds mail or address
files from another application, it will offer to import them.
+ If you're not sure which file format your mail program uses,
+ ask your system administrator.
</para>
<para>
- <application>Evolution</application> can import the following types of
+ <application>Ximian Evolution</application> can import the following types of
files:
<variablelist>
<varlistentry>
@@ -244,8 +319,8 @@
<term>MBox (mbox)</term>
<listitem>
<para>
- The email box format used by Netscape, Evolution,
- Eudora, and many other email clients.
+ The email box format used by Mozilla, Netscape,
+ Ximian Evolution, Eudora, and many other email clients.
</para>
</listitem>
</varlistentry>
@@ -256,33 +331,50 @@
<title>Outlook 2000 Users</title>
<para>
Outlook 2000 uses a proprietary format that
- <application>Evolution</application> cannot import directly.
- To import files from Outlook 2000, you will need to boot to
- Windows, import the files into Mozilla mail, then reboot and
- import from Mozilla. Please see the FAQ at the Ximian website
- for more information.
+ <application>Ximian Evolution</application> cannot import directly.
+ To import files from Outlook 2000, do the following:
+ <orderedlist numeration="arabic">
+
+ <listitem>
+ <para>
+ While using Windows, import the files into Mozilla Mail (or
+ another mailer, such as Netscape or Eudora, that uses the
+ standard mbox format).
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Copy the files to the system or partition you use for
+ <application>Ximian Evolution</application>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Use the <application>Ximian Evolution</application> import
+ tool to import the files. Read the FAQ at the Ximian
+ website for more information.
</para>
</note>
-
<note>
<title>Netscape Users</title>
<para>
Before importing mail from Netscape, make sure you select
<menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
Folders</guimenuitem></menuchoice>. If you don't,
- <application>Evolution</application> will import your deleted
- messages, and they will reappear in the mailboxes.
+ <application>Ximian Evolution</application> will import and undelete
+ the messages in your Trash folders.
</para>
</note>
- Ask your system administrator if you aren't sure which you use.
</para>
<tip>
- <title>Exporting Files From Evolution</title>
+ <title>Exporting Files From Ximian Evolution</title>
<para>
- Evolution uses standard file types for all its information,
+ Ximian Evolution uses standard file types for all its information,
so you should have no trouble taking your information
elsewhere if you want.
</para>
@@ -296,16 +388,16 @@
</sect1>
<sect1 id="ui-intro">
- <title>What's What in Evolution</title>
+ <title>What's What in Ximian Evolution</title>
<para>
Now that you've gotten the first-run configuration out of the
way, you're ready to get down to work. Here's a quick
explanation of what's going on in your main
- <application>Evolution</application> window.
+ <application>Ximian Evolution</application> window.
</para>
<figure id="preface-basic-interface">
- <title>The Evolution Main Window</title>
+ <title>The Ximian Evolution Main Window</title>
<screenshot>
<screeninfo>Inbox</screeninfo>
<graphic fileref="figures/mainwindow-pic" format="png" srccredit="Kevin Breit">
@@ -320,7 +412,7 @@
<para>
The <guilabel>Menubar</guilabel> gives you access to nearly all the
- features that can be found in <application>Evolution</application>.
+ features that can be found in <application>Ximian Evolution</application>.
</para>
<para>
@@ -349,7 +441,7 @@
</para>
<para>
- Periodically, <application>Evolution</application> will need to quietly
+ Periodically, <application>Ximian Evolution</application> will need to quietly
display a message, or tell you the progress of a task. This most
often happens when you're checking or sending email. These progress
queues are shown here, in the <guilabel>Status Bar</guilabel>.
@@ -357,11 +449,11 @@
<para>
<inlinegraphic fileref="figures/full-5" format="png"></inlinegraphic>
- <guilabel>Search Bar</guilabel>
+ <guilabel>Search Tools</guilabel>
</para>
<para>
- The <guilabel>Search Bar</guilabel> lets you search through your email
+ The <guilabel>Search Tool</guilabel> lets you search through your email
with precision so you can easily find what you're looking for.
</para>
@@ -369,7 +461,7 @@
<sect2 id="usage-mainwindow-shortcutbar">
<title>The Shortcut Bar</title>
<para>
- <application>Evolution</application>'s most important job is
+ <application>Ximian Evolution</application>'s most important job is
to give you access to your information and help you use it
quickly. One way it does that is through the
<interface>shortcut bar</interface>, the column on the left
@@ -385,14 +477,15 @@
<variablelist>
<varlistentry>
- <term> <guibutton>My Evolution</guibutton></term>
+ <term> <guibutton>Summary</guibutton></term>
<listitem>
<para>
- Start your day here. <guilabel>My Evolution</guilabel>
- gives you a quick summary of new or important messages,
- daily appointments and urgent tasks. You can customize
+ Start your day here. The Ximian Evolution
+ <guilabel>Summary</guilabel> gives you a quick
+ summary of new or important messages, daily
+ appointments and urgent tasks. You can customize
its appearance and content, and use it to access
- Evolution services.
+ Ximian Evolution services.
</para>
</listitem>
</varlistentry>
@@ -403,7 +496,7 @@
<para>
Click the <guibutton>Inbox</guibutton> button to start
reading your mail. Your Inbox is also where you can
- access Evolution's tools to filter, sort, organize, and
+ access Ximian Evolution's tools to filter, sort, organize, and
search your mail.
</para>
</listitem>
@@ -466,21 +559,22 @@
<para>
The <interface>folder bar</interface> is a more comprehensive
way to view the information you've stored with
- <application>Evolution</application>. It displays all your
+ <application>Ximian Evolution</application>. It displays all your
appointments, address cards, and email in a tree that's a lot
like a <glossterm linkend="filetree">file
tree</glossterm>&mdash; it starts small at the top, and branches
downwards. On most computers, there will be three or four
- folders at the base. First is the <guilabel>Local</guilabel>
- folder, which holds all the <application>Evolution</application>
- data that's stored on your computer. After that are
- <guilabel>Other Contacts</guilabel>, <glossterm
- linkend="ldap">LDAP</glossterm> contact directories stored on a
- network, followed by any <glossterm
- linkend="imap">IMAP</glossterm> mail folders you may have
- available to you over your network. Lastly, there are
- <guilabel>Virtual Folders</guilabel>, discussed in <xref
- linkend="usage-mail-organize-vfolders">,
+ folders at the base. First, of course, is the
+ <guilabel>Summary</guilabel>, a customizable summary of your
+ information. Below that are your <guilabel>Local
+ Folders</guilabel>, which hold all the
+ <application>Ximian Evolution</application> data that's stored on your
+ computer. After that are your network servers: <glossterm
+ linkend="ldap">LDAP</glossterm> servers that host shared contact
+ directories, and <glossterm linkend="imap">IMAP</glossterm> mail
+ folders to which you subscribe. Lastly, there are
+ <guilabel>vFolders</guilabel>, or virtual folders, discussed in
+ <xref linkend="usage-mail-organize-vfolders">,
</para>
<para>
@@ -488,12 +582,6 @@
<itemizedlist>
<listitem>
<para>
- <guilabel>My Evolution</guilabel>, a quick summary to help you do
- your tasks.
- </para>
- </listitem>
- <listitem>
- <para>
<guilabel>Calendar</guilabel>, for appointments and
event listings.
</para>
@@ -518,7 +606,7 @@
<para>
<guilabel>Outbox</guilabel>, for messages you have written
but not yet sent. This will be empty unless you use
- <application>Evolution</application> while offline.
+ <application>Ximian Evolution</application> while offline.
</para>
</listitem>
@@ -530,11 +618,9 @@
<listitem>
<para>
- <guilabel>Trash</guilabel>, a virtual folder view of all
- the messages you have marked for deletion but not yet
- <glossterm linkend="expunge">expunged</glossterm>. Note that
- once you have expunged a message, it
- is permanently deleted.
+ <guilabel>Trash</guilabel>, a vFolder view of all the
+ messages you have marked for deletion but not yet
+ <glossterm linkend="expunge">expunged</glossterm>.
</para>
</listitem>
</itemizedlist>
@@ -579,7 +665,6 @@
<listitem>
<para>
Select the folder type. The available options are.
-
<itemizedlist>
<listitem>
<para>
@@ -598,31 +683,16 @@
</listitem>
<listitem>
<para>
- Mail Storage
- </para>
- </listitem>
- <listitem>
- <para>
- My Evolution
- </para>
- </listitem>
- <listitem>
- <para>
Tasks
</para>
</listitem>
- <listitem>
- <para>
- vTrash
- </para>
- </listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
- Select the folder for the new folder to go in.
+ Choose the location of the new folder.
</para>
</listitem>
</orderedlist>
@@ -631,7 +701,7 @@
<sect3 id="subfolders">
<title>Subfolders</title>
<para>
- <application>Evolution</application> lets you nest folders
+ <application>Ximian Evolution</application> lets you nest folders
inside of each other, so that you can have a detailed
organizational system.
</para>
@@ -646,11 +716,11 @@
<para>
Right-clicking will bring up a menu for just about anything in
- <application>Evolution</application>. If you right-click on a
+ <application>Ximian Evolution</application>. If you right-click on a
folder, you'll have a menu with the following options:
<itemizedlist>
<listitem><para><guimenuitem>View</guimenuitem>, to view the folder. </para></listitem>
- <listitem><para><guimenuitem>Open in New Window</guimenuitem>, to see it in a new Evolution window. </para></listitem>
+ <listitem><para><guimenuitem>Open in New Window</guimenuitem> to view the folder in another window. </para></listitem>
<listitem><para><guimenuitem>Move</guimenuitem>, to move the folder to another location. </para></listitem>
<listitem><para><guimenuitem>Copy</guimenuitem>, to duplicate the folder. </para></listitem>
<listitem><para><guimenuitem>Delete</guimenuitem>, to delete the folder and all its contents. </para></listitem>
@@ -665,18 +735,6 @@
dropping them.
</para>
-<!--
- <tip>
- <title>Context-Sensitive Help</title>
- <para>
- GNOME 2.0 offers context-sensitive help, which means you can
- almost always get help on an item by right-clicking it. If
- you're not sure what something is, or don't know what you can
- do with it, choosing <guimenuitem>Help</guimenuitem> from the
- right-click menu is a good way to find out.
- </para>
- </tip>
--->
<para>
Any time new mail arrives in a mail folder, that folder
label is displayed in bold text, along with the number of
@@ -692,7 +750,7 @@
provide all the possible actions for any given view of your
data. If you're looking at your Inbox, most of the menu items
will relate to mail; some will relate to other components of
- <application>Evolution</application> and some, especially those
+ <application>Ximian Evolution</application> and some, especially those
in the <guimenu>File Menu</guimenu> will relate to the
application as a whole.
</para>
@@ -701,13 +759,10 @@
<varlistentry>
<term> <guimenu>File</guimenu></term>
- <listitem><para>
- Anything even related to a file or to the operations
- of the application generally falls under this
- menu: creating things, saving them to disk,
- printing them, and quitting the program itself.
-
- </para></listitem>
+ <listitem><para> Anything related to a file or to the
+ operations of the application generally falls under this
+ menu: creating things, saving them to disk, printing them,
+ and quitting the program itself. </para></listitem>
</varlistentry>
<varlistentry>
@@ -721,9 +776,9 @@
<varlistentry>
<term> <guimenu>View</guimenu></term>
<listitem><para>
- This menu lets you decide how <application>Evolution</application>
+ This menu lets you decide how <application>Ximian Evolution</application>
should look. Some of the features control the appearance of
- <application>Evolution</application> as a whole, and others
+ <application>Ximian Evolution</application> as a whole, and others
the way a particular kind of information appears.
</para></listitem>
</varlistentry>
@@ -738,7 +793,6 @@
</para></listitem>
</varlistentry>
-
<varlistentry>
<term> <guimenu>Tools</guimenu></term>
<listitem><para>
@@ -757,7 +811,7 @@
<listitem><para>
Select among these items to open the
<application>Help Browser</application>
- and read the <application>Evolution</application> manual.
+ and read the <application>Ximian Evolution</application> manual.
</para></listitem>
</varlistentry>
</variablelist>
@@ -766,8 +820,9 @@
<para>
Once you've familiarized yourself with the <interface>main
window</interface> you can start doing things with it. We'll
- start with <guilabel>My Evolution</guilabel>, the summary of
- everything that's going on.
+ start with the <guilabel>Summary</guilabel>, which provides a
+ quick overview of your <application>Ximian
+ Evolution</application> information.
</para>
</sect2>
<sect2 id="basics-summary">
@@ -800,7 +855,7 @@
<sect2 id="basics-mail">
<title>Introducing Email</title>
<para>
- <application>Evolution</application> email is like other
+ <application>Ximian Evolution</application> email is like other
email programs in several ways:
<itemizedlist>
<listitem>
@@ -838,13 +893,13 @@
</itemizedlist>
</para>
<para>
- However, <application>Evolution</application> has some
+ However, <application>Ximian Evolution</application> has some
important differences. First, it's built to handle very large
amounts of mail. Both the <link
linkend="usage-mail-organize-filters">filtering</link> and
<link linkend="usage-mail-organize-search">searching</link>
functions were built for speed and efficiency on large volumes
- of mail. There's also the <application>Evolution</application>
+ of mail. There's also the <application>Ximian Evolution</application>
<link linkend="usage-mail-organize-vFolders">vFolder</link>,
an advanced organizational feature not found in mainstream
mail clients. If you get a lot of mail, or if you keep every
@@ -857,7 +912,7 @@
<!-- ==============Figure=================================== -->
<figure id="usage-mail-intro-fig">
- <title>Evolution Mail</title>
+ <title>Ximian Evolution Mail</title>
<screenshot>
<screeninfo>Inbox</screeninfo>
<graphic fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
@@ -930,9 +985,9 @@
<!-- ============== Figure ============================= -->
<figure id="usage-calendar-fig">
- <title>Evolution Calendar View</title>
+ <title>Ximian Evolution Calendar View</title>
<screenshot>
- <screeninfo>Evolution Contact Manager Window</screeninfo>
+ <screeninfo>Ximian Evolution Contact Manager Window</screeninfo>
<graphic fileref="figures/calendar" format="png" srccredit="Aaron Weber">
</graphic>
</screenshot>
@@ -984,19 +1039,19 @@
<sect2 id="basics-contacts">
<title>Introducing the Address Book</title>
<para>
- The <application>Evolution</application> address book can
+ The <application>Ximian Evolution</application> address book can
handle all of the functions of an address book, phone book, or
Rolodex. Of course, it's a lot easier to update
- <application>Evolution</application> than it is to change an
- actual paper book. <application>Evolution</application> also
+ <application>Ximian Evolution</application> than it is to change an
+ actual paper book. <application>Ximian Evolution</application> also
allows easy synchronization with hand-held devices. Since
- <application>Evolution</application> supports the <glossterm
+ <application>Ximian Evolution</application> supports the <glossterm
linkend="ldap">LDAP</glossterm> directory protocol, you can
use it with almost any type of existing directory server on
your network.
</para>
<para>
- Another advantage of the <application>Evolution</application>
+ Another advantage of the <application>Ximian Evolution</application>
address book is its integration with the rest of the
application. For example, you can create an address card from
an email just by right-clicking on the sender's email address.
@@ -1017,9 +1072,9 @@
The address book looks like this:
<figure id="usage-contact-fig">
- <title>Evolution Contact Interface</title>
+ <title>Ximian Evolution Contact Interface</title>
<screenshot>
- <screeninfo>Evolution Contact List Window</screeninfo>
+ <screeninfo>Ximian Evolution Contact List Window</screeninfo>
<graphic fileref="figures/contact" format="png" srccredit="Kevin Breit">
</graphic>
</screenshot>
@@ -1030,7 +1085,6 @@
format="png"></inlinegraphic> <guilabel>Contact
List</guilabel>
</para>
-
<para>
The <guilabel>Contact List</guilabel> lists your contacts.
</para>
@@ -1039,9 +1093,5 @@
read <xref linkend="usage-contact">.
</para>
</sect2>
-
</sect1>
-</chapter>
-
-
-
+</chapter> \ No newline at end of file
diff --git a/help/ChangeLog b/help/ChangeLog
index ae79f90dff..ddc875712e 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,23 @@
+2001-09-04 Aaron Weber <aaron@ximian.com>
+
+ * C/apx-authors.sgml: Credit kmarass.
+
+ * C/usage-contact.sgml: groups-of-contacts-management.
+
+ * C/usage-mainwindow.sgml: Add more info, "whatis" section,
+ "Ximian Evolution" and "vFolder."
+
+ * C/evolution.sgml: "Ximian Evolution" not "Evolution"
+
+ * C/preface.sgml: Moved "whatis" section to usage-mainwindow, as
+ per new-outline.
+
+ * C/usage-mail.sgml: Expand deletion info. Also composer work.
+
+2001-08-30 Aaron Weber <aaron@ximian.com>
+
+ * C/apx-gloss.sgml: remove Spam, emoticon, haiku. Revise "Virus"
+
2001-09-04 Kevin Breit <battery841@mediaone.net>
* C/usage-print.sgml: Added infoa about Windows not handling .ps