Update terminology for switch usageswitch-usage

Additional fixes on touched pages.

Fixes: https://gitlab.gnome.org/GNOME/gnome-user-docs/issues/50

42 files changed, 166 insertions, 148 deletions

diff --git a/gnome-help/C/a11y-bouncekeys.page b/gnome-help/C/a11y-bouncekeys.page
index 9689b28e..2b0942ac 100644
--- a/gnome-help/C/a11y-bouncekeys.page
+++ b/gnome-help/C/a11y-bouncekeys.page
@@ -12,6 +12,7 @@
     <revision pkgversion="3.13.92" date="2014-09-20" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
     <revision pkgversion="3.29" date="2018-09-05" status="review"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="review"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -58,7 +59,7 @@
       section.</p>
     </item>
     <item>
-      <p>Switch <gui>Bounce Keys</gui> to <gui>ON</gui>.</p>
+      <p>Switch the <gui>Bounce Keys</gui> switch to on.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/a11y-contrast.page b/gnome-help/C/a11y-contrast.page
index 371b927f..f4fbffb6 100644
--- a/gnome-help/C/a11y-contrast.page
+++ b/gnome-help/C/a11y-contrast.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.9.92" date="2013-09-18" status="candidate"/>
     <revision pkgversion="3.13.92" date="2013-09-20" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -47,8 +48,8 @@
       <p>Click on <gui>Universal Access</gui> to open the panel.</p>
     </item>
     <item>
-      <p>Switch <gui>High Contrast</gui> to <gui>ON</gui> in the
-      <gui>Seeing</gui> section.</p>
+      <p>Switch the <gui>High Contrast</gui> switch in the <gui>Seeing</gui>
+      section to on.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/a11y-font-size.page b/gnome-help/C/a11y-font-size.page
index 9b4474d2..526398f7 100644
--- a/gnome-help/C/a11y-font-size.page
+++ b/gnome-help/C/a11y-font-size.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.13.92" date="2014-09-20" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
     <revision pkgversion="3.26" date="2017-08-04" status="candidate"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="candidate"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -44,8 +45,8 @@
       <p>Click on <gui>Universal Access</gui> to open the panel.</p>
     </item>
     <item>
-      <p>Switch <gui>Large Text</gui> to <gui>ON</gui> in the <gui>Seeing</gui>
-      section.</p>
+      <p>In the <gui>Seeing</gui> section, switch the <gui>Large Text</gui>
+      switch to on.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/a11y-icon.page b/gnome-help/C/a11y-icon.page
index 78db31f8..055f5816 100644
--- a/gnome-help/C/a11y-icon.page
+++ b/gnome-help/C/a11y-icon.page
@@ -9,6 +9,7 @@
     <revision pkgversion="3.9.92" date="2013-09-18" status="candidate"/>
     <revision pkgversion="3.13.92" date="2014-09-20" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -44,8 +45,8 @@
       <p>Click on <gui>Universal Access</gui> to open the panel.</p>
     </item>
     <item>
-      <p>Switch <gui>Always Show Universal Access Menu</gui> to
-      <gui>ON</gui>.</p>
+      <p>Switch the <gui>Always Show Universal Access Menu</gui> switch to
+      on.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/a11y-mag.page b/gnome-help/C/a11y-mag.page
index 68651e01..4e222136 100644
--- a/gnome-help/C/a11y-mag.page
+++ b/gnome-help/C/a11y-mag.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.9.92" date="2013-09-18" status="candidate"/>
     <revision pkgversion="3.13.92" date="2014-09-20" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -48,8 +49,8 @@
       <p>Press on <gui>Zoom</gui> in the <gui>Seeing</gui> section.</p>
     </item>
     <item>
-      <p>Switch <gui>Zoom</gui> to <gui>ON</gui> in the top-right corner of the
-      <gui>Zoom Options</gui> window.</p>
+      <p>Switch the <gui>Zoom</gui> switch in the top-right corner of the
+      <gui>Zoom Options</gui> window to on.</p>
       <!--<note>
         <p>The <gui>Zoom</gui> section lists the current settings for the
         shortcut keys, which can be set in the <gui>Universal Access</gui>
diff --git a/gnome-help/C/a11y-right-click.page b/gnome-help/C/a11y-right-click.page
index 40ab8c74..773cf940 100644
--- a/gnome-help/C/a11y-right-click.page
+++ b/gnome-help/C/a11y-right-click.page
@@ -12,7 +12,7 @@
     <revision pkgversion="3.13.92" date="2014-09-20" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
     <revision pkgversion="3.29" date="2018-08-21" status="review"/>
-    <revision pkgversion="3.33" date="2019-07-20" status="candidate"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="review"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -56,7 +56,8 @@
       section.</p>
     </item>
     <item>
-      <p>Switch <gui>Simulated Secondary Click</gui> to <gui>ON</gui>.</p>
+      <p>In the <gui>Click Assist</gui> window, switch the <gui>Simulated
+      Secondary Click</gui> switch to on.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/a11y-slowkeys.page b/gnome-help/C/a11y-slowkeys.page
index 057df5b3..53624305 100644
--- a/gnome-help/C/a11y-slowkeys.page
+++ b/gnome-help/C/a11y-slowkeys.page
@@ -12,6 +12,7 @@
     <revision pkgversion="3.13.92" date="2014-09-20" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
     <revision pkgversion="3.29" date="2018-09-05" status="review"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="review"/>
 
     <credit type="author">
       <name>Shaun McCance</name>
@@ -61,7 +62,7 @@
       section.</p>
     </item>
     <item>
-      <p>Switch <gui>Slow Keys</gui> to <gui>ON</gui>.</p>
+      <p>Switch the <gui>Slow Keys</gui> switch to on.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/a11y-stickykeys.page b/gnome-help/C/a11y-stickykeys.page
index 28ebde66..84324f2e 100644
--- a/gnome-help/C/a11y-stickykeys.page
+++ b/gnome-help/C/a11y-stickykeys.page
@@ -12,6 +12,7 @@
     <revision pkgversion="3.13.92" date="2014-09-20" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
     <revision pkgversion="3.29" date="2018-09-05" status="review"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="review"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -64,7 +65,7 @@
       section.</p>
     </item>
     <item>
-      <p>Switch <gui>Sticky Keys</gui> to <gui>ON</gui>.</p>
+      <p>Switch the <gui>Sticky Keys</gui> switch to on.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/a11y-visualalert.page b/gnome-help/C/a11y-visualalert.page
index bfd96c99..93718987 100644
--- a/gnome-help/C/a11y-visualalert.page
+++ b/gnome-help/C/a11y-visualalert.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.9.92" date="2013-09-18" status="candidate"/>
     <revision pkgversion="3.13.92" date="2014-09-20" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -54,7 +55,7 @@
       <p>Press <gui>Visual Alerts</gui> in the <gui>Hearing</gui> section.</p>
     </item>
     <item>
-      <p>Switch <gui>Visual Alerts</gui> to <gui>ON</gui>.</p>
+      <p>Switch the <gui>Visual Alerts</gui> switch to on.</p>
     </item>
     <item>
       <p> Select whether you want the entire screen or just your current window
diff --git a/gnome-help/C/accounts-add.page b/gnome-help/C/accounts-add.page
index 4e1cb9bd..d719e1df 100644
--- a/gnome-help/C/accounts-add.page
+++ b/gnome-help/C/accounts-add.page
@@ -9,6 +9,7 @@
     <revision pkgversion="3.9.92" date="2012-09-18" status="candidate"/>
     <revision pkgversion="3.13.92" date="2013-09-20" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <credit type="author">
       <name>Jim Campbell</name>
@@ -69,7 +70,7 @@
     <item>
       <p>All services that are offered by an account provider will be enabled
       by default. <link xref="accounts-disable-service">Switch</link>
-      individual services to <gui>OFF</gui> to disable them.</p>
+      individual services to off to disable them.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/bluetooth-remove-connection.page b/gnome-help/C/bluetooth-remove-connection.page
index e2b71743..6144e4bb 100644
--- a/gnome-help/C/bluetooth-remove-connection.page
+++ b/gnome-help/C/bluetooth-remove-connection.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.12" date="2014-03-04" status="candidate"/>
     <revision pkgversion="3.13" date="2014-09-22" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <credit type="author">
       <name>Jim Campbell</name>
@@ -60,8 +61,8 @@
       <p>Select the device which you want to disconnect from the list.</p>
     </item>
     <item>
-      <p>In the device dialog box, switch <gui>Connection</gui> to
-      <gui>OFF</gui>, or to remove the device from the <gui>Devices</gui> list,
+      <p>In the device dialog box, switch the <gui>Connection</gui> switch to
+      off, or to remove the device from the <gui>Devices</gui> list,
       click <gui>Remove Device</gui>.</p>
     </item>
   </steps>
diff --git a/gnome-help/C/bluetooth-turn-on-off.page b/gnome-help/C/bluetooth-turn-on-off.page
index de47e7e6..4a9ab815 100644
--- a/gnome-help/C/bluetooth-turn-on-off.page
+++ b/gnome-help/C/bluetooth-turn-on-off.page
@@ -11,7 +11,7 @@
     <revision pkgversion="3.12" date="2014-03-04" status="candidate"/>
     <revision pkgversion="3.13" date="2014-09-21" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
-    <revision pkgversion="3.33" date="2019-07-19" status="candidate"/>
+    <revision pkgversion="3.33.3" date="2019-07-19" status="candidate"/>
 
     <credit type="author">
       <name>Jim Campbell</name>
@@ -64,7 +64,7 @@
       <p>Click on <gui>Bluetooth</gui> to open the panel.</p>
     </item>
     <item>
-      <p>Set the switch at the top to <gui>ON</gui>.</p>
+      <p>Set the switch at the top to on.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/clock-set.page b/gnome-help/C/clock-set.page
index f99433c2..a438219c 100644
--- a/gnome-help/C/clock-set.page
+++ b/gnome-help/C/clock-set.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.10" date="2013-11-01" status="review"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
     <revision pkgversion="3.28" date="2018-04-09" status="review"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="review"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -46,10 +47,9 @@
       <p>Click <gui>Date &amp; Time</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
-      <p>If you have <gui>Automatic Date &amp; Time</gui> set to <gui>ON</gui>,
+      <p>If you have the <gui>Automatic Date &amp; Time</gui> switch set to on,
       your date and time should update automatically if you have an internet
-      connection. To update your date and time manually, set this to
-      <gui>OFF</gui>.</p>
+      connection. To update your date and time manually, set this to off.</p>
     </item> 
     <item>
       <p>Click <gui>Date &amp; Time</gui>, then adjust the time and date.</p>
diff --git a/gnome-help/C/clock-timezone.page b/gnome-help/C/clock-timezone.page
index 2daf04ee..65e2ece1 100644
--- a/gnome-help/C/clock-timezone.page
+++ b/gnome-help/C/clock-timezone.page
@@ -52,11 +52,11 @@
       <p>Click <gui>Date &amp; Time</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
-      <p>If you have <gui>Automatic Time Zone</gui> set to <gui>ON</gui>, your
+      <p>If you have the <gui>Automatic Time Zone</gui> switch set to on, your
       time zone should update automatically if you have an internet
-      connection and the <link xref="privacy-location">location services feature</link>
-      is enabled. To update your time zone manually, set this to
-      <gui>OFF</gui>.</p>
+      connection and the <link xref="privacy-location">location services
+      feature</link> is enabled. To update your time zone manually, set this to
+      off.</p>
     </item>
     <item>
       <p>Click <gui>Time Zone</gui>, then select your location on the map or
diff --git a/gnome-help/C/display-dual-monitors.page b/gnome-help/C/display-dual-monitors.page
index 5ef962cc..eb5ea013 100644
--- a/gnome-help/C/display-dual-monitors.page
+++ b/gnome-help/C/display-dual-monitors.page
@@ -99,8 +99,12 @@
       <p>Click <gui>Displays</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
-      <p>In the <gui>Display Arrangement</gui> diagram, drag your displays to
-      the relative positions you want.</p>
+      <p>In the display arrangement diagram, drag your displays to the relative
+      positions you want.</p>
+      <note style="tip">
+        <p>The numbers on the diagram are shown at the top-left of each
+        display when the <gui>Displays</gui> panel is active.</p>
+      </note>
     </item>
     <item>
       <p>Click <gui>Primary Display</gui> to choose your primary display.</p>
@@ -148,15 +152,12 @@
     available.</p>
     <list>
       <item>
-        <p>Use the drop-down menu to choose which screen to configure.</p>
+        <p>Press the button for the display that you would like to
+        configure.</p>
       </item>
       <item>
         <p>Drag the screens to the desired relative positions.</p>
       </item>
-      <item>
-        <p>Each screen can be turned off or on using the <gui>ON | OFF</gui>
-        switch.</p>
-      </item>
     </list>
 
 </section>
diff --git a/gnome-help/C/display-night-light.page b/gnome-help/C/display-night-light.page
index 4ba969f0..a6c806f1 100644
--- a/gnome-help/C/display-night-light.page
+++ b/gnome-help/C/display-night-light.page
@@ -5,6 +5,7 @@
     <link type="guide" xref="prefs-display"/>
 
     <revision pkgversion="3.28" date="2018-07-28" status="review"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="review"/>
 
     <credit type="author copyright">
       <name>Michael Hill</name>
@@ -43,9 +44,9 @@
       <p>Click <gui>Night Light</gui> to open the settings.</p>
     </item>
     <item>
-      <p>Set the <gui>Night Light</gui> switch to <gui>ON</gui>. The screen
-      color will follow the sunset and sunrise times for your location. Click
-      the <gui>Manual</gui> button to set the times to a custom schedule.</p>
+      <p>Press <gui>Sunset to Sunrise</gui> to make the screen color follow the
+      sunset and sunrise times for your location. Press the <gui>Manual</gui>
+      button to set the times to a custom schedule.</p>
       <note>
         <p>The <link xref="shell-introduction">top bar</link> shows when
         <gui>Night Light</gui> is active. It can be temporarily disabled from
diff --git a/gnome-help/C/keyboard-repeat-keys.page b/gnome-help/C/keyboard-repeat-keys.page
index d35c2a75..99fa02cc 100644
--- a/gnome-help/C/keyboard-repeat-keys.page
+++ b/gnome-help/C/keyboard-repeat-keys.page
@@ -61,7 +61,7 @@
      <p>Press <gui>Repeat Keys</gui> in the <gui>Typing</gui> section.</p>
     </item>
     <item>
-      <p>Switch <gui>Repeat Keys</gui> to <gui>OFF</gui>.</p>
+      <p>Switch the <gui>Repeat Keys</gui> switch to off.</p>
       <p>Alternatively, adjust the <gui>Delay</gui> slider to control how long
       you have to hold a key down to begin repeating it, and adjust the
       <gui>Speed</gui> slider to control how quickly key presses repeat.</p>
diff --git a/gnome-help/C/mouse-mousekeys.page b/gnome-help/C/mouse-mousekeys.page
index 231c9f23..218c193b 100644
--- a/gnome-help/C/mouse-mousekeys.page
+++ b/gnome-help/C/mouse-mousekeys.page
@@ -57,9 +57,11 @@
       <p>Click <gui>Universal Access</gui> to open the panel.</p>
     </item>
     <item>
+      <!-- TODO investigate keyboard navigation, because the arrow keys show no
+           visual feedback, and do not seem to work. -->
       <p>Use the up and down arrow keys to select <gui>Mouse Keys</gui> in the
       <gui>Pointing &amp; Clicking</gui> section, then press <key>Enter</key>
-      to switch <gui>Mouse Keys</gui> to <gui>ON</gui>.</p>
+      to switch the <gui>Mouse Keys</gui> switch to on.</p>
     </item>
     <item>
       <p>Make sure that <key>Num Lock</key> is turned off. You will now be able
diff --git a/gnome-help/C/mouse-touchpad-click.page b/gnome-help/C/mouse-touchpad-click.page
index ced8f9e2..412b0b5c 100644
--- a/gnome-help/C/mouse-touchpad-click.page
+++ b/gnome-help/C/mouse-touchpad-click.page
@@ -57,15 +57,15 @@
       <p>Click on <gui>Mouse &amp; Touchpad</gui> to open the panel.</p>
     </item>
     <item>
-      <p>In the <gui>Touchpad</gui> section, make sure <gui>Touchpad</gui> is
-      set to <gui>ON</gui>.</p>
+      <p>In the <gui>Touchpad</gui> section, make sure the <gui>Touchpad</gui>
+      switch is set to on.</p>
       <note>
         <p>The <gui>Touchpad</gui> section only appears if your system has a
         touchpad.</p>
       </note>
     </item>
    <item>
-      <p>Set <gui>Tap to click</gui> to <gui>ON</gui>.</p>
+      <p>Switch the <gui>Tap to click</gui> switch to on.</p>
     </item>
   </steps>
 
@@ -116,11 +116,11 @@
       <p>Click on <gui>Mouse &amp; Touchpad</gui> to open the panel.</p>
     </item>
     <item>
-      <p>In the <gui>Touchpad</gui> section, make sure <gui>Touchpad</gui> is
-      set to <gui>ON</gui>.</p>
+      <p>In the <gui>Touchpad</gui> section, make sure the <gui>Touchpad</gui>
+      switch is set to on.</p>
     </item>
     <item>
-      <p>Set <gui>Two-finger Scrolling</gui> to <gui>ON</gui>.</p>
+      <p>Switch the <gui>Two-finger Scrolling</gui> switch to on.</p>
     </item>
   </steps>
 
@@ -152,11 +152,11 @@
       <p>Click on <gui>Mouse &amp; Touchpad</gui> to open the panel.</p>
     </item>
     <item>
-      <p>In the <gui>Touchpad</gui> section, make sure <gui>Touchpad</gui> is
-      set to <gui>ON</gui>.</p>
+      <p>In the <gui>Touchpad</gui> section, make sure that the
+     <gui>Touchpad</gui> switch is set to on.</p>
     </item>
     <item>
-      <p>Set <gui>Natural Scrolling</gui> to <gui>ON</gui>.</p>
+      <p>Switch the <gui>Natural Scrolling</gui> switch to on.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/net-fixed-ip-address.page b/gnome-help/C/net-fixed-ip-address.page
index cc9a13d2..ca401cf7 100644
--- a/gnome-help/C/net-fixed-ip-address.page
+++ b/gnome-help/C/net-fixed-ip-address.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.15" date="2014-12-04" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
     <revision pkgversion="3.24" date="2017-03-26" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="candidate"/>
 
     <credit type="author">
       <name>Jim Campbell</name>
@@ -41,6 +42,7 @@
   so you always know what its address is (for example, if it is a file
   server).</p>
 
+  <!-- TODO Update for Network/Wi-Fi split -->
   <steps>
     <title>To give your computer a fixed (static) IP address:</title>
     <item>
@@ -51,30 +53,30 @@
       <p>Click on <gui>Network</gui> to open the panel.</p>
     </item>
     <item>
-      <p>In the left pane, select the network connection that you want to have
-      a fixed address. If you plug in to the network with a cable, click
-      <gui>Wired</gui>, then click the
-      <media its:translate="no" type="image" src="figures/emblem-system.png"><span its:translate="yes">settings</span></media> button in the lower right corner of
-      the panel. For a <gui>Wi-Fi</gui> connection, the 
+      <p>Find the network connection that you want to have a fixed address.
+      Click the
+      <media its:translate="no" type="image" src="figures/emblem-system.png"><span its:translate="yes">settings</span></media>
+      button next to the network connection. For a <gui>Wi-Fi</gui> connection,
+      the
       <media its:translate="no" type="image" src="figures/emblem-system.png"><span its:translate="yes">settings</span></media>
       button will be located next to the active network.</p>
     </item>
     <item>
-      <p>Click on <gui>IPv4</gui> or <gui>IPv6</gui> in the left pane
-      and change the <gui>Addresses</gui> to <em>Manual</em>.</p>
+      <p>Select the <gui>IPv4</gui> or <gui>IPv6</gui> tab and change the
+      <gui>Method</gui> to <em>Manual</em>.</p>
     </item>
     <item>
       <p>Type in the <gui xref="net-what-is-ip-address">IP Address</gui> and
       <gui>Gateway</gui>, as well as the appropriate <gui>Netmask</gui>.</p>
     </item>
     <item>
-      <p>In the <gui>DNS</gui> section, switch <gui>Automatic</gui> to
-      <gui>OFF</gui>. Enter the IP address of a DNS server you want to use.
-      Enter additional DNS server addresses using the <gui>+</gui> button.</p>
+      <p>In the <gui>DNS</gui> section, switch the <gui>Automatic</gui> switch
+      to off. Enter the IP address of a DNS server you want to use. Enter
+      additional DNS server addresses using the <gui>+</gui> button.</p>
     </item>
     <item>
-      <p>In the <gui>Routes</gui> section, switch <gui>Automatic</gui> to
-      <gui>OFF</gui>. Enter the <gui>Address</gui>, <gui>Netmask</gui>,
+      <p>In the <gui>Routes</gui> section, switch the <gui>Automatic</gui>
+      switch to off. Enter the <gui>Address</gui>, <gui>Netmask</gui>,
       <gui>Gateway</gui> and <gui>Metric</gui> for a route you want to use.
       Enter additional routes using the <gui>+</gui> button.</p>
     </item>
diff --git a/gnome-help/C/net-manual.page b/gnome-help/C/net-manual.page
index b425beab..0ec2f673 100644
--- a/gnome-help/C/net-manual.page
+++ b/gnome-help/C/net-manual.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.10" date="2013-11-11" status="review"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
     <revision pkgversion="3.28" date="2018-03-28" status="review"/>
+    <revision pkgversion="3.33.3" date="2018-03-28" status="review"/>
 
     <credit type="author">
       <name>Phil Bull</name>
@@ -44,9 +45,8 @@
       <p>Click on <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>In the left pane, select the network connection that you want to set
-      up manually. If you plug in to the network with a cable, click
-      <gui>Network</gui>. Otherwise click <gui>Wi-Fi</gui>.</p>
+      <p>If you plug in to the network with a cable, click <gui>Network</gui>.
+      Otherwise click <gui>Wi-Fi</gui>.</p>
       <p>Make sure that your wireless card is turned on or a network cable is
       plugged in.</p>
     </item>
@@ -60,21 +60,21 @@
       </note>
     </item>
     <item>
-      <p>Click on <gui>IPv4</gui> or <gui>IPv6</gui> in the left pane
-      and change the <gui>Addresses</gui> to <em>Manual</em>.</p>
+      <p>Select the <gui>IPv4</gui> or <gui>IPv6</gui> tab and change the
+      method to <gui>Manual</gui>.</p>
     </item>
     <item>
       <p>Type in the <gui xref="net-what-is-ip-address">IP Address</gui> and
       <gui>Gateway</gui>, as well as the appropriate <gui>Netmask</gui>.</p>
     </item>
     <item>
-      <p>In the <gui>DNS</gui> section, switch <gui>Automatic</gui> to
-      <gui>OFF</gui>. Enter the IP address of a DNS server you want to use.
-      Enter additional DNS server addresses using the <gui>+</gui> button.</p>
+      <p>In the <gui>DNS</gui> section, switch the <gui>Automatic</gui> switch
+      to off. Enter the IP address of a DNS server you want to use. Enter
+      additional DNS server addresses using the <gui>+</gui> button.</p>
     </item>
     <item>
-      <p>In the <gui>Routes</gui> section, switch <gui>Automatic</gui> to
-      <gui>OFF</gui>. Enter the <gui>Address</gui>, <gui>Netmask</gui>,
+      <p>In the <gui>Routes</gui> section, switch the <gui>Automatic</gui>
+      switch to off. Enter the <gui>Address</gui>, <gui>Netmask</gui>,
       <gui>Gateway</gui> and <gui>Metric</gui> for a route you want to use.
       Enter additional routes using the <gui>+</gui> button.</p>
     </item>
diff --git a/gnome-help/C/net-wireless-airplane.page b/gnome-help/C/net-wireless-airplane.page
index 52d6fa25..a33dcfdc 100644
--- a/gnome-help/C/net-wireless-airplane.page
+++ b/gnome-help/C/net-wireless-airplane.page
@@ -27,7 +27,7 @@
       <years>2015</years>
     </credit>
 
-    <desc>Open Network Settings and switch Airplane Mode to ON.</desc>
+    <desc>Open Network Settings and switch Airplane Mode to on.</desc>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
@@ -48,13 +48,13 @@
   <steps>
     <item>
       <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Network</gui>.</p>
+      start typing <gui>Wi-Fi</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Network</gui> to open the panel.</p>
+      <p>Click on <gui>Wi-Fi</gui> to open the panel.</p>
     </item>
     <item>
-      <p>Switch <gui>Airplane Mode</gui> to <gui>ON</gui>. This will turn off
+      <p>Switch the <gui>Airplane Mode</gui> switch to on. This will turn off
       your wireless connection until you disable airplane mode again.</p>
     </item>
   </steps>
diff --git a/gnome-help/C/net-wireless-troubleshooting-initial-check.page b/gnome-help/C/net-wireless-troubleshooting-initial-check.page
index c23cd9c2..829a8aa3 100644
--- a/gnome-help/C/net-wireless-troubleshooting-initial-check.page
+++ b/gnome-help/C/net-wireless-troubleshooting-initial-check.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.4.0" date="2012-03-05" status="outdated"/>
     <revision pkgversion="3.10" date="2013-11-10" status="review"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <credit type="author">
       <name>Contributors to the Ubuntu documentation wiki</name>
@@ -52,11 +53,10 @@
     <item>
       <p>Open the
       <gui xref="shell-introduction#systemmenu">system menu</gui> from the right
-      side of the top bar and select
-      <gui>Wi-Fi</gui>, then select <gui>Wi-Fi Settings</gui>. Make sure that
-      <gui>Wi-Fi</gui> is set to <gui>ON</gui>. You should also check that
-      <link xref="net-wireless-airplane">Airplane Mode</link> is <em>not</em>
-      switched on.</p>
+      side of the top bar and select the Wi-Fi network, then select <gui>Wi-Fi
+      Settings</gui>. Make sure that the <gui>Wi-Fi</gui> switch is set to on.
+      You should also check that <link xref="net-wireless-airplane">Airplane
+      Mode</link> is <em>not</em> switched on.</p>
     </item>
     <item>
       <p>Open the Terminal, type <cmd>nmcli device</cmd> and press
diff --git a/gnome-help/C/power-autobrightness.page b/gnome-help/C/power-autobrightness.page
index a256ac8a..e3312844 100644
--- a/gnome-help/C/power-autobrightness.page
+++ b/gnome-help/C/power-autobrightness.page
@@ -37,12 +37,12 @@
       <p>Click <gui>Power</gui> to open the panel.</p>
     </item>
     <item>
-      <p>In the <gui>Power Saving</gui> section, ensure that
-      <gui>Automatic brightness</gui> is set to <gui>ON</gui>.</p>
+      <p>In the <gui>Power Saving</gui> section, ensure that the
+      <gui>Automatic brightness</gui> switch is set to on.</p>
     </item>
 
   </steps>
 
-  <p>To disable automatic screen brightness, switch it to <gui>OFF</gui>.</p>
+  <p>To disable automatic screen brightness, switch it to off.</p>
 
 </page>
diff --git a/gnome-help/C/power-autosuspend.page b/gnome-help/C/power-autosuspend.page
index 13b8da3b..4170c84a 100644
--- a/gnome-help/C/power-autosuspend.page
+++ b/gnome-help/C/power-autosuspend.page
@@ -9,6 +9,7 @@
      <link type="seealso" xref="shell-exit#suspend"/>
 
     <revision pkgversion="3.20" date="2016-06-15" status="candidate"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="candidate"/>
 
     <credit type="author copyright">
       <name>Michael Hill</name>
@@ -41,7 +42,7 @@
     </item>
     <item>
       <p>Choose <gui>On Battery Power</gui> or <gui>Plugged In</gui>, set the
-      switch to <gui>ON</gui>, and select a <gui>Delay</gui>. Both options can
+      switch to on, and select a <gui>Delay</gui>. Both options can
       be configured.</p>
 
       <note style="tip">
diff --git a/gnome-help/C/power-closelid.page b/gnome-help/C/power-closelid.page
index a612182c..0b64470a 100644
--- a/gnome-help/C/power-closelid.page
+++ b/gnome-help/C/power-closelid.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.10" date="2013-11-08" status="review"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
     <revision pkgversion="3.26" date="2017-09-30" status="candidate"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="candidate"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -82,11 +83,11 @@
       <p>Click <gui>Tweaks</gui> to open the application.</p>
     </item>
     <item>
-      <p>Click the <gui>Power</gui> tab.</p>
+      <p>Select the <gui>General</gui> tab.</p>
     </item>
     <item>
-      <p>Switch <gui>Suspend when laptop lid is closed</gui> to
-      <gui>OFF</gui>.</p>
+      <p>Switch the <gui>Suspend when laptop lid is closed</gui> switch to
+      off.</p>
     </item>
     <item>
       <p>Close the <gui>Tweaks</gui> window.</p>
diff --git a/gnome-help/C/power-nowireless.page b/gnome-help/C/power-nowireless.page
index 3ed321a6..73625e1e 100644
--- a/gnome-help/C/power-nowireless.page
+++ b/gnome-help/C/power-nowireless.page
@@ -12,6 +12,7 @@
     <revision pkgversion="3.7.1" version="0.2" date="2012-11-16" status="outdated"/>
     <revision pkgversion="3.10" date="2013-10-28" status="review"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -47,20 +48,18 @@
   <steps>
     <item>
       <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Network</gui>.</p>
+      start typing <gui>Wi-Fi</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Network</gui> to open the panel.</p>
+      <p>Click on <gui>Wi-Fi</gui> to open the panel.</p>
     </item>
     <item>
-      <p>Select <gui>Wi-Fi</gui>.</p>
+      <p>Switch the <gui>Wi-Fi</gui> switch at the top-right of the window to
+      off and then on again.</p>
     </item>
     <item>
-      <p>Switch the wireless <gui>OFF</gui> and then <gui>ON</gui> again.</p>
-    </item>
-    <item>
-      <p>If the wireless still does not work, switch <gui>ON</gui> the
-      <gui>Airplane Mode</gui> and then switch it <gui>OFF</gui> again.</p>
+      <p>If the wireless still does not work, switch the <gui>Airplane
+      Mode</gui> switch to on and then switch it off again.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/power-whydim.page b/gnome-help/C/power-whydim.page
index e64be777..9ff2965f 100644
--- a/gnome-help/C/power-whydim.page
+++ b/gnome-help/C/power-whydim.page
@@ -57,7 +57,7 @@
       <p>Click <gui>Power</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
-      <p>Switch <gui>Dim screen when inactive</gui> to <gui>OFF</gui> in the
+      <p>Switch the <gui>Dim screen when inactive</gui> switch to off in the
       <gui>Power Saving</gui> section.</p>
     </item>
   </steps>
diff --git a/gnome-help/C/power-wireless.page b/gnome-help/C/power-wireless.page
index b0cde3a4..2eeefc08 100644
--- a/gnome-help/C/power-wireless.page
+++ b/gnome-help/C/power-wireless.page
@@ -8,6 +8,7 @@
     <link type="seealso" xref="power-batterylife"/>
 
     <revision pkgversion="3.20" date="2016-06-15" status="candidate"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="candidate"/>
 
     <credit type="author copyright">
       <name>Michael Hill</name>
@@ -37,8 +38,8 @@
     <item>
       <p>The <gui>Power Saving</gui> section contains switches for
       <gui>Wi-Fi</gui>, <gui>Mobile broadband</gui>, and <gui>Bluetooth</gui>.
-      Switch the unused services to <gui>OFF</gui>. Re-enable when needed by
-      switching to <gui>ON</gui>.</p>
+      Switch the unused services to off. Re-enable when needed by switching to
+      on.</p>
     </item>
 
   </steps>
diff --git a/gnome-help/C/privacy-history-recent-off.page b/gnome-help/C/privacy-history-recent-off.page
index 2230497f..6e786850 100644
--- a/gnome-help/C/privacy-history-recent-off.page
+++ b/gnome-help/C/privacy-history-recent-off.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.12" date="2014-03-23" status="candidate"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-30" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <credit type="author">
       <name>Jim Campbell</name>
@@ -46,9 +47,9 @@
       <p>Select <gui>Usage &amp; History</gui>.</p>
     </item>
     <item>
-     <p>Set the <gui>Recently Used</gui> switch to <gui>OFF</gui>.</p>
-     <p>To re-enable this feature, set the <gui>Recently Used</gui> switch to
-     <gui>ON</gui>.</p>
+     <p>Switch the <gui>Recently Used</gui> switch to off.</p>
+     <p>To re-enable this feature, switch the <gui>Recently Used</gui> switch
+     to on.</p>
     </item>
     <item>
       <p>Use the <gui>Clear Recent History</gui> button to purge the history
@@ -72,7 +73,7 @@
       <p>Select <gui>Usage &amp; History</gui>.</p>
     </item>
     <item>
-     <p>Ensure the <gui>Recently Used</gui> switch is <gui>ON</gui>.</p>
+     <p>Ensure the <gui>Recently Used</gui> switch is set to on.</p>
     </item>
     <item>
      <p>Select the length of time to <gui>Retain History</gui>. Choose from
diff --git a/gnome-help/C/privacy-location.page b/gnome-help/C/privacy-location.page
index 9d2b3101..24ff8c20 100644
--- a/gnome-help/C/privacy-location.page
+++ b/gnome-help/C/privacy-location.page
@@ -6,6 +6,7 @@
 
     <revision pkgversion="3.14" date="2014-10-13" status="review"/>
     <revision pkgversion="3.18" date="2015-09-30" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <credit type="author copyright">
       <name>Michael Hill</name>
@@ -36,9 +37,9 @@
       <p>Click on <gui>Privacy</gui> to open the panel.</p>
     </item>
     <item>
-     <p>Set the <gui>Location Services</gui> switch to <gui>OFF</gui>.</p>
+     <p>Switch the <gui>Location Services</gui> switch to off.</p>
      <p>To re-enable this feature, set the <gui>Location Services</gui> switch
-     to <gui>ON</gui>.</p>
+     to off.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/privacy-purge.page b/gnome-help/C/privacy-purge.page
index 8fdc18d8..fe7db4e0 100644
--- a/gnome-help/C/privacy-purge.page
+++ b/gnome-help/C/privacy-purge.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.12" date="2014-03-23" status="candidate"/>
     <revision pkgversion="3.14" date="2014-10-12" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-30" status="candidate"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="candidate"/>
 
     <credit type="author">
       <name>Jim Campbell</name>
@@ -56,9 +57,8 @@
       <p>Select <gui>Purge Trash &amp; Temporary Files</gui>.</p>
     </item>
     <item>
-      <p>Set one or both of the <gui>Automatically empty Trash</gui> or
-      <gui>Automatically purge Temporary Files</gui> switches to
-      <gui>ON</gui>.</p>
+      <p>Switch one or both of the <gui>Automatically empty Trash</gui> or
+      <gui>Automatically purge Temporary Files</gui> switches to on.</p>
     </item>
     <item>
       <p>Set how often you would like your <em>Trash</em>  and
diff --git a/gnome-help/C/privacy-screen-lock.page b/gnome-help/C/privacy-screen-lock.page
index 4b573cc2..4a51f190 100644
--- a/gnome-help/C/privacy-screen-lock.page
+++ b/gnome-help/C/privacy-screen-lock.page
@@ -12,6 +12,7 @@
     <revision pkgversion="3.12" date="2014-03-23" status="candidate"/>
     <revision pkgversion="3.14" date="2014-10-12" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-30" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <credit type="author">
       <name>Shaun McCance</name>
@@ -60,8 +61,8 @@
       <p>Select <gui>Screen Lock</gui>.</p>
     </item>
     <item>
-      <p>Make sure <gui>Automatic Screen Lock</gui> is switched <gui>ON</gui>,
-      then select a length of time from the drop-down list.</p>
+      <p>Make sure <gui>Automatic Screen Lock</gui> is switched on, then select
+      a length of time from the drop-down list.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/session-screenlocks.page b/gnome-help/C/session-screenlocks.page
index 77b2eb4c..b93726c3 100644
--- a/gnome-help/C/session-screenlocks.page
+++ b/gnome-help/C/session-screenlocks.page
@@ -63,7 +63,7 @@
 
   <note style="tip">
     <p>If you don’t ever want the screen to lock itself automatically, switch
-    <gui>Automatic Screen Lock</gui> to <gui>OFF</gui>.</p>
+    the <gui>Automatic Screen Lock</gui> switch to off.</p>
   </note>
 
 </page>
diff --git a/gnome-help/C/sharing-desktop.page b/gnome-help/C/sharing-desktop.page
index d757a979..2b1d650b 100644
--- a/gnome-help/C/sharing-desktop.page
+++ b/gnome-help/C/sharing-desktop.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.14" date="2015-01-25" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-28" status="review"/>
     <revision pkgversion="3.29" date="2018-08-28" status="review"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="review"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
@@ -68,8 +69,8 @@
       <p>Click on <gui>Sharing</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
-      <p>If <gui>Sharing</gui> is <gui>OFF</gui>, switch it to
-      <gui>ON</gui>.</p>
+      <p>If the <gui>Sharing</gui> switch at the top-right of the window is set
+      to off, switch it to on.</p>
 
       <note style="info"><p>If the text below <gui>Computer Name</gui> allows
       you to edit it, you can <link xref="sharing-displayname">change</link>
@@ -79,22 +80,16 @@
       <p>Select <gui>Screen Sharing</gui>.</p>
     </item>
     <item>
-      <p>To let others view your desktop, switch <gui>Screen Sharing</gui> to
-      <gui>ON</gui>. This means that other people will be able to attempt to
+      <p>To let others view your desktop, switch the <gui>Screen Sharing</gui>
+      switch to on. This means that other people will be able to attempt to
       connect to your computer and view what’s on your screen.</p>
     </item>
     <item>
-      <p>To let others interact with your desktop, switch
-      <gui>Allow Remote Control</gui> to <gui>ON</gui>. This may allow the
+      <p>To let others interact with your desktop, ensure that <gui>Allow
+      connections to control the screen</gui> is checked. This may allow the
       other person to move your mouse, run applications, and browse files on
       your computer, depending on the security settings which you are currently
       using.</p>
-
-      <note style="tip">
-        <p>This option is enabled by default when <gui>Screen Sharing</gui> is
-        <gui>ON</gui>.</p>
-      </note>
-
     </item>
   </steps>
 
@@ -145,8 +140,8 @@
   <title>Networks</title>
 
   <p>The <gui>Networks</gui> section lists the networks to which you are
-  currently connected. Use the <gui>ON | OFF</gui> switch next to each to
-  choose where your desktop can be shared.</p>
+  currently connected. Use the switch next to each to choose where your
+  desktop can be shared.</p>
   </section>
 
   <section id="disconnect">
@@ -170,7 +165,7 @@
       it.</p>
     </item>
     <item>
-      <p>Toggle the switch at the top to <gui>OFF</gui>.</p>
+      <p>Toggle the switch at the top to off.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/sharing-media.page b/gnome-help/C/sharing-media.page
index c3bd8424..a93460d3 100644
--- a/gnome-help/C/sharing-media.page
+++ b/gnome-help/C/sharing-media.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.12" date="2014-03-23" status="candidate"/>
     <revision pkgversion="3.14" date="2014-10-13" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-28" status="review"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="review"/>
 
     <credit type="author">
       <name>Michael Hill</name>
@@ -59,8 +60,8 @@
       <p>Click on <gui>Sharing</gui> to open the panel.</p>
     </item>
     <item>
-      <p>If <gui>Sharing</gui> is <gui>OFF</gui>, switch it to
-      <gui>ON</gui>.</p>
+      <p>If the <gui>Sharing</gui> switch in the top-right of the window is
+      set to, switch it to on.</p>
 
       <note style="info"><p>If the text below <gui>Computer Name</gui> allows
       you to edit it, you can <link xref="sharing-displayname">change</link>
@@ -70,7 +71,7 @@
       <p>Select <gui>Media Sharing</gui>.</p>
     </item>
     <item>
-      <p>Switch <gui>Media Sharing</gui> to <gui>ON</gui>.</p>
+      <p>Switch the <gui>Media Sharing</gui> switch to on.</p>
     </item>
     <item>
       <p>By default, <file>Music</file>, <file>Pictures</file> and 
@@ -92,8 +93,8 @@
   <title>Networks</title>
 
   <p>The <gui>Networks</gui> section lists the networks to which you are
-  currently connected. Use the <gui>ON | OFF</gui> switch next to each to
-  choose where your media can be shared.</p>
+  currently connected. Use the switch next to each to choose where your media
+  can be shared.</p>
 
   </section>
 
diff --git a/gnome-help/C/sharing-personal.page b/gnome-help/C/sharing-personal.page
index 24cd0556..394034ca 100644
--- a/gnome-help/C/sharing-personal.page
+++ b/gnome-help/C/sharing-personal.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.12" date="2014-03-23" status="candidate"/>
     <revision pkgversion="3.14" date="2014-10-13" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-28" status="review"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="review"/>
 
     <credit type="author">
       <name>Michael Hill</name>
@@ -68,8 +69,8 @@
       <p>Click on <gui>Sharing</gui> to open the panel.</p>
     </item>
     <item>
-      <p>If <gui>Sharing</gui> is <gui>OFF</gui>, switch it to
-      <gui>ON</gui>.</p>
+      <p>If the <gui>Sharing</gui> switch in the top-right of the window is set
+      to off, switch it to on.</p>
 
       <note style="info"><p>If the text below <gui>Computer Name</gui> allows
       you to edit it, you can <link xref="sharing-displayname">change</link>
@@ -79,7 +80,7 @@
       <p>Select <gui>Personal File Sharing</gui>.</p>
     </item>
     <item>
-      <p>Switch <gui>Personal File Sharing</gui> to <gui>ON</gui>. This means
+      <p>Switch the <gui>Personal File Sharing</gui> switch to on. This means
       that other people on your current network will be able to attempt to
       connect to your computer and access files in your <file>Public</file>
       folder.</p>
@@ -97,8 +98,8 @@
     <item>
       <title>Require Password</title>
       <p>To require other people to use a password when accessing your
-      <file>Public</file> folder, switch <gui>Require Password</gui> to
-      <gui>ON</gui>. If you do not use this option, anyone can attempt to view
+      <file>Public</file> folder, switch the <gui>Require Password</gui>
+      switch to on. If you do not use this option, anyone can attempt to view
       your <file>Public</file> folder.</p>
       <note style="tip">
         <p>This option is disabled by default, but you should enable it and set
@@ -112,8 +113,8 @@
   <title>Networks</title>
 
   <p>The <gui>Networks</gui> section lists the networks to which you are
-  currently connected. Use the <gui>ON | OFF</gui> switch next to each to
-  choose where your personal files can be shared.</p>
+  currently connected. Use the switch next to each to choose where your
+  personal files can be shared.</p>
 
   </section>
 
diff --git a/gnome-help/C/shell-notifications.page b/gnome-help/C/shell-notifications.page
index 86b5ed13..a5dbbf5a 100644
--- a/gnome-help/C/shell-notifications.page
+++ b/gnome-help/C/shell-notifications.page
@@ -7,7 +7,7 @@
   <info>
     <link type="guide" xref="shell-overview#desktop" />
 
-    <revision pkgversion="3.33" date="2019-07-19" status="review"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="review"/>
 
     <credit type="author">
       <name>Marina Zhurakhinskaya</name>
@@ -106,7 +106,7 @@
   critically low, will still pop up.--> Notifications will still be available
   in the notification list when you display it (by clicking on the clock, or by
   pressing <keyseq><key>Super</key><key>V</key></keyseq>), and they will start
-  popping up again when you switch the toggle back to <gui>ON</gui>.</p>
+  popping up again when you switch the switch back to on.</p>
 
   <p>You can also disable or re-enable notifications for individual
   applications from the <gui>Notifications</gui> panel.</p>
diff --git a/gnome-help/C/sound-alert.page b/gnome-help/C/sound-alert.page
index f1fc5a1d..c3468c73 100644
--- a/gnome-help/C/sound-alert.page
+++ b/gnome-help/C/sound-alert.page
@@ -46,16 +46,13 @@
       <p>Click on <gui>Sound</gui> to open the panel.</p>
     </item>
     <item>
-      <p>In the <gui>Sound Effects</gui> tab, select an alert sound. Each sound
-      will play when you click on it so you can hear how it sounds.</p>
+      <p>In the <gui>Alert Sound</gui> section, select an alert sound. Each
+      sound will play when you click on it so you can hear how it sounds.</p>
     </item>
   </steps>
 
-  <p>Use the volume slider in the <gui>Sound Effects</gui> tab to set the
-  volume of the alert sound. This will not affect the volume of your music,
-  movies, or other sound files.</p>
-
-  <p>To disable alert sounds entirely, switch the <gui>Alert volume</gui> to
-  <gui>OFF</gui>.</p>
+  <p>Use the volume slider for <gui>System Sounds</gui>in the <gui>Volume
+  Levels</gui> section to set the volume of the alert sound. This will not
+  affect the volume of your music, movies, or other sound files.</p>
 
 </page>
diff --git a/gnome-help/C/user-autologin.page b/gnome-help/C/user-autologin.page
index 2d2848bb..ff2f51dc 100644
--- a/gnome-help/C/user-autologin.page
+++ b/gnome-help/C/user-autologin.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.8" date="2013-04-04" status="review" />
     <revision pkgversion="3.13.92" date="2014-09-22" status="review" />
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-21" status="final"/>
 
     <credit type="author copyright">
       <name>Ekaterina Gerasimova</name>
@@ -44,7 +45,7 @@
       type in your password when prompted.</p>
     </item>
     <item>
-      <p>Toggle the <gui>Automatic Login</gui> switch to <gui>ON</gui>.</p>
+      <p>Switch the <gui>Automatic Login</gui> switch to on.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/wacom-left-handed.page b/gnome-help/C/wacom-left-handed.page
index 2a469a64..74e3c457 100644
--- a/gnome-help/C/wacom-left-handed.page
+++ b/gnome-help/C/wacom-left-handed.page
@@ -50,7 +50,8 @@
     <gui>Please plug in or turn on your Wacom tablet</gui>. Click the
     <gui>Bluetooth Settings</gui> link to connect a wireless tablet.</p></note>
   </item>
-  <item><p>Switch <gui>Left-Handed Orientation</gui> to <gui>ON</gui>.</p></item>
+  <item><p>Switch the <gui>Left-Handed Orientation</gui> switch to
+  on.</p></item>
 </steps>
 
 </page>
diff --git a/gnome-help/C/wacom-multi-monitor.page b/gnome-help/C/wacom-multi-monitor.page
index ce979c8f..40c42f2f 100644
--- a/gnome-help/C/wacom-multi-monitor.page
+++ b/gnome-help/C/wacom-multi-monitor.page
@@ -65,7 +65,7 @@
       selectable.</p></note>
   </item>
   <item>
-    <p>Switch <gui>Keep aspect ratio (letterbox)</gui> to <gui>ON</gui> to
+    <p>Switch the <gui>Keep aspect ratio (letterbox)</gui> switch to on to
     match the drawing area of the tablet to the proportions of the monitor.
       This setting, also called <em>force proportions</em>,
       “letterboxes” the drawing area on a tablet to correspond more