aboutsummaryrefslogtreecommitdiffstats
path: root/help/C/mail-spam-settings.page
diff options
context:
space:
mode:
authorAndre Klapper <a9016009@gmx.de>2012-03-07 23:42:21 +0800
committerAndre Klapper <a9016009@gmx.de>2012-03-07 23:42:21 +0800
commit1afa9174feba7c1f884c28d3c74d084d749f021b (patch)
treec46b975c8ca73f5ee85e04de5f9f311fbcb1b013 /help/C/mail-spam-settings.page
parentc793beed9866ba5978035b7a35c7d43922de29c9 (diff)
downloadgsoc2013-evolution-1afa9174feba7c1f884c28d3c74d084d749f021b.tar
gsoc2013-evolution-1afa9174feba7c1f884c28d3c74d084d749f021b.tar.gz
gsoc2013-evolution-1afa9174feba7c1f884c28d3c74d084d749f021b.tar.bz2
gsoc2013-evolution-1afa9174feba7c1f884c28d3c74d084d749f021b.tar.lz
gsoc2013-evolution-1afa9174feba7c1f884c28d3c74d084d749f021b.tar.xz
gsoc2013-evolution-1afa9174feba7c1f884c28d3c74d084d749f021b.tar.zst
gsoc2013-evolution-1afa9174feba7c1f884c28d3c74d084d749f021b.zip
User Docs: Use conditional processing for package install links; Add EWS to first start page. Fixes bug #671068.
Diffstat (limited to 'help/C/mail-spam-settings.page')
-rw-r--r--help/C/mail-spam-settings.page18
1 files changed, 14 insertions, 4 deletions
diff --git a/help/C/mail-spam-settings.page b/help/C/mail-spam-settings.page
index b0bd47068b..3c7d947234 100644
--- a/help/C/mail-spam-settings.page
+++ b/help/C/mail-spam-settings.page
@@ -1,4 +1,6 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+ xmlns:e="http://projectmallard.org/experimental/"
+ xmlns:if="http://projectmallard.org/experimental/if/"
type="topic" id="mail-spam-settings">
<info>
@@ -7,7 +9,7 @@
<link type="guide" xref="mail-spam" />
<link type="seealso" xref="mail-spam-marking"/>
- <revision pkgversion="3.3.91" version="0.4" date="2012-02-19" status="final"/>
+ <revision pkgversion="3.3.91" version="0.5" date="2012-03-07" status="final"/>
<credit type="author">
<name its:translate="no">Andre Klapper</name>
<email its:translate="no">ak-47@gmx.net</email>
@@ -27,9 +29,17 @@
<title>Junk Mail Settings</title>
-<p>Evolution lets you check for unwanted junk or spam emails by using the Bogofilter or SpamAssassin tools. To use these tools, you need to make sure that they are installed via the software management tool of your distribution.</p>
-<p><link action="install:bogofilter" href="http://bogofilter.sourceforge.net/">Install bogofilter now.</link></p>
-<p><link action="install:spamassassin" href="http://spamassassin.apache.org/">Install spamassassin now.</link></p>
+<p><app>Evolution</app> lets you check for unwanted junk or spam emails by using the <app>Bogofilter</app> or <app>SpamAssassin</app> tools. To use these tools, you need to make sure that they are installed via the software management tool of your distribution.</p>
+
+<note style="info package">
+ <p>You might need to install one of these packages to perform these steps.</p>
+ <if:choose>
+ <if:when test="if:supports('action:install')">
+ <p><link action="install:bogofilter" href="http://bogofilter.sourceforge.net/" style="button">Install bogofilter</link></p>
+ <p><link action="install:spamassassin" href="http://spamassassin.apache.org/" style="button">Install spamassassin</link></p>
+ </if:when>
+ </if:choose>
+</note>
<note style="tip"><p>The junk mail options discussed in this page refer only to POP and Local Delivery. For handling junk mails on IMAP, see the Evolution settings under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>.</p></note>