aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--help/C/config-prefs.xml22
-rw-r--r--help/C/menuref.xml2
-rw-r--r--help/C/usage-calendar.xml22
-rw-r--r--help/C/usage-contact.xml26
-rw-r--r--help/C/usage-exec-summary.xml35
-rw-r--r--help/C/usage-mail-org.xml72
-rw-r--r--help/C/usage-mail.xml534
-rw-r--r--help/C/usage-mainwindow.xml62
8 files changed, 253 insertions, 522 deletions
diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index fdae14dac9..1ef309a783 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -15,7 +15,7 @@
Evolution 1.2 brings with it a redesigned comprehensive
settings window that you can open by choosing <menuchoice>
<guimenu>Tools</guimenu>
- <guimenuitem>Configure</guimenuitem></menuchoice>, no matter
+ <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
@@ -390,7 +390,7 @@ smtp.omniport.com:143
</listitem>
</varlistentry>
<varlistentry>
- <term>Special Folders</term>
+ <term>Defaults</term>
<listitem>
<para>
Here, you can decide where this account will store the
@@ -628,27 +628,29 @@ smtp.omniport.com:143
</listitem>
</varlistentry>
<varlistentry>
- <term>First day of the week</term>
+ <term>Week Starts</term>
<listitem>
<para>You can set weeks to start on Sunday or on Monday.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>Start of day</term>
+ <term>Day Begins</term>
<listitem>
<para>
- Says what time of the day your weekday starts. This
- will show all times till the end of the day,
- regardless of there is an appointment during the time
- period.
+ Set the beginning of a normal workday. If you work odd
+ hours, or want to make sure that your early-morning
+ appointments are displayed, you may find this option useful.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>End of day</term>
+ <term>Day Ends</term>
<listitem>
<para>
- Sets the time the day ends at.
+ Set the end of a normal workday. If you work odd
+ hours, or want to make sure that your evening
+ appointments are displayed, you may find this option
+ useful.
</para>
</listitem>
</varlistentry>
diff --git a/help/C/menuref.xml b/help/C/menuref.xml
index bb1eccf994..f6dd57ea58 100644
--- a/help/C/menuref.xml
+++ b/help/C/menuref.xml
@@ -81,7 +81,7 @@
<para>
<menuchoice><guimenu>File</guimenu>
<guisubmenu>New</guisubmenu>
- <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or
+ <guimenuitem>Shortcut</guimenuitem> </menuchoice> or
<keycombo action="simul">
<keycap>Ctrl</keycap>
<keycap>Shift</keycap>
diff --git a/help/C/usage-calendar.xml b/help/C/usage-calendar.xml
index dd60c54b20..0ac1333a3c 100644
--- a/help/C/usage-calendar.xml
+++ b/help/C/usage-calendar.xml
@@ -8,7 +8,8 @@
<para>
This chapter will show you how to use the Ximian Evolution
Calendar to manage your schedule alone or in conjunction with
- peers.
+ peers. To learn about importing calendar data, see <xref
+ linkend="importing-mail" />, which covers the Import tool.
</para>
<sect1 id ="usage-calendar-view">
@@ -121,11 +122,12 @@
<orderedlist numeration="arabic">
<listitem>
<para>
- Click
+ Select
<menuchoice>
<guimenu>Tools</guimenu>
- <guimenuitem>Calendar Settings</guimenuitem>
- </menuchoice>
+ <guimenuitem>Settings</guimenuitem> </menuchoice>, and
+ click the <guilabel>Calendar And Tasks</guilabel> icon
+ in the settings dialog.
</para>
</listitem>
<listitem>
@@ -163,9 +165,9 @@
</para>
</note>
<para>
- You can have as many
- <guilabel>Alarms</guilabel>, any time prior to the appointment
- you've scheduled. You can have one alarm of each of the following types:
+ You can have several
+ <guilabel>Reminders</guilabel>, any time prior to the appointment
+ you've scheduled. You can have one reminder of each of the following types:
<variablelist>
<varlistentry>
<term><guilabel>Display:</guilabel></term>
@@ -283,7 +285,7 @@
If you want, you can alter an appointment
summary in the calendar view by clicking on it and typing. You
can change other settings by right-clicking on the appointment then
- choosing <guimenuitem>Edit this Appointment</guimenuitem>.
+ choosing <guimenuitem>Open</guimenuitem>.
</para>
</sect2>
<sect2 id="usage-calendar-rsvp">
@@ -331,9 +333,9 @@
</listitem>
<listitem>
<para>
- If you have multiple Evolution identities, choose the
+ If you have multiple Evolution email accounts, choose the
one you'll use by selecting an item in the
- <guilabel>Sent By</guilabel> field.
+ <guilabel>Organizer</guilabel> field.
</para>
</listitem>
<listitem>
diff --git a/help/C/usage-contact.xml b/help/C/usage-contact.xml
index fb71d687a7..a3835addd8 100644
--- a/help/C/usage-contact.xml
+++ b/help/C/usage-contact.xml
@@ -75,14 +75,25 @@
</para>
<para>
- The contact editor window has two tabs,
- <guilabel>General</guilabel>, for basic contact information, and
+ The contact editor window has three tabs,
+ <guilabel>General</guilabel>, for basic contact information,
<guilabel>Details</guilabel>, for a more specific description of
- the person. In addition, it contains a <guimenu>File</guimenu>
- menu and a toolbar with three items: <guilabel>Save and
- Close</guilabel>, <guilabel>Print</guilabel>, and
- <guilabel>Delete</guilabel>.
+ the person, and <guilabel>Collaboration</guilabel> for
+ information about scheduling and working closely with them. In
+ addition, it contains a <guimenu>File</guimenu> menu and an
+ <guimenu>Actions</guimenu> menu. Under
+ <guimenu>Actions</guimenu> you will find <guimenuitem>Forward
+ Contact</guimenuitem>, which opens a new message with the card
+ already attached, and <guimenuitem>Send Message to
+ Contact</guimenuitem>, which will open a new message to the
+ contact.
</para>
+ <para>
+ The toolbar is relatively simple: <guilabel>Save and
+ Close</guilabel>, <guilabel>Print</guilabel>,
+ <guilabel>Close</guilabel>, and <guilabel>Delete</guilabel>.
+ </para>
+
<figure id="usage-contact-editor-fig">
<title>Evolution Contact Editor</title>
@@ -542,8 +553,7 @@
As noted before, when you get information about a person in
the mail or in a calendar entry, you can add it to an address
card. To do so, right click on any email address or email
- message, and select <guimenuitem>Add Address
- Card</guimenuitem> from the menu that appears.
+ message, and select <guimenuitem>Add Sender to Address Book</guimenuitem> from the menu that appears.
<application> Evolution</application> can also add cards from a
hand-held device during HotSync operation. For more
information about that, see <xref linkend="usage-sync"/>.
diff --git a/help/C/usage-exec-summary.xml b/help/C/usage-exec-summary.xml
index 564c1c6617..67c0cc5b69 100644
--- a/help/C/usage-exec-summary.xml
+++ b/help/C/usage-exec-summary.xml
@@ -181,7 +181,7 @@
Choose
<menuchoice>
<guimenu>Tools</guimenu>
- <guimenuitem>Configure</guimenuitem> </menuchoice> and
+ <guimenuitem>Settings</guimenuitem> </menuchoice> and
select the Summary Preferences tool.
</para>
</listitem>
@@ -201,18 +201,13 @@
</para>
</listitem>
</orderedlist>
- <tip id="measurments">
- <title>Metric or Imperial?</title>
- <para>
- <application>Evolution</application> supports both
- Imperial and Metric measurement for weather
- reports. Imperial units are sometimes called British
- units, but are used almost exclusively in the United
- States. Britain, and most of the rest of the world, use
- metric units.
- </para>
- </tip>
</para>
+ <para>
+ Below the list of cities, you can select the time, in seconds,
+ between updates, and whether you wish to see temperatures in Celsius
+ or Farenheit.
+ </para>
+
</sect2>
<sect2 id="customizing-feeds">
<title>Customizing Your News Feeds</title>
@@ -224,9 +219,9 @@
Choose
<menuchoice>
<guimenu>Tools</guimenu>
- <guimenuitem>Configure</guimenuitem> </menuchoice> and
+ <guimenuitem>Settings</guimenuitem> </menuchoice> and
select the Summary Preferences tool. Then, choose the
- <guilabel>News</guilabel> tab.
+ <guilabel>News Feeds</guilabel> tab.
</para>
</listitem>
<listitem>
@@ -249,7 +244,8 @@
</para>
<para>
You can also add your own news feeds. Evolution will display
- RDF format news feeds from the website of your choice.
+ RDF formatted XML news feeds from the website of your
+ choice. For most sites, it's a file called "index.rdf."
</para>
</sect2>
@@ -263,7 +259,7 @@
Choose
<menuchoice>
<guimenu>Tools</guimenu>
- <guimenuitem>Configure</guimenuitem> </menuchoice> and
+ <guimenuitem>Settings</guimenuitem> </menuchoice> and
select the Summary Preferences tool.
</para>
</listitem>
@@ -274,12 +270,13 @@
</listitem>
<listitem>
<para>
- Select the mail folder you want to see in the preview on the left.
+ Expand the folder tree to the folders you wish to
+ display in the Summary.
</para>
</listitem>
<listitem>
<para>
- Click <guibutton>Add</guibutton>.
+ Click the checkbox to the left of that folder.
</para>
</listitem>
</orderedlist>
@@ -295,7 +292,7 @@
Choose
<menuchoice>
<guimenu>Tools</guimenu>
- <guimenuitem>Configure</guimenuitem> </menuchoice> and
+ <guimenuitem>Settings</guimenuitem> </menuchoice> and
select the Summary Preferences tool.
</para>
</listitem>
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index 4177688017..7841239c1d 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -1,4 +1,4 @@
-x<chapter id="usage-mail-organize">
+<chapter id="usage-mail-organize">
<title>Organizing and Managing your Email</title>
<para>
Even if you only get a few email messages a day, you probably
@@ -17,7 +17,7 @@ x<chapter id="usage-mail-organize">
old information.
</para>
<sect2 id="importing-mail">
- <title>Importing Email</title>
+ <title>Importing Email and Other Data</title>
<para>
<application>Ximian Evolution</application> can import the
following types of files:
@@ -58,6 +58,15 @@ x<chapter id="usage-mail-organize">
</varlistentry>
<varlistentry>
+ <term>LDAP Data Interchange Format (LDIF):</term>
+ <listitem>
+ <para>
+ A standard data format for address book cards.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>MBox (mbox):</term>
<listitem>
<para>
@@ -247,15 +256,6 @@ x<chapter id="usage-mail-organize">
</para></listitem>
</varlistentry>
- <varlistentry>
- <term><guimenuitem>Group By this Field</guimenuitem>:</term>
- <listitem><para>
- Groups messages instead of sorting them. This makes each contact
- with identical properties in the specified field to be placed in
- its own group and physically separated from others.
- </para></listitem>
- </varlistentry>
-
<varlistentry>
<term><guimenuitem>Remove this
Column</guimenuitem>:</term>
@@ -269,14 +269,12 @@ x<chapter id="usage-mail-organize">
</varlistentry>
<varlistentry>
- <term><guimenuitem>Field
- Chooser</guimenuitem>:</term> <listitem><para>
- When you choose this item, a list
- of column headers will appear; just drag and drop them into
- place between two existing headers. A red arrow will
- appear to show you where you're about to put the
- column.
- </para></listitem>
+ <term><guimenuitem>Customize Current
+ View</guimenuitem>:</term> <listitem><para> Choose this
+ item to pick a more complex sort order for messages, or
+ to choose which columns of information about your
+ messages you wish to display
+ </para></listitem>
</varlistentry>
</variablelist>
</para>
@@ -395,17 +393,19 @@ x<chapter id="usage-mail-organize">
<para>
If you think you'll want to return to a search again, you can
- save it as a virtual folder by selecting <guilabel>Store
- Search as vFolder</guilabel>.
+ save it and execute it later. Just click <guilabel> Save
+ Search</guilabel> from the <guimenu>Search</guimenu> menu. Then,
+ you can run that search on any folder by selecting it from the
+ <guimenu>Search</guimenu> menu. You may also want to create a
+ vFolder instead; see <xref
+ linkend="usage-mail-organize-vfolders" /> for more detail.
</para>
<para>
When you're done with the search, go back to seeing all your
messages by choosing <guimenuitem>Show All</guimenuitem> from
- the <guilabel>Search</guilabel> drop-down box. If you're
- sneaky, just enter a blank search: since every message has at
- least one space in it, you'll see every message in the
- folder.
+ the <guilabel>Search</guilabel> drop-down box, or enter a
+ blank search.
</para>
<para>
@@ -609,11 +609,18 @@ x<chapter id="usage-mail-organize">
<listitem>
<para>
- Regex Match - If you know your way around a
+ Expression - If you know your way around a
<glossterm
linkend="regular-expression">regex</glossterm>, or
regular expression, put your knowledge to use
- here.
+ here. This allows you to search for complex
+ patterns of letters, so that you can find, for
+ example, all words that start with a and ends with
+ m, and are between six and fifteen letters long,
+ or all messages that declare a particular header
+ twice. For information about how to use regular
+ expressions, check the manual page for the
+ <command>grep</command> command.
</para>
</listitem>
@@ -1048,7 +1055,7 @@ x<chapter id="usage-mail-organize">
<para>
<menuchoice>
<guimenu>Tools</guimenu>
- <guimenuitem>vFolder Editor</guimenuitem>
+ <guimenuitem>Virtual Folder Editor</guimenuitem>
</menuchoice>
</para>
</listitem>
@@ -1120,6 +1127,13 @@ x<chapter id="usage-mail-organize">
</para></listitem>
<listitem><para>
+ Label - This works the same way as the <guilabel>Score</guilabel>
+ option, although it allows you to select from various labels applied to the message,
+ such as <guilabel>Important, Personal, To Do,
+ Work</guilabel> or <guilabel>Later</guilabel>.
+ </para></listitem>
+
+ <listitem><para>
Score - Emails have a standard priority range from -3 (least
important) to 3 (most important). You can have vFolders set the
priority of messages you receive, and then have other
@@ -1181,7 +1195,7 @@ x<chapter id="usage-mail-organize">
</listitem>
<listitem>
<para>
- All local folders
+ With all local folders
</para>
</listitem>
<listitem>
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 59f0ad34ce..aa55b1b5d2 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -212,7 +212,7 @@
<para>
Now that you've had a look around the
<interface>Inbox</interface>, it's time to check for new mail.
- Click <guibutton>Get Mail</guibutton> in the toolbar to check
+ Click <guibutton>Send/Receive</guibutton> in the toolbar to check
your mail. If you haven't entered any mail settings yet, the
<interface>setup assistant</interface> will ask you for the
information it needs to check your email.
@@ -272,9 +272,10 @@
</listitem>
<listitem>
<para>
- In <application>Evolution</application>
- <menuchoice><guimenu>Tools</guimenu><guimenuitem>Mail
- Settings</guimenuitem></menuchoice>, and pick the account
+ In <application>Evolution</application>, select
+ <menuchoice><guimenu>Tools</guimenu><guimenuitem>
+ Settings</guimenuitem></menuchoice>, go to the
+ Mail Accounts configuration tool, and pick the account
you'd like to use to share mail. You may want to
create a new account just for this source of
mail.
@@ -285,8 +286,9 @@
Under the <guilabel>Receiving Mail</guilabel>
tab, select the type of mail file that your
other mail application uses, and then enter the
- full path to that file.
- </para>
+ full path to that location. A typical choice
+ would be mbox files, with the path /home/username/Mail/.
+ </para>
</listitem>
<listitem>
<para>
@@ -307,7 +309,7 @@
news source to your configuration (see <xref
linkend="config-prefs-network-news"/>). The news server will
appear as a remote server, and will look quite similar to an
- IMAP folder. When you click <guibutton>Get Mail</guibutton>,
+ IMAP folder. When you click <guibutton>Send/Receive</guibutton>,
<application>Evolution</application> will also check for news
messages.
</para>
@@ -412,102 +414,36 @@
</menuchoice>.
If you want <application>Ximian Evolution</application> to
- load remotely hosted images more often, go to the
- <guilabel>Display</guilabel> tab of the
+ load remotely hosted images more often, select
<menuchoice>
<guimenu>Tools</guimenu>
- <guimenuitem>Mail Settings</guimenuitem>
- </menuchoice> dialog.
+ <guimenuitem>Settings</guimenuitem> </menuchoice> and go to
+ the mail settings tool. There, click the <guilabel>HTML
+ Mail</guilabel> tab and select one of the items there: <guilabel>Never load images off the net</guilabel>, <guilabel>Load images if sender is in addressbook</guilabel>, or <guilabel>Always load images off the net.</guilabel>
</para>
<note id="http-proxy">
<title>Loading Images from the Net through an HTTP Proxy</title>
<para>
- If you use an HTTP proxy,
- <application>Evolution</application> must be able to find
+ If you use an HTTP proxy (as in many large organizations),
+ <application>Evolution</application> must be able to find
it through the <systemitem>gnome-vfs</systemitem> subsystem
before it can load images from the Internet. This is also
the case if you wish to access weather and news information
- through the Summary tool. You can tell the GNOME Virtual
- File System about your HTTP proxy in one of two ways:
- <variablelist>
- <varlistentry>
- <term>Configure it with Nautilus</term>
- <listitem>
- <para>
- <orderedlist numeration="arabic">
- <listitem>
- <para>
- Open a Nautilus window
- </para>
- </listitem>
- <listitem>
- <para>
- Select <menuchoice>
- <guimenu>Preferences</guimenu>
- <guimenuitem>Edit Preferences</guimenuitem>
- </menuchoice>.
- </para>
- </listitem>
- <listitem>
- <para>
- Go to the <guilabel>Navigation</guilabel> tab.
- </para>
- </listitem>
- <listitem>
- <para>
- Click the <guilabel>Use HTTP Proxy</guilabel>
- checkbox and enter the location of your HTTP
- proxy in the <guilabel>Location</guilabel> field.
- </para>
- </listitem>
- </orderedlist>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Configure it with the gconftool command</term>
- <listitem>
- <para>
- <orderedlist numeration="arabic">
- <listitem>
- <para>
- Open a terminal.
- </para>
- </listitem>
- <listitem>
- <para>
- Enter the command
- <command>
- gconftool --type=bool --set /system/gnome-vfs/use-http-proxy "TRUE"
- </command>
- </para>
- </listitem>
- <listitem>
- <para>
- Enter the command
- <command>
- gconftool --type=string --set /system/gnome-vfs/http-proxy-host "your-proxy-url"
- </command>
- </para>
- </listitem>
- <listitem>
- <para>
- Enter the command
- <command>
- gconftool --type=int --set /system/gnome-vfs/http-proxy-port "8080"
- </command>
- </para>
- </listitem>
- </orderedlist>
- </para>
- <para>
- For more information about the gconftool command,
- read the gconftool man page.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
+ through the Summary tool.
</para>
+ <para>
+ If you are using GNOME 1.4, you will need to configure this
+ in the Nautilus <guilabel>Preferences</guilabel>
+ dialog. However, in GNOME 2.0 and later, you can use the
+ GNOME Control Center. Select
+ <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
+ from your menu panel or from the GNOME menu, and then click
+ the <guibutton>Network Proxies</guibutton> button in the
+ <guilabel>System Settings</guilabel> category. Select the
+ <guilabel>Use an HTTP network proxy</guilabel> check box and
+ then enter information about your proxy. If you are not sure,
+ check with your ISP or system administrator.
+ </para>
</note>
</sect3>
</sect2>
@@ -520,7 +456,7 @@
<menuchoice> <guimenu>File</guimenu>
<guisubmenu>New</guisubmenu> <guimenuitem>
Mail Message</guimenuitem></menuchoice>, or by pressing the
- <guibutton>Compose</guibutton> button in the Inbox toolbar.
+ <guibutton>New</guibutton> button in the Inbox toolbar.
When you do so, the <interface>New Message</interface> window
will open, as shown in <xref
linkend="usage-mail-newmsg-fig"/>.
@@ -753,7 +689,7 @@
</tip>
</sect3>
- <sect3 id="usage-mail-getnsend-send-to">
+ <sect3 id="usage-mail-getnsend-send-to">
<title>Choosing Recipients Quickly</title>
<para>
If you have created address cards in the contact manager,
@@ -764,13 +700,12 @@
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
+<!--
+ 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.
+ dialog. NOTE: ex-feature, may be reinstated, but probably not.
-->
-
</para>
<para>
@@ -795,8 +730,8 @@
<title>Replying to Email Messages</title>
<para>
To reply to a message, press the
- <guibutton>Reply:</guibutton> button while it is selected,
- or choose <guimenuitem>Reply to Sender:</guimenuitem> from
+ <guibutton>Reply</guibutton> button while it is selected,
+ or choose <guimenuitem>Reply to Sender</guimenuitem> from
the message's right-click menu. That will open the
<interface>message composer</interface>. The
<guilabel>To:</guilabel> and <guilabel>Subject:</guilabel>
@@ -891,7 +826,7 @@
<para>
<variablelist>
<varlistentry>
- <term><guimenuitem>Find:</guimenuitem></term>
+ <term><guimenuitem>Find</guimenuitem></term>
<listitem><para> Enter a word or phrase, and
<application>Evolution</application> will find it
in your message.
@@ -899,7 +834,7 @@
</varlistentry>
<varlistentry>
- <term><guimenuitem>Find Regex:</guimenuitem></term>
+ <term><guimenuitem>Find Regex</guimenuitem></term>
<listitem>
<para>
Find a regex, also called a
@@ -910,14 +845,14 @@
</varlistentry>
<varlistentry>
- <term><guimenuitem>Find Again:</guimenuitem></term>
+ <term><guimenuitem>Find Again</guimenuitem></term>
<listitem><para>
Select this item to repeat the last search you performed.
</para></listitem>
</varlistentry>
<varlistentry>
- <term><guimenuitem>Replace:</guimenuitem></term>
+ <term><guimenuitem>Replace</guimenuitem></term>
<listitem><para>
Find a word or phrase, and replace it with
something else.
@@ -986,7 +921,7 @@
into four categories:
<variablelist>
<varlistentry>
- <term>Headers and lists:</term>
+ <term>Headers and lists</term>
<listitem>
<para>
At the left edge of the toolbar, you can choose
@@ -1013,7 +948,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Text style:</term>
+ <term>Text style</term>
<listitem>
<para>
Use these buttons to determine the way your letters
@@ -1031,7 +966,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Alignment:</term>
+ <term>Alignment</term>
<listitem>
<para>
Located next to the text style buttons, these three
@@ -1045,7 +980,7 @@
</varlistentry>
<varlistentry>
- <term>Indentation rules:</term>
+ <term>Indentation rules</term>
<listitem>
<para>
The button with the arrow pointing left will reduce
@@ -1056,7 +991,7 @@
</varlistentry>
<varlistentry>
- <term>Color Selection:</term>
+ <term>Color Selection</term>
<listitem>
<para>
At the far right is the color section tool. The
@@ -1078,7 +1013,7 @@
spruce up your email to make it more interesting:
<variablelist>
<varlistentry>
- <term><guimenuitem>Link:</guimenuitem></term>
+ <term><guimenuitem>Insert Link</guimenuitem></term>
<listitem>
<para>
Lets you link some text to a website. Use this tool to put hyperlinks in your HTML
@@ -1116,7 +1051,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><guimenuitem>Image:</guimenuitem></term>
+ <term><guimenuitem>Insert Image</guimenuitem></term>
<listitem>
<para>
Lets you put an image alongside text.
@@ -1126,11 +1061,6 @@
<orderedlist numeration="arabic">
<listitem>
<para>
- Open a new email by clicking <guibutton>New Message</guibutton>
- </para>
- </listitem>
- <listitem>
- <para>
Make sure that you have the
<menuchoice>
<guimenu>Format</guimenu>
@@ -1163,7 +1093,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><guimenuitem>Rule:</guimenuitem></term>
+ <term><guimenuitem>Insert Rule</guimenuitem></term>
<listitem>
<para>
Inserts a horizontal line into the text to help divide two
@@ -1172,12 +1102,7 @@
<para>
To insert a rule:
<orderedlist numeration="arabic">
- <listitem>
- <para>
- Open a new email by clicking <guibutton>New Message</guibutton>
- </para>
- </listitem>
- <listitem>
+ <listitem>
<para>
Make sure that you have the
<menuchoice>
@@ -1223,22 +1148,17 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Table:</term>
+ <term>Insert Table</term>
<listitem>
<para>
Inserts a table into the text to help divide two
sections.
</para>
<para>
- To insert a rule:
+ To insert a table:
<orderedlist numeration="arabic">
<listitem>
<para>
- Open a new email by clicking <guibutton>New Message</guibutton>
- </para>
- </listitem>
- <listitem>
- <para>
Make sure that you have the
<menuchoice>
<guimenu>Format</guimenu>
@@ -1254,12 +1174,15 @@
</listitem>
<listitem>
<para>
- Select the <guibutton>Template</guibutton> you wish to use. Each template has a slightly different feel and layout.
+ Select the table <guibutton>Template</guibutton>
+ you wish to use. Each has a slightly different feel and
+ layout.
</para>
</listitem>
<listitem>
<para>
- If you so desire, you may change the other options such as: number of rows, columns, spacing of each cell, and more.
+ If you so desire, you may change the number of
+ rows, columns, spacing of each cell, and so forth.
</para>
</listitem>
<listitem>
@@ -1269,91 +1192,19 @@
</listitem>
</orderedlist>
</para>
+
+ <para>
+ Once the table is in place, you can right-click on
+ it and get a list of ways to alter it, such as
+ changing its background color, expanding it, or
+ deleting a row or cell.
+ </para>
</listitem>
</varlistentry>
- </variablelist>
- To add a hyperlink to your HTML message:
- <orderedlist numeration="arabic">
- <listitem>
- <para>
- Select the text you want to display as a link.
- </para>
- </listitem>
- <listitem>
- <para>
- Right click on text and select
- <guimenuitem>Link</guimenuitem>
- </para>
- </listitem>
- <listitem>
- <para>
- Enter the address you wish to link to in the
- <guilabel>URL</guilabel> field.
- </para>
- </listitem>
- <listitem>
- <para>
- Press <guibutton>OK</guibutton>.
- </para>
- </listitem>
- </orderedlist>
- </para>
-
- <para>
- To add an image to your HTML message:
- <orderedlist numeration="arabic">
- <listitem>
- <para>
- Select
- <menuchoice>
- <guimenu>Insert</guimenu>
- <guimenuitem>Image</guimenuitem>
- </menuchoice>.
- </para>
- </listitem>
- <listitem>
- <para>
- Click <guibutton>Browse</guibutton> to select the image
- you want to include in your email.
- </para>
- </listitem>
-
- <listitem>
- <para>
- 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>
- 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>
- When you are finished, press
- <guibutton>Insert</guibutton> to include the image in
- your message.
- </para>
- </listitem>
- </orderedlist>
- </para>
- <para>
- You can insert an image into the background of your message by
- right-clicking on the message background and selecting
- <guimenuitem>Page</guimenuitem>. From that dialog, you may
- also select background color and set other general options
- about the HTML message you are composing.
- </para>
- <sect3 id="html-templates">
- <title>HTML Templates</title>
- <para>
+ <varlistentry>
+ <term>Templates</term>
+ <listitem>
+ <para>
<application>Evolution</application> not only allows you to
decorate your email with HTML text and graphics, but
provides you with prebuilt templates for you to use when
@@ -1365,11 +1216,6 @@
<orderedlist numeration="arabic">
<listitem>
<para>
- Create a new email by clicking <guibutton>New Message</guibutton>.
- </para>
- </listitem>
- <listitem>
- <para>
Make sure that the
<menuchoice>
<guimenu>
@@ -1429,105 +1275,12 @@
</para>
</listitem>
</orderedlist>
- </para>
- </sect3>
- <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 like
- <application>Gnumeric</application>.
- </para>
- <para>
- To include a table in your email:
- <orderedlist numeration="arabic">
- <listitem>
- <para>
- Create a new email by clicking <guibutton>New Message</guibutton>.
- </para>
- </listitem>
- <listitem>
- <para>
- Make sure you have the
- <menuchoice>
- <guimenu>
- Format
- </guimenu>
- <guimenuitem>
- 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, or style, you want to use for the
- table.
- </para>
- </listitem>
- <listitem>
- <para>
- Set the number of rows and columns you want.
- </para>
- </listitem>
- <listitem>
- <para>
- Click the <guibutton>Insert</guibutton> button.
- </para>
- </listitem>
- <listitem>
- <para>
- Click in a cell and type to insert text into the table.
- </para>
- </listitem>
- </orderedlist>
- </para>
- <para>
- You can also edit a table after creation. Just right-click
- on it and select <guimenuitem>Table</guimenuitem> to open
- the table editing window again. Or, you can select items
- from the <guimenu>Table Delete</guimenu> and <guimenu>Table
- Insert</guimenu> menus.
- </para>
-
- <para>
- <tip id="table-tip">
- <title>Deleting an Entire Table</title>
- <para>
- You can delete an entire table by right-clicking on
- a table or other HTML object in a message, and selecting
- <menuchoice>
- <guimenu>Table Delete</guimenu>
- <guimenuitem>Table</guimenuitem> </menuchoice>. In an
- HMTL message, your signature, templates, and image
- inclusions all have tables around them, and you can remove
- them completely and quickly with this shortcut.
- </para>
- </tip>
</para>
-
- </sect3>
- </sect2>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+</para>
+</sect2>
<sect2 id="usage-mail-getnsend-fwd">
<title>Forwarding Mail</title>
@@ -1551,16 +1304,19 @@
</para>
<para>
To forward a message you are reading, press
- <guibutton>Forward</guibutton> on the toolbar, or select
- <menuchoice> <guimenu>Message</guimenu>
- <guimenuitem>Forward</guimenuitem> </menuchoice>. If you
- prefer to forward the message <glossterm linkend="inline">inline</glossterm>
+ <guibutton>Forward</guibutton> on the toolbar, select
+ <menuchoice> <guimenu>Actions</guimenu>
+ <guimenuitem>Forward</guimenuitem> </menuchoice>, or press
+ <keycombo
+action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>. If
+ you prefer to forward the message <glossterm
+ linkend="inline">inline</glossterm>
instead of attached, select <menuchoice>
- <guimenu>Message</guimenu> <guimenuitem>Forward
+ <guimenu>Actions</guimenu> <guimenuitem>Forward
Inline</guimenuitem> </menuchoice> from the menu. Choose an
addressee as you would when sending a new message; the
- subject will already be entered, but you can alter it.
- Enter your comments on the message in the
+ subject will already be entered, although you can alter it
+ if you wish. Enter your comments on the message in the
<interface>composition frame</interface>, and press
<guibutton>Send</guibutton>.
</para>
@@ -1630,115 +1386,6 @@
</itemizedlist>
</para>
</sect2>
- <sect2 id="fancy-mail">
- <title>Making Your Email More Fancy</title>
- <para>
- <application>Evolution</application> can do a lot with email
- by utilizing the HTML features. Making an email functional
- and visually attractive can be challenging. The following
- section provides tips to make your mail functional, while
- being more visually attractive than ever.
- </para>
- <sect3 id="sections-bolded-title">
- <title>Sections Outlined in Bold</title>
- <para>
- Indented sections are a great way to categorize and group
- your thoughts together. Below is an example of indented
- text with headings to help separate your thoughts into the
- proper sections:
- <figure>
- <title>Indented Text with Headlines</title>
- <screenshot>
- <screeninfo></screeninfo>
- <graphic format="PNG" fileref="figures/outline" srccredit="Kevin Breit"/>
- </screenshot>
- </figure>
- </para>
- <para>
- This message is not only more attractive, but more
- informative. Each section is broken down into subsections.
- The title for each section is in bold text, with the
- following content indented.
- </para>
- <para>
- You may want to increase the size of your section headlines
- instead of merely putting them in bold. Header size 4 is
- often the best choice, since it is not too large. You can
- change your text to size 4 by selecting it and pressing
- Ctrl+4. You can set your text to the normal text size by
- hitting Ctrl+0.
- </para>
- </sect3>
- <sect3 id="bulleted-lists">
- <title>Bulleted Lists</title>
- <para>
- Select the <guimenuitem>Bulleted List</guimenuitem> option
- from the text style drop-down box to begin making a bulleted
- list. <application>Evolution</application> will handle the
- word wrap and indentation for you. If you prefer to send
- the message in plain text, you can still write it up in
- HTML, and <application>Evolution</application> will convert
- to a well-formed plain-text bulleted list, using asterisks
- instead of HTML bullets.
- </para>
- </sect3>
- <sect3 id="inline-images">
- <title>Images In Your Email</title>
- <para>
- Images can help people to understand your point. You can
- even use a HTML Picture Frame Template in
- <application>Evolution</application>, which looks very
- attractive and sets your image off from the rest of your
- message with a border and caption.
- </para>
- <para>
- If you do choose to use images, try to keep them narrow. If
- your images are wider than 400 pixels, the image may not fit
- in the whole email window, making it hard for your reader to
- read the email and view the image. Consider using a smaller
- version ("thumbnail") of your image, and offering a link to
- the larger version your readers can view in a web browser if
- they want.
- <figure>
- <title>Images in an email</title>
- <screenshot>
- <screeninfo></screeninfo>
- <graphic format="PNG" fileref="figures/small_desktop" srccredit="Kevin Breit"/>
- </screenshot>
- </figure>
- </para>
- </sect3>
- <sect3 id="color-suggestions">
- <title>Coloring Your Text</title>
- <para>
- Colors can help bring words or sentences out for emphasis. You
- should choose your colors carefully though, as the wrong color
- can be distracting. Some good colors to use would be:
- <itemizedlist>
- <listitem>
- <para>
- Light brown
- </para>
- </listitem>
- <listitem>
- <para>
- Dull purple
- </para>
- </listitem>
- <listitem>
- <para>
- Dark red
- </para>
- </listitem>
- </itemizedlist>
- <!-- Include a screenshot -->
- Notice how these colors are similar saturation <!-- Confirm I am using the right word -->
- </para>
- <para>
- Happy mailing!
- </para>
- </sect3>
- </sect2>
</sect1>
<sect1 id="rsvp-stuff">
<title>RSVPs in Mail</title>
@@ -1760,7 +1407,7 @@
Your options are:
<variablelist>
<varlistentry>
- <term>Accept:</term>
+ <term>Accept</term>
<listitem>
<para>
Select this entry if you will attend the meeting. When you
@@ -1771,7 +1418,7 @@
</varlistentry>
<varlistentry>
- <term>Tentatively Accept:</term>
+ <term>Tentatively Accept</term>
<listitem>
<para>
Select this entry if you will probably attend the meeting.
@@ -1783,7 +1430,7 @@
</varlistentry>
<varlistentry>
- <term>Decline:</term>
+ <term>Decline</term>
<listitem>
<para>
Select this item if you will be unable to attend the
@@ -1796,7 +1443,7 @@
</varlistentry>
<varlistentry>
- <term>RSVP:</term>
+ <term>RSVP</term>
<listitem>
<para>
Check this box if you would like your response sent to
@@ -1940,7 +1587,12 @@
<orderedlist numeration="arabic">
<listitem>
<para>
- Open your account preferences.
+ Select
+ <menuchoice>
+ <guimenu>Tools</guimenu>
+ <guimenuitem>Settings</guimenuitem>
+ </menuchoice>, go to the Mail Account settings, and
+ select the account with which you want to use encryption.
</para>
</listitem>
<listitem>
@@ -1971,7 +1623,7 @@
<para>
This manual covers version 1.0.6 of GPG. If your version is
different, this may not be entirely accurate. You may find
- out your version number by typing in: <command>gpg
+ out your version number by typing in the command: <command>gpg
--version</command>.
</para>
</tip>
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index 3809c562bf..8b83ff91c9 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -141,6 +141,12 @@
</listitem>
<listitem>
<para>
+ Reply-To: If you want to have replies sent to another
+ email address, enter it here (optional).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
Organization: The company where you work, or the
organization you represent when you send email
(optional).
@@ -192,7 +198,7 @@
<listitem>
<para>
- Standard Unix mbox spools: If you want
+ Standard Unix mbox spool or directory: If you want
to read and store mail in the mail spool on your
local system, choose this option. You'll need to
provide the path to the mail spool
@@ -231,6 +237,7 @@
</para>
</listitem>
+<!-- not using this anymore
<listitem>
<para>
Directory Tree of mbox files: If you wish to use a
@@ -241,8 +248,8 @@
Evolution, while storing mail on your local system
in mbox format.
</para>
- </listitem>
-
+ </listitem>
+-->
<listitem>
<para>
None: Select this if you do not plan to
@@ -542,6 +549,31 @@
</para>
</sect2>
+ <sect2 id="step-three-b">
+ <title>Account Management</title>
+ <para>
+ This is a very short section. You can pick two things: the
+ name for the account, and whether it is the default account.
+ </para>
+ <para>
+ The name you choose for the account is used for display within
+ Evolution, and is not sent with any emails. The suggested
+ name is your email address, but you can use other words or
+ phrases, like "Work," "Personal" or "First Account" if you
+ like.
+ </para>
+ <para>
+ If you check the box next to the label <guilabel>Make this my
+ default account</guilabel>, Evolution will assume that you will
+ send messages from this most often, and will set the
+ "From" selector to this account whenever you open a new message. Only one account can be the default.
+ </para>
+ <para>
+ If you have not done so already, you may also be asked to choose
+ a time zone.
+ </para>
+ </sect2>
+
<sect2 id="fourth-step">
<title>Importing Mail (Optional)</title>
<para>
@@ -1000,6 +1032,14 @@ the workaround described in the note below.
</listitem>
<listitem>
+ <para>
+ <guilabel>Tasks</guilabel>, for your task list. Portions
+ of your task list are reflected in the calendar, as well
+ as in the summary folder.
+ </para>
+ </listitem>
+
+ <listitem>
<para>
<guilabel>Trash</guilabel>, a vFolder view of all the
messages you have marked for deletion but not yet
@@ -1031,7 +1071,8 @@ the workaround described in the note below.
<menuchoice> <guimenu>File</guimenu>
<guisubmenu>New</guisubmenu>
<guimenuitem>Folder</guimenuitem></menuchoice>
- <keycombo action="simul">
+ or press the keyboard shortcut
+ <keycombo action="simul">
<keycap>Shift</keycap>
<keycap>Ctrl</keycap>
<keycap>E</keycap>
@@ -1188,6 +1229,19 @@ the workaround described in the note below.
</para></listitem>
</varlistentry>
+
+
+ <varlistentry>
+ <term> <guimenu>Search</guimenu>:</term>
+ <listitem><para>
+ Select menu items here to search for messages, or for
+ phrases within a message. You can also see previous searches
+ you have made. In addition to the <guimenu>Search</guimenu>
+ menu, there is a text entry box in the toolbar that you can
+ use to search for messages.
+ </para></listitem>
+ </varlistentry>
+
<varlistentry>
<term> <guimenu>Help</guimenu>:</term>
<listitem><para>