User Docs: Use conditional processing for package install links; Add EWS to first start page. Fixes bug #671068.

6 files changed, 110 insertions, 22 deletions

diff --git a/help/C/default-browser.page b/help/C/default-browser.page
index 16b210404e..e9b0fb4ec0 100644
--- a/help/C/default-browser.page
+++ b/help/C/default-browser.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="default-browser">
 
   <info>
@@ -6,7 +8,7 @@
     
     <link type="guide" xref="index#common-other-problems" />
 
-    <revision pkgversion="3.0.2" version="0.4" date="2012-02-18" status="final"/>
+    <revision pkgversion="3.0.2" 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>
@@ -26,5 +28,12 @@
 
 <note><p>GNOME 3 users with a technical background can tweak these settings by defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps.list</file>.</p></note>
 
-<note><p>If the error message "Could not open the link: Operation not supported" is shown, you need to <link action="install:gvfs" href="http://ftp.gnome.org/pub/gnome/sources/gvfs/">install gvfs</link>.</p></note>
+<note style="info package">
+  <p>If the error message "Could not open the link: Operation not supported" is shown, you need to install the package <sys>gvfs</sys>.</p>
+  <if:choose>
+    <if:when test="if:supports('action:install')">
+      <p><link action="install:gvfs" href="http://ftp.gnome.org/pub/gnome/sources/gvfs/" style="button">Install gvfs</link></p>
+    </if:when>
+  </if:choose>
+</note>
 </page>
diff --git a/help/C/exchange-connectors-overview.page b/help/C/exchange-connectors-overview.page
index c4aa236803..e7da0c982b 100644
--- a/help/C/exchange-connectors-overview.page
+++ b/help/C/exchange-connectors-overview.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="guide" id="exchange-connectors-overview">
 
   <info>
@@ -6,7 +8,7 @@
 
     <link type="guide" xref="exchange-placeholder"/>
 
-    <revision pkgversion="3.1.5" version="0.3" date="2011-08-05" status="final"/>
+    <revision pkgversion="3.1.5" version="0.4" 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>
@@ -21,14 +23,36 @@
 
 <p>Depending on the version of the Microsoft Exchange server that you would like to connect to it is required to make sure that an additional package is installed that provides this functionality.</p>
 
-<p>For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of Exchange that use Outlook Web Access) it is recommended to use the package evolution-exchange. <link action="install:evolution-exchange" href="http://projects.gnome.org/evolution/download">Install evolution-exchange now.</link>
-</p>
-<p>For Microsoft Exchange 2007 and 2010 (and possibly earlier versions that support MAPI) it is recommended to use the package evolution-mapi. <link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download">Install evolution-mapi now.</link></p>
-<p>For Microsoft Exchange 2007 and 2010 the package evolution-ews is currently under development and will replace evolution-mapi in the future. It might not be available yet for your distribution. <link action="install:evolution-ews" href="http://projects.gnome.org/evolution/download">Install evolution-ews now.</link></p>
+<p>For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of Exchange that use Outlook Web Access) it is recommended to use the package <sys>evolution-exchange</sys>.</p>
+<note style="info package">
+  <if:choose>
+    <if:when test="if:supports('action:install')">
+      <p><link action="install:evolution-exchange" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-exchange</link></p>
+    </if:when>
+  </if:choose>
+</note>
+
+<p>For Microsoft Exchange 2007 and 2010 (and possibly earlier versions that support MAPI) it is recommended to use the package <sys>evolution-mapi</sys>.</p>
+<note style="info package">
+  <if:choose>
+    <if:when test="if:supports('action:install')">
+      <p><link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-mapi</link></p>
+    </if:when>
+  </if:choose>
+</note>
+
+<p>For Microsoft Exchange 2007 and 2010 the package <sys>evolution-ews</sys> is currently under development and will replace <sys>evolution-mapi</sys> in the future. It might not be available yet for your distribution.</p>
+<note style="info package">
+  <if:choose>
+    <if:when test="if:supports('action:install')">
+      <p><link action="install:evolution-ews" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-ews</link></p>
+    </if:when>
+  </if:choose>
+</note>
 
 <note style="tip"><p>If you are unsure which Microsoft Exchange server version is used, you may want to contact your system administrator for more information.</p></note>
 
-<!-- TODO:POST-3-2:
+<!-- TODO:POST-3-4:
 <mbarnes> actually, a table in the docs would make it crystal clear  (Exchange version x Evolution backend)
 <seanius> also, a feature matrix of what works in the particular releases might be helpful, though maybe hard to visualize in a compact manner
 -->
diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page
index ef271a06c3..640b02fcef 100644
--- a/help/C/intro-first-run.page
+++ b/help/C/intro-first-run.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="intro-first-run">
 
   <info>
@@ -6,7 +8,7 @@
 
     <link type="guide" xref="index#getting-started"/>
 
-    <revision pkgversion="3.3.91" version="0.3" date="2012-02-18" status="stub"/>
+    <revision pkgversion="3.3.91" version="0.4" date="2012-03-07" status="stub"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -54,13 +56,37 @@
 <section id="corporate-server-types">
 <title>Corporate server types</title>
 <p>Available server types for corporate users are:</p>
-<!-- TODO:POST-3-2: Add evolution-ews once it is stable -->
 <list>
+<item><p>Exchange EWS: For connecting to a Microsoft Exchange 2007/2010 or OpenChange server. Note that this is currently under development and will replace the <gui>Exchange MAPI</gui> account type in the future. It might not be available yet for your distribution.</p><p>Continue <link xref="mail-receiving-options-exchange-ews">here</link> for configuration.</p>
+<note style="info package">
+  <p>This requires having the <sys>evolution-ews</sys> package installed.</p>
+  <if:choose>
+    <if:when test="if:supports('action:install')">
+      <p><link action="install:evolution-ews" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-ews</link></p>
+    </if:when>
+  </if:choose>
+</note>
+</item>
+
 <item><p>Exchange MAPI: For connecting to a Microsoft Exchange 2007/2010 or OpenChange server.</p><p>Continue <link xref="mail-receiving-options-exchange-mapi">here</link> for configuration.</p>
-<note style="tip"><p>This requires having the evolution-mapi package installed. <link action="install:evolution-mapi" href="http://ftp.gnome.org/pub/gnome/sources/evolution-mapi/">Install evolution-mapi now.</link></p></note>
+<note style="info package">
+  <p>This requires having the <sys>evolution-mapi</sys> package installed.</p>
+  <if:choose>
+    <if:when test="if:supports('action:install')">
+      <p><link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-mapi</link></p>
+    </if:when>
+  </if:choose>
+</note>
 </item>
 <item><p>Microsoft Exchange: For connecting to a Microsoft Exchange 2000 or 2003 server.</p><p>Continue <link xref="mail-receiving-options-evolution-exchange">here</link> for configuration.</p>
-<note style="tip"><p>This requires having the evolution-exchange package installed. <link action="install:evolution-exchange" href="http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/">Install evolution-exchange now.</link></p></note>
+<note style="info package">
+  <p>This requires having the <sys>evolution-exchange</sys> package installed.</p>
+  <if:choose>
+    <if:when test="if:supports('action:install')">
+      <p><link action="install:evolution-exchange" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-exchange</link></p>
+    </if:when>
+  </if:choose>
+</note>
 </item>
 <item><p>Novell Groupwise: For connecting to a Novell GroupWise server.</p><p>Continue <link xref="mail-receiving-options-novell-groupwise">here</link> for configuration.</p></item>
 </list>
diff --git a/help/C/mail-composer-change-quotation-string.page b/help/C/mail-composer-change-quotation-string.page
index 295e92a677..c10474b35a 100644
--- a/help/C/mail-composer-change-quotation-string.page
+++ b/help/C/mail-composer-change-quotation-string.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-composer-change-quotation-string">
 
   <info>
@@ -8,7 +10,7 @@
     <link type="seealso" xref="mail-composer-reply" />
     <link type="seealso" xref="mail-composer-forward" />
 
-    <revision pkgversion="3.3.91" version="0.3" date="2012-02-18" status="draft"/>
+    <revision pkgversion="3.3.91" version="0.4" date="2012-03-07" status="draft"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -29,7 +31,14 @@
 <item><p>Enter the prefered quotation string as the value for the key <gui>composer-message-attribution</gui>.</p></item>
 </list>
 
-<note><p>You might need to <link action="install:dconf-editor" href="http://ftp.gnome.org/pub/gnome/sources/dconf-editor/">install dconf-editor</link> to perform these steps.</p></note>
+<note style="info package">
+  <p>You might need to install the <sys>dconf-editor</sys> package to perform these steps.</p>
+  <if:choose>
+    <if:when test="if:supports('action:install')">
+      <p><link action="install:dconf-editor" href="http://ftp.gnome.org/pub/gnome/sources/dconf-editor/" style="button">Install dconf-editor</link></p>
+    </if:when>
+  </if:choose>
+</note>
 
 </page>
 
diff --git a/help/C/mail-composer-spellcheck.page b/help/C/mail-composer-spellcheck.page
index 855e9e1c1f..3e058c45d6 100644
--- a/help/C/mail-composer-spellcheck.page
+++ b/help/C/mail-composer-spellcheck.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-composer-spellcheck">
 
   <info>
@@ -6,7 +8,7 @@
     
     <link type="guide" xref="index#mail-composing" />
 
-    <revision pkgversion="3.0.2" version="0.4" date="2012-02-18" status="final"/>
+    <revision pkgversion="3.0.2" 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>
@@ -23,9 +25,17 @@
 
 <section id="required-packages">
 <title>Prerequirements</title>
-<p>To use spell checking for the emails that you write you first need to make sure that the <app>hunspell</app> package for your specific language and the <app>enchant</app> package are installed via the software management tool of your distribution.</p>
-<p><link action="install:hunspell" href="http://hunspell.sourceforge.net/">Install hunspell now.</link></p>
-<p><link action="install:enchant" href="http://www.abisource.com/projects/enchant/">Install enchant now.</link></p>
+<p>To use spell checking for the emails that you write you first need to make sure that the <sys>hunspell</sys> package for your specific language and the <sys>enchant</sys> package 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:hunspell" href="http://hunspell.sourceforge.net/" style="button">Install hunspell</link></p>
+      <p><link action="install:enchant" href="http://www.abisource.com/projects/enchant/" style="button">Install enchant</link></p>
+    </if:when>
+  </if:choose>
+</note>
 </section>
 
 <section id="global-preferences">
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>