User docs: Fix 'Unmatched block element: choose' warnings. This type for real.

5 files changed, 21 insertions, 21 deletions

diff --git a/help/C/exchange-connectors-overview.page b/help/C/exchange-connectors-overview.page
index ec9725cfdc..6a27a811a5 100644
--- a/help/C/exchange-connectors-overview.page
+++ b/help/C/exchange-connectors-overview.page
@@ -24,24 +24,24 @@
 <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 2007, 2010 and newer it is recommended to use the package <sys>evolution-ews</sys>.</p>
-<p><if:choose>
-  <if:when test="if:supports('action:install')">
+<if:choose xmlns:if="http://projectmallard.org/if/1.0/">
+  <if:when test="action:install">
     <note style="info package">
       <p><link action="install:evolution-ews" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-ews</link></p>
     </note>
   </if:when>
-</if:choose></p>
+</if:choose>
 
 
 <p>For older versions of Microsoft Exchange, or if <sys>evolution-ews</sys> does not work well for you, try <sys>evolution-mapi</sys>. It uses Microsoft's Messaging API which is also used by Microsoft Outlook. However, <sys>evolution-mapi</sys> requires installing <sys>OpenChange</sys> and <sys>Samba 4</sys>, and is not as performant as <sys>evolution-ews</sys>.</p>
 
-<p><if:choose>
-  <if:when test="if:supports('action:install')">
+<if:choose xmlns:if="http://projectmallard.org/if/1.0/">
+  <if:when test="action:install">
     <note style="info package">
       <p><link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-mapi</link></p>
     </note>
   </if:when>
-</if:choose></p>
+</if:choose>
 
 <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>
 
diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page
index 9bfd6bef1a..44ab2b0aa1 100644
--- a/help/C/intro-first-run.page
+++ b/help/C/intro-first-run.page
@@ -103,11 +103,11 @@
 <p>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>
 <note style="info package">
   <p>This requires having the <sys>evolution-ews</sys> package installed.</p>
-  <p><if:choose>
-    <if:when test="if:supports('action:install')">
+  <if:choose xmlns:if="http://projectmallard.org/if/1.0/">
+    <if:when test="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></p>
+  </if:choose>
 </note>
 
  <section id="configure-sending-exchange-ews" ui:expanded="false">
@@ -127,11 +127,11 @@
 <p>For connecting to a Microsoft Exchange 2007/2010 or OpenChange server.</p>
 <note style="info package">
   <p>This requires having the <sys>evolution-mapi</sys> package installed.</p>
-  <p><if:choose>
-    <if:when test="if:supports('action:install')">
+  <if:choose xmlns:if="http://projectmallard.org/if/1.0/">
+    <if:when test="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></p>
+  </if:choose>
 </note>
 
  <section id="configure-sending-exchange-mapi" ui:expanded="false">
diff --git a/help/C/mail-composer-change-quotation-string.page b/help/C/mail-composer-change-quotation-string.page
index 1b9cd145b2..1c4bb058fc 100644
--- a/help/C/mail-composer-change-quotation-string.page
+++ b/help/C/mail-composer-change-quotation-string.page
@@ -33,11 +33,11 @@
 
 <note style="info package">
   <p>You might need to install the <sys>dconf-editor</sys> package to perform these steps.</p>
-  <p><if:choose>
-    <if:when test="if:supports('action:install')">
+    <if:choose xmlns:if="http://projectmallard.org/if/1.0/">
+      <if:when test="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></p>
+  </if:choose>
 </note>
 
 </page>
diff --git a/help/C/mail-composer-spellcheck.page b/help/C/mail-composer-spellcheck.page
index c9f699c692..5ff6893f7a 100644
--- a/help/C/mail-composer-spellcheck.page
+++ b/help/C/mail-composer-spellcheck.page
@@ -29,12 +29,12 @@
 
 <note style="info package">
   <p>You might need to install <sys>hunspell</sys> and/or <sys>enchant</sys> to perform these steps.</p>
-  <p><if:choose>
-    <if:when test="if:supports('action:install')">
+    <if:choose xmlns:if="http://projectmallard.org/if/1.0/">
+      <if:when test="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></p>
+  </if:choose>
 </note>
 </section>
 
diff --git a/help/C/mail-spam-settings.page b/help/C/mail-spam-settings.page
index 9cb1dbb14f..0cd71ca84a 100644
--- a/help/C/mail-spam-settings.page
+++ b/help/C/mail-spam-settings.page
@@ -41,12 +41,12 @@
 
 <note style="info package">
   <p>You might need to install <app>Bogofilter</app> or <app>SpamAssassin</app> to perform these steps.</p>
-  <p><if:choose>
-    <if:when test="if:supports('action:install')">
+    <if:choose xmlns:if="http://projectmallard.org/if/1.0/">
+      <if:when test="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></p>
+  </if:choose>
 </note>
 
 <p>SpamAssassin works through a set of predefined rules, hence it can determine spam straight away. Bogofilter does not come with a default set of spam criteria so it will not automatically filter anything after installing it. You must <link xref="mail-spam-marking">train it</link> first to make it work. You can modify the actions of SpamAssassin by training it as well.</p>