aboutsummaryrefslogtreecommitdiffstats
path: root/help
diff options
context:
space:
mode:
Diffstat (limited to 'help')
-rw-r--r--help/C/apx-bugs.sgml8
-rw-r--r--help/C/apx-gloss.sgml30
-rw-r--r--help/C/config-prefs.sgml2
-rw-r--r--help/C/config-setupassist.sgml4
-rw-r--r--help/C/evolution-guide.sgml6
-rw-r--r--help/C/preface.sgml30
-rw-r--r--help/C/usage-calendar.sgml11
-rw-r--r--help/C/usage-contact.sgml28
-rw-r--r--help/C/usage-mail.sgml113
-rw-r--r--help/C/usage-mainwindow.sgml43
10 files changed, 158 insertions, 117 deletions
diff --git a/help/C/apx-bugs.sgml b/help/C/apx-bugs.sgml
index eb30901422..e7a501acba 100644
--- a/help/C/apx-bugs.sgml
+++ b/help/C/apx-bugs.sgml
@@ -4,10 +4,10 @@
<abstract>
<para>
This appendix describes known bugs and limitations of
- <application>Evolution</application>. Please contact the
- Evolution team (<email>bugs@helixcode.com</email>) or use
- <application>bug-buddy</application> if you find one we have not
- listed, or if you have a patch to fix one.
+ <application>Evolution</application>. Please use the GNOME
+ <application>Bug Report Tool</application> (known as
+ <command>bug-buddy</command> at the command line) if you find one
+ we have not listed.
</para>
</abstract>
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index fb05344813..55ab3ed8a1 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -85,8 +85,11 @@
<glossdef>
<para>
To run a program. Any file that can be run is called an
- executable. In order to be execute program, a user must have
- the proper permissions.
+ executable. <application>Evolution</application> can download
+ executable attachments, but before they can be run, the files must
+ be marked as executable with a shell or file manager. This
+ security precaution prevents the automatic or accidental execution
+ of malicious programs.
</para>
</glossdef>
</glossentry>
@@ -96,7 +99,9 @@
<glossdef>
<para>
Within <application>Evolution</application>, a filter is a method
- of sorting mail automatically.
+ of sorting mail automatically. You can create filters to perform
+ one or more actions on a message that meets any (or all) of a wide
+ range of criteria.
</para>
</glossdef>
</glossentry>
@@ -105,7 +110,7 @@
<glossterm>Forward</glossterm>
<glossdef>
<para>
- By forwarding an e-mail, the user can send a third party a message
+ the user can send a third party a message
which was sent to the user originally.
</para>
</glossdef>
@@ -115,8 +120,9 @@
<glossterm>Groupware</glossterm>
<glossdef>
<para>
- Groupware is a term describing an application who has many
- productivity features built into one program.
+ Groupware is a term describing an application which helps groups
+ of people work together. Typically, a groupware application will
+ have several productivity features built into one program.
</para>
</glossdef>
</glossentry>
@@ -183,8 +189,10 @@
<glossterm>Mail Client</glossterm>
<glossdef>
<para>
- A mail client is the application which a user reads and sends
- their e-mail with.
+ A mail client is the application with which a person reads and
+ sends e-mail. Its counterparts are the various types of mail
+ servers, which handle user authentication and direct messages from
+ sender to recipient.
</para>
</glossdef>
</glossentry>
@@ -255,8 +263,10 @@
<glossterm>Spam</glossterm>
<glossdef>
<para>
- Spam: useless e-mail. Spam normally comes in forms of
- chain-letters and advertisements for websites or services.
+ Spam: useless, unwanted e-mail. Spam normally comes in forms of
+ chain-letters and advertisements for unscrupulous websites or
+ services. Messages that are merely useless are called
+ "opt-in newsletters."
</para>
</glossdef>
</glossentry>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 687a75e9f0..c2839f741b 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -174,7 +174,7 @@
<term><guilabel>Username:</guilabel></term>
<listitem>
<para>
- Enter your user name here. Eva Lucy Ann Tester's
+ Enter your user name here. Eva Lucianne Tester's
user name is <userinput>eltester</userinput>.
</para>
</listitem>
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index 6690c766ad..2652644ec7 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -4,7 +4,7 @@
The setup assistant can gather most of the information
necessary for <application>Evolution</application>'s daily
operation. If you prefer more detailed or advanced
- configuration, see <xref linkend="config-prefs">
+ configuration, see <xref linkend="config-prefs">.
</para>
<sect1 id="config-setupassist-mail">
@@ -96,7 +96,7 @@
<listitem>
<para>
This should be the name of your mail server: it should
- look something like:
+ look something like:
<userinput>mailserver.organization.org</userinput>.
</para>
</listitem>
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index f844db46c0..67b26e4783 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -38,9 +38,9 @@
Documentation License</citetitle>, Version 1.1 or any later
version published by the Free Software Foundation with no
Invariant Sections, no Front-Cover Texts, and no Back-Cover
- Texts. You may obtain a copy of the <citetitle>GNU Free
- Documentation License</citetitle> from the Free Software
- Foundation by visiting <ulink type="http"
+ Texts. The license is included with this document in <xref
+ linkend="fdl">, and you may also obtain a copy from the Free
+ Software Foundation by visiting <ulink type="http"
url="http://www.fsf.org">their Web site</ulink> or by writing
to: Free Software Foundation, Inc., 59 Temple Place - Suite
330, Boston, MA 02111-1307, USA.
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index a228998027..bb6cb4d948 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -14,16 +14,29 @@
</para>
<para>
As part of the GNOME project,
- <application>Evolution</application> is free software, and is
- released under the terms of the GNU Public License (GPL). As
- stated previously, the documentation falls under the Free
- Documentation License (FDL), which is included with this
- document in <xref linkend="fdl">. For more information about
- the GPL and the FDL, visit the Free Software Foundation's
- website at <ulink
+ <application>Evolution</application> is free software. The
+ program and its source code are released under the terms of
+ the GNU Public License (GPL), and the documentation falls
+ under the Free Documentation License (FDL), which is included
+ with this document (<xref linkend="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>
+ <note>
+ <title>This is a preview release</title>
+ <para>
+ Please help develop <application>Evolution</application>
+ by submitting bug reports when you find bugs. You can do
+ so by using the <application>Bug Report
+ Tool</application> (known as <command>bug-buddy</command>
+ at the command line).
+ </para>
+ </note>
+ </para>
+
+ <para>
<application>Evolution</application> is a suite of tools to
help you work in a group. You can use it to send, receive,
and organize email, manage address and other contact
@@ -125,8 +138,7 @@
<formalpara>
<title>Typographical conventions</title>
<para>
- Some kinds of words are marked off with special typography.
- It's listed below:
+ Some kinds of words are marked off with special typography:
<simplelist>
<member><application>Applications</application></member>
<member><command>Commands</command> typed at the command line</member>
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 3da93260a5..5cc7588dcd 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -142,8 +142,9 @@ lack of time, resources, and interest.
network. <guilabel>Public</guilabel> is the default category,
and a public event can be viewed by anyone on the calendar
sharing network. <guilabel>Private</guilabel> denotes one
- level of security, and <guilabel>Confidential</guilabel>
- means that .
+ level of security, and <guilabel>Confidential</guilabel> a
+ higer level. <!-- FIXME --> Exact determinations and implementations of
+ this feature have yet to be determined. <!-- FIXME -->
</para>
<para>
The <guilabel>Recurrence</guilabel> tab lets you describe
@@ -307,9 +308,8 @@ lack of time, resources, and interest.
she maintains one for the conference room, so people know when
they can schedule meetings. On the local network, she
maintains a calendar that reflects when consultants are going
- to be on site, and another that keeps track of the various
- company managers, so that people know where to find each
- other.
+ to be on site, and another that keeps track of when the Red
+ Sox are playing.
</para>
</example>
<para>
@@ -319,7 +319,6 @@ lack of time, resources, and interest.
<guisubmenu>New</guisubmenu>
<guimenuitem>Calendar</guimenuitem>
</menuchoice>.
-
You can place the calendar in any calendar folder and access it
from the folder view.
</para>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index fc5c5781ed..c937e957b5 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -102,21 +102,21 @@
</para>
</sect1>
<sect1 id="usage-contact-cards">
- <title>Create, Change, and Delete Cards</title>
+ <title>Destroy, Create, or Change Cards</title>
<para>
- The easiest thing you can do with a card is delete it. To
- delete a card, click on it once to select it, then press the
- <guibutton>Delete Card</guibutton> button.
+ To delete a card, click on it once to select it, then press the
+ <guibutton>Delete Card</guibutton> button. If you have
+ multiple cards selected, you'll delete mutliple cards.
</para>
-
<para>
- Any time you add new information to a card, whether it's an old
- card you're editing or a new card you're just adding to your
- address book, you'll use the contact editor. To change a card
- that already exists, just double click it to open the contact
- editor window with all the current information already filled
- in. If you want to create a new one, clicking the
+ Adding or changing cards is slightly more complicated. Any
+ time you add information to the contact manager, whether it's
+ an old card you're editing or a new card you're just adding to
+ your address book, you'll use the contact editor. To change a
+ card that already exists, just double click it to open the
+ contact editor window with all the current information already
+ filled in. If you want to create a new one, clicking the
<guibutton>New Card</guibutton> button will open up that same
window, but with empty fields instead of full ones. Either
way, it's the same tool for quite similar tasks, and you'll
@@ -124,9 +124,7 @@
than you'd think would fit onto a file card.
</para>
- <sect2 id="usage-contact-editor">
- <title>The Contact Editor</title>
- <para>
+ <para>
The contact editor window has two tabs,
<guilabel>General</guilabel>, for basic contact information,
and <guilabel>Details</guilabel>, for a more specific
@@ -256,7 +254,7 @@
</para>
-->
- </sect2>
+
<!--- ############# This section isn't implemented yet either:
<sect2>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 2664d121d2..60ac9e0303 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -179,8 +179,9 @@
<title>Writing and Sending Mail</title>
<para>
You can start writing a new email message by selecting
- <guimenuitem>New Mail</guimenuitem> from the <guimenu>File
- Menu</guimenu>, or by pressing the
+ <menuchoice> <guimenu>File</guimenu>
+ <guisubmenu>New</guisubmenu> <guimenuitem>
+ Mail</guimenuitem></menuchoice>, or by pressing the
<guibutton>Compose</guibutton> button in the Inbox toolbar.
When you do so, the <interface>New Message</interface> window
will open, as shown in <xref
@@ -192,7 +193,7 @@
<title>New Message Window</title>
<screenshot>
<screeninfo>Evolution Main Window</screeninfo>
- <graphic fileref="fig/newmsg-pic" format="png" srccredit="Aaron Weber">
+ <graphic fileref="fig/newmsg-pic" format="png" srccredit="Kevin Breit">
</graphic>
</screenshot>
</figure>
@@ -456,7 +457,7 @@ with quoted materials and the relevant replies interspersed-->
<term>Alignment</term>
<listitem>
<para>
- Located next to the text style buttons,
+ Located next to the text style buttons,
these three paragraph icons should be familiar to
users of most word processing software. The
leftmost button will make your text left-justified,
@@ -479,12 +480,14 @@ with quoted materials and the relevant replies interspersed-->
</variablelist>
</para>
<para>
- There are two tools that you can find only in the
+ There are three tools that you can find only in the
<guimenu>Insert</guimenu> menu.
- <itemizedlist>
- <listitem>
- <para>
- <guimenuitem>Insert Link</guimenuitem>: Use this tool to
+ <variablelist>
+ <varlistentry>
+ <term><guimenuitem>Insert Link</guimenuitem>:</term>
+ <listitem>
+ <para>
+ Use this tool to
put hyperlinks in your HTML messages. When you
select it, <application>Evolution</application> will
prompt you for the <guilabel>Text</guilabel> that
@@ -492,6 +495,9 @@ with quoted materials and the relevant replies interspersed-->
you should enter the actual web address (URL).
</para>
</listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <guimenuitem>Insert Image</guimenuitem>:</term>
<listitem>
<para>
<guimenuitem>Insert Image</guimenuitem>: Select this item to
@@ -500,7 +506,19 @@ with quoted materials and the relevant replies interspersed-->
cursor.
</para>
</listitem>
- </itemizedlist>
+ </varlistentry>
+ <varlistentry>
+ <term><guimenuitem>Insert Rule</guimenuitem>:</term>
+ <listitem><para>
+ This will insert a horizontal line, or rule, into your document.
+ You'll be presented with a dialog box which gives you
+ the choice of size, percentage of screen, shading, and
+ alignment; if you leave everything at the default
+ values you'll get a thin black rule all the way across
+ the screen.</para></listitem>
+ </varlistentry>
+
+ </variablelist>
</para>
<note>
<title>A Technical note on HTML Tags</title>
@@ -676,16 +694,7 @@ possibly never will be due to security evil. -->
<application>Evolution</application> will as you for the name
and the type of the folder, and will provide you with a folder
tree so you can pick where it goes.
- <note>
- <title>Folders have Limits</title>
- <para>
- You can always place a folder inside other folders,
- regardless of folder type. However, calendars,
- contacts, and mail can't go into the same
- folder. Calendars have to go in calendar folders, mail
- in mail folders, and contacts in contact folders.
- </para>
- </note>
+
</para>
<para>
When you click <guibutton>OK</guibutton>, your new folder will
@@ -770,16 +779,20 @@ possibly never will be due to security evil. -->
<sect2 id="usage-mail-organize-filters">
<title>Staying organized: Mail Filters in Evolution</title>
<para>
- Filters sort your email for you. People who subscribe to
- multiple mailing lists, or who often need to refer to messages
- they have sent, find filters especially helpful to separate
- personal from list-related mail, but they're good for anybody
- who gets more than a few messages a day. To create a filter,
- select <guimenuitem>Filter Assistant</guimenuitem> from the
- <guimenu>Tools</guimenu> menu. This will bring up a window
- which will guide you through filter creation. The
- <interface>filter assistant</interface> is shown in <xref
- linkend="usage-mail-filters-fig-new">
+ Filters sort your email for you as it arrives. Most often,
+ you'll want to have <application>Evolution</application> put
+ mail into different folders, but you can have it do anything
+ you like. People who subscribe to multiple mailing lists, or
+ who often need to refer to messages they have sent, find
+ filters especially helpful to separate personal from
+ list-related mail, but they're good for anybody who gets more
+ than a few messages a day. To create a filter, select
+ <menuchoice>
+ <guimenu>Tools</guimenu> <guimenuitem>Filter
+ Assistant</guimenuitem> </menuchoice>. This will bring up a
+ window which will guide you through filter creation. The
+ <interface>filter assistant</interface> is shown in <xref
+ linkend="usage-mail-filters-fig-new">
<figure id="usage-mail-filters-fig-new">
<title>Creating a new Filter</title>
@@ -914,23 +927,21 @@ possibly never will be due to security evil. -->
<example id="usage-mail-organize-vFolders-ex">
<title>Using Folders, Searches, and vFolders</title>
<para>
- To organize my mail box, I can set up a vFolder
- for emails from my friend Vince, by doing (INSERT
- PROCESS HERE). Then, whenever I want to see the
- messages Vince has sent me, I open the vFolder, and
- every message he's sent me shows up, no matter where
- I've actually filed it. If I want, I can also create a
- vFolder containing any message from my list of
- co-workers which also has the name of the project in
- it. That way, when Vince sends me mail about the
- project, I can see that message both in the "Vince"
- vFolder and in the "Project" vFolder. That's because
- when I open up the "Vince" folder, I'm really
- performing a search for all the mail from Vince, and
- when I open the "Project" folder I'm really performing
+ To organize my mail box, I can set up a vFolder for emails
+ from my friend Vince. Then, whenever I want to see the
+ messages Vince has sent me, I open the vFolder, and every
+ message he's sent me shows up, no matter where I've
+ actually filed it. If I want, I can also create a vFolder
+ containing any message from my list of co-workers which
+ also has the name of the project in it. That way, when
+ Vince sends me mail about the project, I can see that
+ message both in the "Vince" vFolder and in the "Project"
+ vFolder. That's because when I open up the "Vince" folder,
+ I'm really performing a search for all the mail from Vince,
+ and when I open the "Project" folder I'm really performing
a search for all the mail about the project.
- (INSERT SCREENSHOT HERE)
+ <!-- (INSERT SCREENSHOT HERE) -->
</para>
</example>
@@ -949,9 +960,9 @@ possibly never will be due to security evil. -->
click <guibutton>Add</guibutton> to add a new vFolder.
</para>
<para>
- You'll be prompted to create a filtering rule. To do so,
- select one of the base rules, and click
- <guibutton>Next</guibutton> to customize it. Your options are:
+ You'll be prompted to create a filtering rule. You can build
+ your own from the ground up, or select one of several base
+ rules to customize. Your options are:
<variablelist>
<varlistentry>
<term><guilabel>For matching messages:</guilabel></term>
@@ -967,8 +978,8 @@ possibly never will be due to security evil. -->
<term><guilabel>Messages from a certain person:</guilabel></term>
<listitem>
<para>
- Enter an email address, and the vFolder will contain
- any messages from that address.
+ The vFolder will contain messages from an address
+ you enter.
</para>
</listitem>
</varlistentry>
@@ -992,7 +1003,7 @@ possibly never will be due to security evil. -->
</varlistentry>
</variablelist>
- as is shown in <xref
+ The selection window is shown in <xref
linkend="usage-mail-vfolder-fig-createrule">
<figure id="usage-mail-vfolder-fig-createrule">
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index d03aaada50..051d16b900 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -63,19 +63,19 @@
<title>The Shortcut Bar</title>
<para>
<application>Evolution</application>'s most important job is
- to give you access to your information, and help you use it
+ 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
- hand side of the main window. The shortcut bar has two types
- of buttons: big ones with names like
- <guilabel>Inbox</guilabel> and <guilabel>Calendar</guilabel>,
- and small rectangular ones at the top and bottom, which are
- called category buttons.
+ hand side of the main window. The large buttons with names
+ like <guilabel>Inbox</guilabel> and
+ <guilabel>Contacts</guilabel> are the shortcuts, and you can
+ select different groups of shortcuts by clicking the
+ rectangular category buttons.
</para>
<para>
- The category buttons are labelled <guilabel>Evolution
- Shortcuts</guilabel> and <guilabel>Internet
- Directories</guilabel>. When you click on them, they'll slide
+ The category buttons are <guibutton>Evolution
+ Shortcuts</guibutton> and <guibutton>Internet
+ Directories</guibutton>. When you click on them, they'll slide
up and down to give you access to different sorts of shortcuts.
When you first start <application>Evolution</application>, you
are looking at the <guilabel>Evolution Shortcuts</guilabel>
@@ -86,7 +86,7 @@
others you or your system administrator might have added.
Internet directories behave a lot like the local contact
manager, which is covered in <xref linkend="usage-contact">.
- </para>
+ </para>
<para>
Take a look at the <guilabel>Evolution Shortcuts</guilabel>
again. They are:
@@ -183,9 +183,9 @@
To remove a shortcut from the shortcut bar, right-click on it
and select <guimenuitem>Remove</guimenuitem>. </para>
<para>
- To change the way the shortcut bar looks, right-click in the
- shortcut bar but not on a button. From the menu that
- appears, you can select icon sizes.
+ To change the way the shortcut bar looks, right-click in an
+ empoy space on the shortcut bar. From the menu that appears,
+ you can select icon sizes.
</para>
</tip>
</sect1>
@@ -205,9 +205,9 @@
<guilabel>External Directories</guilabel>, for contact
directories stored on a network. The most important one is
probably <guilabel>Local</guilabel>, which you can use to access
- all the data that's actually stored on your computer. If you
- click on the plus sign plus sign next to the
- <guilabel>Local</guilabel> folder, you'll see the contents:
+ all the data that's stored on your computer. If you click on
+ the plus sign plus sign next to the <guilabel>Local</guilabel>
+ folder, you'll see the contents:
<itemizedlist>
<listitem>
<para>
@@ -250,6 +250,17 @@
<guilabel>Contacts</guilabel> for storing contacts.
</para>
+ <note>
+ <title>Folders have Limits</title>
+ <para>
+ You can always place a folder inside other folders,
+ regardless of folder type. However, calendars,
+ contacts, and mail can't go into the same
+ folder. Calendars have to go in calendar folders, mail
+ in mail folders, and contacts in contact folders.
+ </para>
+ </note>
+
<!-- UNIMPLEMENTED
<para>
Right-clicking will bring up a menu for just about anything