aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/C/apx-gloss.sgml12
-rw-r--r--doc/C/config-sync.sgml3
-rw-r--r--doc/C/evolution.sgml (renamed from doc/C/evolution-guide.sgml)15
-rw-r--r--doc/C/preface.sgml6
-rw-r--r--doc/C/usage-mail.sgml39
-rw-r--r--help/C/apx-gloss.sgml12
-rw-r--r--help/C/config-sync.sgml3
-rw-r--r--help/C/evolution.sgml (renamed from help/C/evolution-guide.sgml)15
-rw-r--r--help/C/preface.sgml6
-rw-r--r--help/C/usage-mail.sgml39
10 files changed, 122 insertions, 28 deletions
diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
index 6124998862..129020aa3d 100644
--- a/doc/C/apx-gloss.sgml
+++ b/doc/C/apx-gloss.sgml
@@ -46,6 +46,18 @@
</glossdef>
</glossentry>
+ <glossentry id="conduit">
+ <glossterm>Conduit</glossterm>
+ <glossdef>
+ <para>
+ A synchronization conduit is a small application which controls
+ the transfer of data between a handheld device and a desktop
+ computer.
+ </para>
+ </glossdef>
+ </glossentry>
+
+
<glossentry id="druid">
<glossterm>Druid</glossterm>
<glossdef>
diff --git a/doc/C/config-sync.sgml b/doc/C/config-sync.sgml
index 79f561c6d4..0445b474c4 100644
--- a/doc/C/config-sync.sgml
+++ b/doc/C/config-sync.sgml
@@ -22,7 +22,8 @@
before, you'll need to run the GNOME <application>Control
Center</application> and make sure that <application>Pilot
Link</application> is properly configured. Then, select the
- <application>Evolution</application> conduits under the
+ <application>Evolution</application> <glossterm
+ linkend="conduit">conduits</glossterm> under the
<guilabel>Pilot Conduits</guilabel> section of the Control
Center.
</para>
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution.sgml
index b14b9ef355..114f2e87d9 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution.sgml
@@ -63,9 +63,8 @@ implemented. -->
</para>
</legalnotice>
- <releaseinfo>
- This is version 0.6 of the Evolution manual, describing version
- 0.6 of Evolution.
+ <releaseinfo>
+ This is version 0.9 of the Evolution manual.
</releaseinfo>
</bookinfo>
@@ -77,11 +76,11 @@ implemented. -->
<partintro>
<para>
Part one of the <application>Evolution</application> manual
- describes how to use <application>Evolution</application>
- for email, contact management, and appointment and task
- scheduling. You'll find as you go along that, as with most of
- Linux, there's more than one way to do things, and you can
- pick whichever method you like best.
+ describes how to use <application>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
+ you like best.
</para>
</partintro>
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index be18abd3d3..ddb6a0d2dd 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -196,7 +196,7 @@
<varlistentry>
<term>Create a new folder</term>
- <listitem>
+ <listitem>`
<para>
<menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
<guimenuitem>Folder</guimenuitem></menuchoice> or
@@ -297,7 +297,9 @@
<sect2 id="quickref-mail">
<title>Mail Tasks</title>
<para>
- Here are the most frequent email tasks, and shortcuts for navigating your mailbox with the keyboard instead of the mouse:
+ Here are the most frequent email tasks, and shortcuts for
+ navigating your mailbox with the keyboard instead of the
+ mouse:
<variablelist>
<varlistentry>
<term>Check Mail</term>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 71163e1975..ca4da49602 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -953,7 +953,7 @@ possibly never will be due to security evil. -->
<title>Searching for Messages</title>
<para>
Most mail clients can search through your messages for you,
- but <application>Evolution</application> does it faster. You
+ but <application>Evolution</application> does it faster. You
can search through just the message subjects, just the message
body, or both body and subject.
</para>
@@ -1015,8 +1015,40 @@ possibly never will be due to security evil. -->
When you've entered your search phrase, press
<keycap>Enter</keycap>. <application>Evolution</application>
will show your search results in the message list.
+ </para>
+
+ <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 Virtual Folder</guilabel>.
+ </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.
</para>
+
+ <para>
+ If you'd like to perform a more complex search, open the
+ advanced search dialog by selecting
+ <guilabel>Advanced...</guilabel> from the
+ <guilabel>Search</guilabel> drop-down menu. Then, create your
+ search criteria (each with the same options you saw in the
+ regular search bar), and decide whether you want to find
+ messages that match all of them, or messages that match even
+ one. Then, click <guibutton>Search</guibutton> to go and find
+ those messages.
+ </para>
+
+ <para>
+ You'll see a similar approach to sorting messages when you
+ create filters and virtual folders in the next few sections.
+ </para>
+
</sect2>
<sect2 id="usage-mail-organize-filters">
@@ -1030,8 +1062,9 @@ possibly never will be due to security evil. -->
actions that may effect the same message in several ways. For
example, your filters could put copies of one message into
multiple folders, or keep a copy and send one to another
- person as well. Which is to say, it's quite a bit more
- flexible than an actual person with a pile of envelopes.
+ person as well, and it can do that in under a second. Which is
+ to say, it's faster and more flexible than an actual person
+ with a pile of envelopes.
</para>
<para>
Most often, you'll want to have
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 6124998862..129020aa3d 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -46,6 +46,18 @@
</glossdef>
</glossentry>
+ <glossentry id="conduit">
+ <glossterm>Conduit</glossterm>
+ <glossdef>
+ <para>
+ A synchronization conduit is a small application which controls
+ the transfer of data between a handheld device and a desktop
+ computer.
+ </para>
+ </glossdef>
+ </glossentry>
+
+
<glossentry id="druid">
<glossterm>Druid</glossterm>
<glossdef>
diff --git a/help/C/config-sync.sgml b/help/C/config-sync.sgml
index 79f561c6d4..0445b474c4 100644
--- a/help/C/config-sync.sgml
+++ b/help/C/config-sync.sgml
@@ -22,7 +22,8 @@
before, you'll need to run the GNOME <application>Control
Center</application> and make sure that <application>Pilot
Link</application> is properly configured. Then, select the
- <application>Evolution</application> conduits under the
+ <application>Evolution</application> <glossterm
+ linkend="conduit">conduits</glossterm> under the
<guilabel>Pilot Conduits</guilabel> section of the Control
Center.
</para>
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution.sgml
index b14b9ef355..114f2e87d9 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution.sgml
@@ -63,9 +63,8 @@ implemented. -->
</para>
</legalnotice>
- <releaseinfo>
- This is version 0.6 of the Evolution manual, describing version
- 0.6 of Evolution.
+ <releaseinfo>
+ This is version 0.9 of the Evolution manual.
</releaseinfo>
</bookinfo>
@@ -77,11 +76,11 @@ implemented. -->
<partintro>
<para>
Part one of the <application>Evolution</application> manual
- describes how to use <application>Evolution</application>
- for email, contact management, and appointment and task
- scheduling. You'll find as you go along that, as with most of
- Linux, there's more than one way to do things, and you can
- pick whichever method you like best.
+ describes how to use <application>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
+ you like best.
</para>
</partintro>
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index be18abd3d3..ddb6a0d2dd 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -196,7 +196,7 @@
<varlistentry>
<term>Create a new folder</term>
- <listitem>
+ <listitem>`
<para>
<menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
<guimenuitem>Folder</guimenuitem></menuchoice> or
@@ -297,7 +297,9 @@
<sect2 id="quickref-mail">
<title>Mail Tasks</title>
<para>
- Here are the most frequent email tasks, and shortcuts for navigating your mailbox with the keyboard instead of the mouse:
+ Here are the most frequent email tasks, and shortcuts for
+ navigating your mailbox with the keyboard instead of the
+ mouse:
<variablelist>
<varlistentry>
<term>Check Mail</term>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 71163e1975..ca4da49602 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -953,7 +953,7 @@ possibly never will be due to security evil. -->
<title>Searching for Messages</title>
<para>
Most mail clients can search through your messages for you,
- but <application>Evolution</application> does it faster. You
+ but <application>Evolution</application> does it faster. You
can search through just the message subjects, just the message
body, or both body and subject.
</para>
@@ -1015,8 +1015,40 @@ possibly never will be due to security evil. -->
When you've entered your search phrase, press
<keycap>Enter</keycap>. <application>Evolution</application>
will show your search results in the message list.
+ </para>
+
+ <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 Virtual Folder</guilabel>.
+ </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.
</para>
+
+ <para>
+ If you'd like to perform a more complex search, open the
+ advanced search dialog by selecting
+ <guilabel>Advanced...</guilabel> from the
+ <guilabel>Search</guilabel> drop-down menu. Then, create your
+ search criteria (each with the same options you saw in the
+ regular search bar), and decide whether you want to find
+ messages that match all of them, or messages that match even
+ one. Then, click <guibutton>Search</guibutton> to go and find
+ those messages.
+ </para>
+
+ <para>
+ You'll see a similar approach to sorting messages when you
+ create filters and virtual folders in the next few sections.
+ </para>
+
</sect2>
<sect2 id="usage-mail-organize-filters">
@@ -1030,8 +1062,9 @@ possibly never will be due to security evil. -->
actions that may effect the same message in several ways. For
example, your filters could put copies of one message into
multiple folders, or keep a copy and send one to another
- person as well. Which is to say, it's quite a bit more
- flexible than an actual person with a pile of envelopes.
+ person as well, and it can do that in under a second. Which is
+ to say, it's faster and more flexible than an actual person
+ with a pile of envelopes.
</para>
<para>
Most often, you'll want to have