[gnome-user-docs/wip/mdh] fix inconsistent terminology, close #40

[Michael Hill <mdhill src gnome org>]

commit 36c64fcce097c6832e8fe2c59808d25b7c304f95
Author: Michael Hill <mdhillca gmail com>
Date:   Sat Jul 20 00:20:47 2019 -0400

    fix inconsistent terminology, close #40

 gnome-help/C/bluetooth-connect-device.page                   |  5 +++--
 gnome-help/C/bluetooth-problem-connecting.page               |  3 ++-
 gnome-help/C/bluetooth-turn-on-off.page                      |  4 ++--
 gnome-help/C/net-manual.page                                 | 10 ++++------
 gnome-help/C/net-mobile.page                                 |  5 ++---
 gnome-help/C/net-wireless-troubleshooting-initial-check.page |  4 +++-
 gnome-help/C/shell-introduction.page                         |  6 +++---
 7 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/gnome-help/C/bluetooth-connect-device.page b/gnome-help/C/bluetooth-connect-device.page
index 368ccaa3..00e81471 100644
--- a/gnome-help/C/bluetooth-connect-device.page
+++ b/gnome-help/C/bluetooth-connect-device.page
@@ -14,6 +14,7 @@
     <revision pkgversion="3.12" date="2014-03-23" status="candidate"/>
     <revision pkgversion="3.13" date="2014-09-22" status="final"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.33" date="2019-07-19" status="candidate"/>
 
     <credit type="author">
       <name>Jim Campbell</name>
@@ -61,8 +62,8 @@
     </item>
     <item>
       <p>Make sure Bluetooth is enabled: the switch at the top should be set to
-      <gui>ON</gui>. With the panel open and the switch <gui>ON</gui>, your
-      computer will begin searching for devices.</p>
+      on. With the panel open and the switch on, your computer will begin
+      searching for devices.</p>
     </item>
     <item>
       <p>Make the other Bluetooth device
diff --git a/gnome-help/C/bluetooth-problem-connecting.page b/gnome-help/C/bluetooth-problem-connecting.page
index f4abf47b..96fd5b22 100644
--- a/gnome-help/C/bluetooth-problem-connecting.page
+++ b/gnome-help/C/bluetooth-problem-connecting.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-28" status="final"/>
+    <revision pkgversion="3.33" date="2019-07-19" status="candidate"/>
 
     <credit type="author">
       <name>Phil Bull</name>
@@ -77,7 +78,7 @@
     <cite date="2013-11-09" href="mailto:mdhillca gmail com">mdhill</cite>
     <p>Add link to shell-terminology definition of system status *area* of top
     bar when it has been written, explain that if your network connection is
-    through a Bluetooth device it will show up in the system status *menu*.</p>
+    through a Bluetooth device it will show up in the system *menu*.</p>
   </comment>
 
 </page>
diff --git a/gnome-help/C/bluetooth-turn-on-off.page b/gnome-help/C/bluetooth-turn-on-off.page
index ca56e3b5..de47e7e6 100644
--- a/gnome-help/C/bluetooth-turn-on-off.page
+++ b/gnome-help/C/bluetooth-turn-on-off.page
@@ -48,8 +48,8 @@
     <cite date="2013-11-09" href="mailto:mdhillca gmail com">mdhill</cite>
     <p>Add link to shell-terminology definition of system status *area* of top
     bar when it has been written, explain that if your network connection is
-    through a Bluetooth device it will show up in the system status *menu*
-    and only then will its icon be visible as shown.</p>
+    through a Bluetooth device it will show up in the system *menu* and only
+    then will its icon be visible as shown.</p>
   </comment>
 
   <p>You can turn Bluetooth on to connect to other Bluetooth devices, or turn
diff --git a/gnome-help/C/net-manual.page b/gnome-help/C/net-manual.page
index 128fe00d..b425beab 100644
--- a/gnome-help/C/net-manual.page
+++ b/gnome-help/C/net-manual.page
@@ -52,10 +52,7 @@
     </item>
     <item>      
       <p>Click the
-      <media its:translate="no" type="image"
-             src="figures/emblem-system.png"><span
-                                                 its:translate="yes">settings</span></media>
-      button.</p>
+      <media its:translate="no" type="image" src="figures/emblem-system.png"><span                  
its:translate="yes">settings</span></media>button.</p>
       <note>
         <p>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>
@@ -82,8 +79,9 @@
       Enter additional routes using the <gui>+</gui> button.</p>
     </item>
     <item>
-      <p>Click <gui>Apply</gui>. If you are not connected to the network, click
-      the system status area on the top bar and connect. Test the network
+      <p>Click <gui>Apply</gui>. If you are not connected to the network, open the
+      <gui xref="shell-introduction#systemmenu">system menu</gui> from the right side of
+      the top bar and connect. Test the network
       settings by trying to visit a website or look at shared files on the
       network, for example.</p>
     </item>
diff --git a/gnome-help/C/net-mobile.page b/gnome-help/C/net-mobile.page
index 16034715..b7dfc9ad 100644
--- a/gnome-help/C/net-mobile.page
+++ b/gnome-help/C/net-mobile.page
@@ -48,9 +48,8 @@
       Mobile Broadband Off</gui>. The <gui>Mobile Broadband</gui> section of
       the menu will expand.</p>
       <note>
-        <p>If <gui>Mobile Broadband</gui> does not appear in the system
-        status menu, ensure that your device is not set to connect as Mass
-        Storage.</p>
+        <p>If <gui>Mobile Broadband</gui> does not appear in the system menu,
+        ensure that your device is not set to connect as Mass Storage.</p>
       </note>
     </item>
     <item><p>Select <gui>Connect</gui>. If you are connecting for the first
diff --git a/gnome-help/C/net-wireless-troubleshooting-initial-check.page 
b/gnome-help/C/net-wireless-troubleshooting-initial-check.page
index bc8d65e3..c23cd9c2 100644
--- a/gnome-help/C/net-wireless-troubleshooting-initial-check.page
+++ b/gnome-help/C/net-wireless-troubleshooting-initial-check.page
@@ -50,7 +50,9 @@
       keyboard keys.</p>
     </item>
     <item>
-      <p>Click the system status area on the top bar and select
+      <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>
diff --git a/gnome-help/C/shell-introduction.page b/gnome-help/C/shell-introduction.page
index c60098e4..aeec3555 100644
--- a/gnome-help/C/shell-introduction.page
+++ b/gnome-help/C/shell-introduction.page
@@ -42,12 +42,12 @@
 <if:choose>
   <if:when test="!platform:gnome-classic">
     <media type="image" src="figures/shell-top-bar.png" width="600" if:test="!target:mobile">
-      <p>GNOME shell top bar</p>
+      <p>GNOME Shell top bar</p>
     </media>
   </if:when>
   <if:when test="platform:gnome-classic">
     <media type="image" src="figures/shell-top-bar-classic.png" width="500" height="40" 
if:test="!target:mobile">
-      <p>GNOME shell top bar</p>
+      <p>GNOME Shell top bar</p>
     </media>
   </if:when>
 </if:choose>
@@ -55,7 +55,7 @@
   <p>The top bar provides access to your windows and applications, your
   calendar and appointments, and
   <link xref="status-icons">system properties</link> like sound, networking,
-  and power. In the status menu in the top bar, you can change the volume or
+  and power. In the system menu in the top bar, you can change the volume or
   screen brightness, edit your <gui>Wi-Fi</gui> connection details, check your
   battery status, log out or switch users, and turn off your computer.</p>