aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--help/C/apx-fdl.xml2
-rw-r--r--help/C/preface.xml148
-rw-r--r--help/C/usage-calendar.xml3
-rw-r--r--help/C/usage-mail-org.xml13
-rw-r--r--help/C/usage-mail.xml4
-rw-r--r--help/C/usage-mainwindow.xml4
6 files changed, 65 insertions, 109 deletions
diff --git a/help/C/apx-fdl.xml b/help/C/apx-fdl.xml
index f074a4f453..d706e79fde 100644
--- a/help/C/apx-fdl.xml
+++ b/help/C/apx-fdl.xml
@@ -445,7 +445,7 @@
You may add a section entitled <quote>Endorsements</quote>,
provided it contains nothing but endorsements of your <link
linkend="fdl-modified">Modified Version</link> by various
- parties&mdash;for example, statements of peer review or that the text
+ parties -- for example, statements of peer review or that the text
has been approved by an organization as the authoritative
definition of a standard.
</para>
diff --git a/help/C/preface.xml b/help/C/preface.xml
index 2518c67bea..ef803c9049 100644
--- a/help/C/preface.xml
+++ b/help/C/preface.xml
@@ -3,87 +3,24 @@
<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
- tour</link>, which will explain how to use
- Evolution. If you are new to
- Evolution or to groupware in
- general, this section is for you. The second section, covering
- <link linkend="config">configuration</link>, is targeted at
- more advanced users, but anyone who wants to change the way
- Evolution looks or acts can benefit
- from reading it.
+ The first part of this book is a <link linkend="usage">guided
+ tour</link>, which will explain how to use Evolution. If you
+ are new to Evolution or to groupware in general, this section is
+ for you. The second section, covering <link
+ linkend="config">configuration</link>, is targeted at more
+ advanced users, but anyone who wants to change the way Evolution
+ looks or acts can benefit from reading it.
</para>
</sect1>
- <sect1 id="typography">
- <title>Typographical conventions</title>
- <para>
- In this book, we'll mark some words with special typography:
- <simplelist>
- <member><command>Commands</command> you type at the command line</member>
-
- <member> Menu selections look like this:
- <menuchoice>
- <guimenu>Menu</guimenu>
- <guisubmenu>Submenu</guisubmenu>
- <guimenuitem>Menu Item</guimenuitem>
- </menuchoice>
- </member>
- <member><guilabel>Buttons and item labels</guilabel> in the user interface</member>
- <member><userinput>Anything you type in</userinput></member>
- <member><command>File names or text output from the computer</command></member>
- <member><glossterm linkend="apx-gloss">Words</glossterm>
- that are defined in the <xref linkend="apx-gloss"/>.</member>
- </simplelist>
-</para>
-<para>
-We'll provide assorted bits of additional information in tips set off from the rest of the book, as well.
-
- <tip id="example-tip">
- <title>Tip</title>
- <para>
- Tips and bits of extra information will look like
- this.
- </para>
- </tip>
-</para>
-
-<para>
-Examples are also set off from the rest of the text. They look like this:
-
- <example>
- <title>Example Example</title>
- <para>
- This is what an example looks like. We'll provide
- examples for some of the more complicated tasks you
- might be performing.
- </para>
- </example>
-</para>
-<para>
- Lastly, we'll have warnings, in cases where you should be careful:
-
- <warning id="example-warning">
- <title>Example Warning</title>
- <para>
- This is what a warning looks like. If there's a chance
- you'll run into trouble, we'll warn you beforehand.
- </para>
- </warning>
- </para>
- </sect1>
-
-
<sect1 id="other-help">
<title>Additional Help Sources</title>
<para>
You can find additional help in three places. For information
about command-line options, open a terminal window and type
- <command> man evolution</command> or <command>evolution
- --help</command>. For support, late-breaking news, and errata,
- visit the Ximian support center at <ulink
- url="http://support.ximian.com">support.ximian.com</ulink>.
+ <command>evolution --help</command>. For support,
+ late-breaking news, and errata, visit the Novell support center at
+ <ulink url="http://support.novell.com">support.novell.com</ulink>.
</para>
</sect1>
@@ -102,9 +39,14 @@ Examples are also set off from the rest of the text. They look like this:
<term>Junk Mail (Spam) Filtering</term>
<listitem>
<para>
- Novell Evolution &appversion; uses the same font
- smoothing technology as the rest of your GNOME 2
- desktop.
+ Novell Evolution &appversion; includes trainable
+ Bayesian junk mail filters. When you get mail you
+ don't want, click the <guilabel>Junk</guilabel> button
+ in the toolbar. Check your <guilabel>Junk
+ Mail</guilabel> folder periodically to see if it's
+ filtered out anything you want to keep, and mark it as
+ <guilabel>Not Junk.</guilabel> As you correct the
+ filter, it will become more effective.
</para>
</listitem>
</varlistentry>
@@ -116,12 +58,12 @@ Examples are also set off from the rest of the text. They look like this:
Now you can access GroupWise servers as well as IMAP
and POP mail servers, with no additional installation
required. Connection to Microsoft Exchange 2000 and
- 2003 servers is possible with the Evolution Connector.
+ 2003 servers is possible with the Evolution Connector,
+ now available at no charge and under the GPL license.
</para>
</listitem>
</varlistentry>
-
<varlistentry>
<term>User Interface Updates</term>
<listitem>
@@ -151,9 +93,8 @@ Examples are also set off from the rest of the text. They look like this:
<para>
The <command>~/evolution/</command>
directory has been moved to
- <command>~/.evolution</command>, and therefore
- normally tucked out of sight in most directory
- listings.
+ <command>~/.evolution</command>, keeping it
+ out of sight in most cases.
</para>
</listitem>
</varlistentry>
@@ -185,18 +126,27 @@ Examples are also set off from the rest of the text. They look like this:
<term>Default Browsers</term>
<listitem>
<para>
- To set the browser that opens when you click a link in
- an email, open the GNOME preferences tool
- (<menuchoice><guimenu>System</guimenu><guimenuitem>Personal Settings</guimenuitem></menuchoice>
- or <command>gnome-control-center</command>) and start the
- <guilabel>File Associations</guilabel> tool. There, look under
- <guilabel>Internet Services</guilabel>, select
- <guilabel>World wide web (http)</guilabel>, and select
- the browser of your choice. If you wish to use a
+ To set the browser used for links from email addresses,
+ open the GNOME preferences tool
+ (<menuchoice><guimenu>System</guimenu><guimenuitem>Personal
+ Settings</guimenuitem></menuchoice>
+ or <command>gnome-control-center</command>) and click
+ <guilabel>File Associations</guilabel>. On some systems,
+ this may be called <guilabel>MIME Types</guilabel> or
+ <guilabel>Default Applications</guilabel>.
+ </para>
+ <para>
+ In the <guilabel>File Associations</guilabel> tool, go to the
+ <guilabel>Internet Services</guilabel> section and click
+ <guilabel>World wide web (http)</guilabel>, then select
+ the browser of your choice. If you wish to use a
browser other than the ones suggested, you will need to
- enter the full shell command. For example you might use
- <userinput>mybrowser "%s"</userinput> to start the
- mybrowser program at the right page.
+ enter a complete shell command, rather than just the
+ browser name: <userinput>mybrowser
+ `%s`</userinput> rather than
+ <guilabel>My Browser</guilabel>.
+ Some systems may require you to set the browser used for
+ https:// links seperately.
</para>
</listitem>
</varlistentry>
@@ -218,15 +168,23 @@ Examples are also set off from the rest of the text. They look like this:
list.
</para>
<para>
+ If you are using KDE, you can also set Evolution as the
+ default through the KDE control center. Go to the
+ <guilabel>KDE Components</guilabel> section and select
+ <guilabel>Component Chooser</guilabel>, then
+ <guilabel>Email Client</guilabel>. Click the
+ <guilabel>Use a different email client</guilabel> option
+ and enter <userinput>evolution `%s`</userinput>.
+ </para>
+ <para>
For applications such as Mozilla and Netscape, which do
not use the GNOME preference tools, you will need to
find the protocol handler preference tool for that
application and enter <userinput>evolution
- "%s"</userinput> as your choice for handling mailto links.
+ `%s`</userinput> as your choice for handling mailto links.
</para>
</listitem>
</varlistentry>
</variablelist>
- </sect1>
-
+ </sect1> \ No newline at end of file
diff --git a/help/C/usage-calendar.xml b/help/C/usage-calendar.xml
index 095ac1bed9..e5ef66dbae 100644
--- a/help/C/usage-calendar.xml
+++ b/help/C/usage-calendar.xml
@@ -395,8 +395,7 @@
</para>
<para>
Once you have added the meeting to your calendar, you can make
- changes to your copy &mdash;change the description, mark yourself
- the organizer, invite more people, and so forth&mdash; but be aware
+ changes to your copy, but be aware
that if the original organizer sends out another update, your
changes may be overwritten.
</para>
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index 18c21eadaa..5390171a36 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -695,14 +695,14 @@
<listitem><para> Date sent - Filter messages according to the date on
which they were sent: First, choose the conditions you
- want a message to meet &mdash; <guilabel>before</guilabel>
+ want a message to meet:<guilabel>before</guilabel>
a given time, <guilabel>after</guilabel> it, and so forth.
Then, choose the time. The filter will compare the
message's time-stamp to the system clock when the filter
is run, or to a specific time and date you choose from a
calendar. You can even have it look for messages within a
- range of time relative to the filter &mdash; perhaps you're
- looking for messages less than two days old.
+ range of time relative to the filter, such as two to four
+ days ago.
</para></listitem>
<listitem><para>
@@ -1217,14 +1217,13 @@
<listitem><para> Date sent - Search messages according to the date on
which they were sent: First, choose the conditions you
- want a message to meet &mdash; <guilabel>before</guilabel>
+ want a message to meet: <guilabel>before</guilabel>
a given time, <guilabel>after</guilabel> it, and so forth.
Then, choose the time. The vFolder will compare the
message's time-stamp to the system clock when the filter
is run, or to a specific time and date you choose from a
- calendar. You can even have it look for messages within a
- range of time relative to the filter &mdash; perhaps you're
- looking for messages less than two days old.
+ calendar. You can also have it look for messages within a
+ range of time relative to the filter.
</para></listitem>
<listitem><para>
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 18a4c63899..5d8cdd98b4 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -826,8 +826,8 @@
<para>
Alternately, you can click on the
<guilabel>To:</guilabel>, <guilabel>Cc:</guilabel>, or
- <guilabel>Bcc:</guilabel> buttons to get a list &mdash;
- potentially a very long one &mdash; of the email addresses
+ <guilabel>Bcc:</guilabel> buttons to get a list
+ of the email addresses
in your contacts. Select addresses and click on
the arrows to move them into the appropriate address
columns.
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index 09aa7d96c6..4383101966 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -1013,8 +1013,8 @@ standard mbox file format, which
<term> <guimenu>Actions</guimenu>:</term>
<listitem><para>
Holds actions which maybe applied to a message. Normally,
- if there is only one target for the action &mdash; for
- example, replying to a message &mdash; you can find it in
+ if there is only one target for the action, such as
+ replying to a message, you can find it in
the <guimenu>Actions</guimenu> menu.
</para></listitem>
</varlistentry>