Improve use of if conditions

https://mail.gnome.org/archives/gnome-doc-list/2017-December/msg00021.html

8 files changed, 12 insertions, 19 deletions

diff --git a/figures/gs-go-online3.svg b/figures/gs-go-online3.svg
index 75b31b7..57fb53b 100644
--- a/figures/gs-go-online3.svg
+++ b/figures/gs-go-online3.svg
@@ -1270,7 +1270,7 @@
              y="736.36218"
              x="122.29289"
              id="tspan15037"
-             sodipodi:role="line">2</tspan></text>
+             sodipodi:role="line">4</tspan></text>
       </g>
       <rect
          style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.77363062;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
diff --git a/gnome-help/C/getting-started.page b/gnome-help/C/getting-started.page
index 636f4b8..215a951 100644
--- a/gnome-help/C/getting-started.page
+++ b/gnome-help/C/getting-started.page
@@ -1,6 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/"
       xmlns:if="http://projectmallard.org/if/1.0/"
-      xmlns:e="http://projectmallard.org/experimental/"
       xmlns:ui="http://projectmallard.org/experimental/ui/"
       xmlns:its="http://www.w3.org/2005/11/its"
       type="guide" style="task" id="getting-started" version="1.0 if/1.0">
@@ -150,12 +149,11 @@
          <tt:div begin="1s" end="5s">
            <tt:p>Switching Tasks</tt:p>
          </tt:div>
-         <if:if test="!platform:gnome-classic">
          <tt:div begin="5s" end="8s">
-           <tt:p>Move your mouse pointer to the <gui>Activities</gui> corner at
-            the top left of the screen.</tt:p>
-           </tt:div>
-         </if:if>
+           <tt:p if:test="!platform:gnome-classic">Move your mouse pointer
+            to the <gui>Activities</gui> corner at the top left of the
+            screen.</tt:p>
+         </tt:div>
          <tt:div begin="9s" end="12s">
            <tt:p>Click a window to switch to that task.</tt:p>
          </tt:div>
diff --git a/gnome-help/C/gs-browse-web.page b/gnome-help/C/gs-browse-web.page
index 56d8b1e..4ff7ae6 100644
--- a/gnome-help/C/gs-browse-web.page
+++ b/gnome-help/C/gs-browse-web.page
@@ -1,6 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/"
       xmlns:if="http://projectmallard.org/if/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/"
       xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" style="ui" id="gs-browse-web" version="1.0 if/1.0">
 
@@ -56,7 +55,7 @@ platform:opensuse, platform:sled, platform:sles">
     <gui>Activities Overview</gui>.</p></note>
 
 </if:when>
-<if:when test="platform:gnome-3">
+<if:else>
 
     <media its:translate="no" type="image" mime="image/svg"
     src="gs-web-browser1.svg" width="100%" />
@@ -76,7 +75,7 @@ platform:opensuse, platform:sled, platform:sles">
     <media its:translate="no" type="image" mime="image/svg"
     src="gs-web-browser2.svg" width="100%" />
 
-</if:when>
+</if:else>
 </if:choose>
 
 <!--Distributors might want to add their distro here if they ship Firefox by default.-->
diff --git a/gnome-help/C/gs-change-date-time-timezone.page b/gnome-help/C/gs-change-date-time-timezone.page
index 9d54975..627a1f2 100644
--- a/gnome-help/C/gs-change-date-time-timezone.page
+++ b/gnome-help/C/gs-change-date-time-timezone.page
@@ -1,5 +1,4 @@
 <page xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/"
       xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" style="ui" id="gs-change-date-time-timezone" version="1.0">
 
diff --git a/gnome-help/C/gs-get-online.page b/gnome-help/C/gs-get-online.page
index 4b23d8c..57d25da 100644
--- a/gnome-help/C/gs-get-online.page
+++ b/gnome-help/C/gs-get-online.page
@@ -1,5 +1,4 @@
 <page xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/"
       xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" style="ui" id="gs-get-online">
 
diff --git a/gnome-help/C/gs-go-online3.svg b/gnome-help/C/gs-go-online3.svg
index 0b20c90..a0a96da 100644
--- a/gnome-help/C/gs-go-online3.svg
+++ b/gnome-help/C/gs-go-online3.svg
@@ -300,7 +300,7 @@
     <ns0:g id="g27126" transform="translate(9.5625,-167.29113)">
       <ns0:g id="g15031" transform="translate(-51,24.637831)">
         <ns0:circle cx="120" cy="278" id="path15033" r="17" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.27522936;stroke:none;stroke-width:1.06985807;marker:none;enable-background:accumulate" transform="translate(2,453.36217)" />
-        <ns0:text id="text15035" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:'Cantarell Bold';text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none" x="122.29289" y="736.36218" ns2:linespacing="125%" xml:space="preserve"><ns0:tspan id="tspan15037" x="122.29289" y="736.36218" ns2:role="line">2</ns0:tspan></ns0:text>
+        <ns0:text id="text15035" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:'Cantarell Bold';text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none" x="122.29289" y="736.36218" ns2:linespacing="125%" xml:space="preserve"><ns0:tspan id="tspan15037" x="122.29289" y="736.36218" ns2:role="line">4</ns0:tspan></ns0:text>
       </ns0:g>
       <ns0:rect height="353.14359" id="rect17558" rx="7.7971802" ry="7.7971802" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.77363062;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" width="394.59302" x="196.20349" y="774.2193" />
       <ns0:text id="text12012-1" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:'Cantarell Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none" x="263.45731" y="808.12811" ns2:linespacing="125%" xml:space="preserve"><ns0:tspan id="tspan12014-2" x="263.45731" y="808.12811" ns2:role="line">Wi-Fi Networks</ns0:tspan></ns0:text>
@@ -388,4 +388,4 @@
       <ns0:path d="m 386,1071.2911 0,56" id="path18401" style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.52156863;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" ns1:connector-curvature="0" />
     </ns0:g>
   </ns0:g>
-</ns0:svg>
\ No newline at end of file
+</ns0:svg>
diff --git a/gnome-help/C/gs-switch-tasks.page b/gnome-help/C/gs-switch-tasks.page
index 24a1a1d..471ee5d 100644
--- a/gnome-help/C/gs-switch-tasks.page
+++ b/gnome-help/C/gs-switch-tasks.page
@@ -29,12 +29,11 @@
          <tt:div begin="1s" end="5s">
            <tt:p>Switching Tasks</tt:p>
          </tt:div>
-         <if:if test="!platform:gnome-classic">
          <tt:div begin="5s" end="8s">
-           <tt:p>Move your mouse pointer to the <gui>Activities</gui> corner at
-            the top left of the screen.</tt:p>
+           <tt:p if:test="!platform:gnome-classic">Move your mouse pointer
+            to the <gui>Activities</gui> corner at the top left of the
+            screen.</tt:p>
            </tt:div>
-         </if:if>
          <tt:div begin="9s" end="12s">
            <tt:p>Click a window to switch to that task.</tt:p>
          </tt:div>
diff --git a/gnome-help/C/gs-use-system-search.page b/gnome-help/C/gs-use-system-search.page
index 9f3143a..bb95c5c 100644
--- a/gnome-help/C/gs-use-system-search.page
+++ b/gnome-help/C/gs-use-system-search.page
@@ -1,5 +1,4 @@
 <page xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/"
       xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" style="ui" id="gs-use-system-search">