[gnome-user-docs/wip/mdh] Settings update: keyboard-, mouse- pages



commit c761243d1ef4c1d43da354c024b05780e92f0c77
Author: Michael Hill <mdhillca gmail com>
Date:   Wed Sep 5 07:45:00 2018 -0400

    Settings update: keyboard-, mouse- pages

 gnome-help/C/a11y-bouncekeys.page             |  10 +-
 gnome-help/C/a11y-dwellclick.page             |  10 +-
 gnome-help/C/a11y-right-click.page            |  10 +-
 gnome-help/C/a11y-slowkeys.page               |  10 +-
 gnome-help/C/a11y-stickykeys.page             |  10 +-
 gnome-help/C/figures/emoji-flags-symbolic.svg |   7 +
 gnome-help/C/figures/go-down-symbolic.svg     |   7 +
 gnome-help/C/gnome-classic.page               |   5 +-
 gnome-help/C/keyboard-cursor-blink.page       |  10 +-
 gnome-help/C/keyboard-key-super.page          |  16 +-
 gnome-help/C/keyboard-layouts.page            |  44 ++--
 gnome-help/C/keyboard-nav.page                |  30 +--
 gnome-help/C/keyboard-osk.page                |  33 ++-
 gnome-help/C/keyboard-repeat-keys.page        |  10 +-
 gnome-help/C/keyboard-shortcuts-set.page      | 325 +++++++++++++-------------
 gnome-help/C/mouse-doubleclick.page           |  63 ++---
 gnome-help/C/mouse-lefthanded.page            |  17 +-
 gnome-help/C/mouse-mousekeys.page             |  22 +-
 gnome-help/C/mouse-sensitivity.page           |  31 +--
 gnome-help/C/mouse-touchpad-click.page        |  57 +++--
 gnome-help/C/mouse.page                       |   2 +-
 gnome-help/C/prefs.page                       |   4 +-
 gnome-help/C/sharing-desktop.page             |  46 ++--
 gnome-help/C/shell-introduction.page          |   7 +-
 gnome-help/C/shell-keyboard-shortcuts.page    |  44 ++--
 gnome-help/C/shell-notifications.page         |  77 +++---
 gnome-help/Makefile.am                        |   2 +
 27 files changed, 521 insertions(+), 388 deletions(-)
---
diff --git a/gnome-help/C/a11y-bouncekeys.page b/gnome-help/C/a11y-bouncekeys.page
index d09f79e0..9689b28e 100644
--- a/gnome-help/C/a11y-bouncekeys.page
+++ b/gnome-help/C/a11y-bouncekeys.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.29" date="2018-09-05" status="review"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -43,11 +44,14 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Universal Access</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Universal Access</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Universal Access</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
       <p>Press <gui>Typing Assist (AccessX)</gui> in the <gui>Typing</gui>
diff --git a/gnome-help/C/a11y-dwellclick.page b/gnome-help/C/a11y-dwellclick.page
index 6465c588..5886db8e 100644
--- a/gnome-help/C/a11y-dwellclick.page
+++ b/gnome-help/C/a11y-dwellclick.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.29" date="2018-08-21" status="review"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -48,11 +49,14 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Universal Access</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Universal Access</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Universal Access</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
       <p>Press <gui>Click Assist</gui> in the <gui>Pointing &amp;
diff --git a/gnome-help/C/a11y-right-click.page b/gnome-help/C/a11y-right-click.page
index 57ca31f1..5b6adec5 100644
--- a/gnome-help/C/a11y-right-click.page
+++ b/gnome-help/C/a11y-right-click.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.29" date="2018-08-21" status="review"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -43,11 +44,14 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Universal Access</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Universal Access</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Universal Access</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
       <p>Press <gui>Click Assist</gui> in the <gui>Pointing &amp; Clicking</gui>
diff --git a/gnome-help/C/a11y-slowkeys.page b/gnome-help/C/a11y-slowkeys.page
index 6da48007..057df5b3 100644
--- a/gnome-help/C/a11y-slowkeys.page
+++ b/gnome-help/C/a11y-slowkeys.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.29" date="2018-09-05" status="review"/>
 
     <credit type="author">
       <name>Shaun McCance</name>
@@ -46,11 +47,14 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Universal Access</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Universal Access</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Universal Access</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
       <p>Press <gui>Typing Assist (AccessX)</gui> in the <gui>Typing</gui>
diff --git a/gnome-help/C/a11y-stickykeys.page b/gnome-help/C/a11y-stickykeys.page
index f16a1802..28ebde66 100644
--- a/gnome-help/C/a11y-stickykeys.page
+++ b/gnome-help/C/a11y-stickykeys.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.29" date="2018-09-05" status="review"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -49,11 +50,14 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Universal Access</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Universal Access</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Universal Access</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
       <p>Press <gui>Typing Assist (AccessX)</gui> in the <gui>Typing</gui>
diff --git a/gnome-help/C/figures/emoji-flags-symbolic.svg b/gnome-help/C/figures/emoji-flags-symbolic.svg
new file mode 100644
index 00000000..7be24d7c
--- /dev/null
+++ b/gnome-help/C/figures/emoji-flags-symbolic.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="16.003" height="16">
+    <g fill="#2e3436" fill-rule="evenodd">
+        <path d="M2.003 1v14h2V1z" 
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal"
 color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
+        <path d="M3.003 1a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h3.383l.722 1.447a1 1 0 0 0 .895.553h5a1 1 0 0 0 
1-1V4a1 1 0 0 0-1-1H9.62l-.722-1.447A1 1 0 0 0 8.003 1zm1 2h3.383l.722 1.447A1 1 0 0 0 9.003 
5h3v4H8.62l-.722-1.447A1 1 0 0 0 7.003 7h-3z" 
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal"
 color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
+        <path d="M3.003 8h4l1 2h5V4h-4l-1-2h-5z"/>
+    </g>
+</svg>
diff --git a/gnome-help/C/figures/go-down-symbolic.svg b/gnome-help/C/figures/go-down-symbolic.svg
new file mode 100644
index 00000000..78ab0be7
--- /dev/null
+++ b/gnome-help/C/figures/go-down-symbolic.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16">
+    <g color="#000" fill="#474747">
+        <path d="M3.707 5.293L2.293 6.707 8 12.414l5.707-5.707-1.414-1.414L8 9.586z" 
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none"
 font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
+        <path d="M13 6V5h1v1zM2 6V5h1v1z" style="marker:none" overflow="visible"/>
+        <path d="M2 6c0-.554.446-1 1-1s1 .446 1 1-.446 1-1 1-1-.446-1-1zM12 6c0-.554.446-1 1-1s1 .446 1 
1-.446 1-1 1-1-.446-1-1z" style="marker:none" overflow="visible"/>
+    </g>
+</svg>
diff --git a/gnome-help/C/gnome-classic.page b/gnome-help/C/gnome-classic.page
index 6772df45..4c9a532a 100644
--- a/gnome-help/C/gnome-classic.page
+++ b/gnome-help/C/gnome-classic.page
@@ -7,6 +7,7 @@
 <!--    <link type="guide" xref="shell-overview#desktop" />-->
 
     <revision pkgversion="3.10.1" date="2013-10-28" status="review"/>
+    <revision pkgversion="3.29" date="2018-08-28" status="review"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -64,10 +65,10 @@
  of available workspaces. To switch to a different workspace, you can click
  the identifier and select the workspace you want to use from the menu.</p>
 
-<p>If an application or a system component wants to get your attention, it
+<!-- <p>If an application or a system component wants to get your attention, it
  will display a blue icon at the right-hand side of the window list. Clicking
  the blue icon shows the <link xref="shell-notifications">message tray</link>,
- which lets you access all your notifications.</p>
+ which lets you access all your notifications.</p> -->
 
 </section>
 
diff --git a/gnome-help/C/keyboard-cursor-blink.page b/gnome-help/C/keyboard-cursor-blink.page
index c118fd0c..c5fe9886 100644
--- a/gnome-help/C/keyboard-cursor-blink.page
+++ b/gnome-help/C/keyboard-cursor-blink.page
@@ -9,6 +9,7 @@
     <revision pkgversion="3.8.0" version="0.3" date="2013-03-13" status="candidate"/>
     <revision pkgversion="3.9.92" date="2013-10-11" status="candidate"/>
     <revision pkgversion="3.13.92" date="2013-09-22" status="candidate"/>
+    <revision pkgversion="3.29" date="2018-09-05" status="review"/>
 
     <credit type="author">
       <name>Shaun McCance</name>
@@ -44,11 +45,14 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Universal Access</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Universal Access</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Universal Access</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
       <p>Press <gui>Cursor Blinking</gui> in the <gui>Typing</gui> section.</p>
diff --git a/gnome-help/C/keyboard-key-super.page b/gnome-help/C/keyboard-key-super.page
index 8703c418..03bcdf9c 100644
--- a/gnome-help/C/keyboard-key-super.page
+++ b/gnome-help/C/keyboard-key-super.page
@@ -9,6 +9,7 @@
     <revision pkgversion="3.7.91" version="0.2" date="2013-03-16" status="outdated"/>
     <revision pkgversion="3.9.92" date="2013-09-23" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="candidate"/>
+    <revision pkgversion="3.29" date="2018-08-27" status="review"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -44,18 +45,21 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview, then
-      open the <app>Settings</app>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click <gui>Keyboard</gui>.</p>
+      <p>Click on <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click the <gui style="tab">Shortcuts</gui> tab.</p>
+      <p>Click <gui>Devices</gui> in the sidebar.</p>
     </item>
     <item>
-      <p>Select <gui>System</gui> on the left side of the window, and
-      <gui>Show the activities overview</gui> on the right.</p>
+      <p>Click <gui>Keyboard</gui> in the sidebar to open the panel.</p>
+    </item>
+    <item>
+      <p>In the <gui>System</gui> category, click the row with <gui>Show the
+      activities overview</gui>.</p>
     </item>
     <item>
       <p>Hold down the desired key combination.</p>
diff --git a/gnome-help/C/keyboard-layouts.page b/gnome-help/C/keyboard-layouts.page
index af8ba1b1..e070f186 100644
--- a/gnome-help/C/keyboard-layouts.page
+++ b/gnome-help/C/keyboard-layouts.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.8" version="0.3" date="2013-04-30" status="review"/>
     <revision pkgversion="3.10" date="2013-10-28" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="review"/>
+    <revision pkgversion="3.29" date="2018-08-20" status="review"/>
 
     <credit type="author copyright">
       <name>Shaun McCance</name>
@@ -51,11 +52,15 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Region &amp; Language</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Region &amp; Language</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Region &amp; Language</gui> in the sidebar to open the
+      panel.</p>
     </item>
     <item>
       <p>Click the <gui>+</gui> button in the <gui>Input Sources</gui> section,
@@ -70,11 +75,13 @@
     Click the <gui>Login Screen</gui> button at the top right to toggle between
     the two instances.</p>
 
-    <p>Some rarely used keyboard layout variants are not available by default when you click
-    the <gui>+</gui> button. To make also those input sources available you can open a terminal
-    window by pressing <keyseq><key>Ctrl</key><key>Alt</key><key>T</key></keyseq>
+    <p>Some rarely used keyboard layout variants are not available by default
+    when you click the <gui>+</gui> button. To make also those input sources
+    available you can open a terminal window by pressing
+    <keyseq><key>Ctrl</key><key>Alt</key><key>T</key></keyseq>
     and run this command:</p>
-    <p><cmd its:translate="no">gsettings set org.gnome.desktop.input-sources show-all-sources true</cmd></p>
+    <p><cmd its:translate="no">gsettings set org.gnome.desktop.input-sources
+    show-all-sources true</cmd></p>
   </note>
 
   <note style="sidebar">
@@ -85,12 +92,11 @@
 
   <p>Certain languages offer some extra configuration options. You can
   identify those languages because they have a
-  <gui><media its:translate="no" type="image" src="figures/system-run-symbolic.svg" width="16"
-  height="16"><span its:translate="yes">preview</span></media></gui> icon next to them. If you want to access
-  these extra parameters, select the language from the <gui>Input Source</gui>
-  list and a new
-  <gui style="button"><media its:translate="no" type="image" src="figures/emblem-system-symbolic.svg" 
width="16" height="16"><span its:translate="yes">preferences</span></media></gui> button will give you access
-  to the extra settings.</p>
+  <gui><media its:translate="no" type="image" src="figures/system-run-symbolic.svg" width="16" 
height="16"><span its:translate="yes">preview</span></media></gui>
+  icon next to them. If you want to access these extra parameters, select the
+  language from the <gui>Input Source</gui> list and a new
+  <gui style="button"><media its:translate="no" type="image" src="figures/emblem-system-symbolic.svg" 
width="16" height="16"><span its:translate="yes">preferences</span></media></gui>
+  button will give you access to the extra settings.</p>
 
   <p>When you use multiple layouts, you can choose to have all windows use the
   same layout or to set a different layout for each window. Using a different
@@ -100,12 +106,12 @@
   <gui style="button">Options</gui> button to select how you want to manage
   multiple layouts.</p>
 
-  <p>The top bar will display a short identifier for the current layout, such as
-  <gui>en</gui> for the standard English layout. Click the layout indicator and
-  select the layout you want to use from the menu. If the selected language has
-  any extra settings, they will be shown below the list of available layouts.
-  This gives you a quick overview of your settings. You can also open an image
-  with the current keyboard layout for reference.</p>
+  <p>The top bar will display a short identifier for the current layout, such
+  as <gui>en</gui> for the standard English layout. Click the layout indicator
+  and select the layout you want to use from the menu. If the selected language
+  has any extra settings, they will be shown below the list of available
+  layouts. This gives you a quick overview of your settings. You can also open
+  an image with the current keyboard layout for reference.</p>
 
   <p>The fastest way to change to another layout is by using the 
   <gui>Input Source</gui> <gui>Keyboard Shortcuts</gui>. These shortcuts open 
diff --git a/gnome-help/C/keyboard-nav.page b/gnome-help/C/keyboard-nav.page
index ca77149c..031fa422 100644
--- a/gnome-help/C/keyboard-nav.page
+++ b/gnome-help/C/keyboard-nav.page
@@ -9,6 +9,7 @@
     <revision pkgversion="3.7.5" version="0.2" date="2013-02-23" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="candidate"/>
     <revision pkgversion="3.20" date="2016-08-13" status="candidate"/>
+    <revision pkgversion="3.29" date="2018-08-27" status="review"/>
 
     <credit type="author">
       <name>Michael Hill</name>
@@ -57,7 +58,9 @@
 <table frame="top bottom" rules="rows">
   <title>Navigate user interfaces</title>
   <tr>
-    <td><p><key>Tab</key> and <keyseq><key>Ctrl</key><key>Tab</key></keyseq></p></td>
+    <td><p><key>Tab</key> and</p>
+    <p><keyseq><key>Ctrl</key><key>Tab</key></keyseq></p>
+    </td>
     <td>
       <p>Move keyboard focus between different controls. <keyseq><key>Ctrl</key>
       <key>Tab</key></keyseq> moves between groups of controls, such as from a
@@ -83,8 +86,8 @@
   <tr>
     <td><p><keyseq><key>Shift</key>Arrow keys</keyseq></p></td>
     <td><p>In a list or icon view, select all items from the currently selected
-    item to the newly focused item.</p></td>
-    <td><p>In a tree view, items that have children can be expanded or collapsed,
+    item to the newly focused item.</p>
+    <p>In a tree view, items that have children can be expanded or collapsed,
     to show or hide their children: expand by pressing
     <keyseq><key>Shift</key><key>→</key></keyseq>, and collapse by
     pressing <keyseq><key>Shift</key><key>←</key></keyseq>.</p></td>
@@ -121,8 +124,8 @@
     <td><p>Open the application menu on the top bar.</p></td>
   </tr>
   <tr>
-    <td><p><keyseq><key>Shift</key><key>F10</key></keyseq> or
-    <key xref="keyboard-key-menu">Menu</key></p></td>
+    <td><p><keyseq><key>Shift</key><key>F10</key></keyseq> or</p>
+    <p><key xref="keyboard-key-menu">Menu</key></p></td>
     <td>
       <p>Pop up the context menu for the current selection, as if you had
       right-clicked.</p>
@@ -134,8 +137,9 @@
     as if you had right-clicked on the background and not on any item.</p></td>
   </tr>
   <tr>
-    <td><p><keyseq><key>Ctrl</key><key>PageUp</key></keyseq> and
-    <keyseq><key>Ctrl</key><key>PageDown</key></keyseq></p></td>
+    <td><p><keyseq><key>Ctrl</key><key>PageUp</key></keyseq></p>
+    <p>and</p>
+    <p><keyseq><key>Ctrl</key><key>PageDown</key></keyseq></p></td>
     <td><p>In a tabbed interface, switch to the tab to the left or
     right.</p></td>
   </tr>
@@ -170,9 +174,9 @@
     <td><p>Cycle through all open windows on a workspace.</p></td>
   </tr>
   <tr>
-    <td><p><keyseq><key>Super</key><key>M</key></keyseq></p></td>
-    <td><p><link xref="shell-notifications#messagetray">Open the message
-    tray.</link> Press <key>Esc</key> to close.</p></td>
+    <td><p><keyseq><key>Super</key><key>V</key></keyseq></p></td>
+    <td><p><link xref="shell-notifications#notificationlist">Open the
+    notification list.</link> Press <key>Esc</key> to close.</p></td>
   </tr>
 </table>
 
@@ -206,13 +210,13 @@
   </tr>
   <include xmlns="http://www.w3.org/2001/XInclude";
            href="shell-keyboard-shortcuts.page"
-           xpointer="super-shift-updown"/>
+           xpointer="shift-super-updown"/>
   <include xmlns="http://www.w3.org/2001/XInclude";
            href="shell-keyboard-shortcuts.page"
-           xpointer="super-shift-left"/>
+           xpointer="shift-super-left"/>
   <include xmlns="http://www.w3.org/2001/XInclude";
            href="shell-keyboard-shortcuts.page"
-           xpointer="super-shift-right"/>
+           xpointer="shift-super-right"/>
   <tr>
     <td><p><keyseq><key>Alt</key><key>F10</key></keyseq> or
     <keyseq><key>Super</key><key>&#8593;</key></keyseq></p>
diff --git a/gnome-help/C/keyboard-osk.page b/gnome-help/C/keyboard-osk.page
index 7f2f2201..3dfdaf5e 100644
--- a/gnome-help/C/keyboard-osk.page
+++ b/gnome-help/C/keyboard-osk.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.8.0" version="0.3" date="2013-03-13" status="outdated"/>
     <revision pkgversion="3.10" date="2013-10-28" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="review"/>
+    <revision pkgversion="3.29" date="2018-09-05" status="review"/>
 
     <credit type="author">
       <name>Jeremy Bicha</name>
@@ -46,11 +47,14 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Universal Access</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Universal Access</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Universal Access</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
       <p>Switch on <gui>Screen Keyboard</gui> in the <gui>Typing</gui>
@@ -61,17 +65,22 @@
   <p>When you next have the opportunity to type, the on-screen keyboard will
   open at the bottom of the screen.</p>
 
-  <p>Press the <gui style="button">123</gui> button to enter numbers and
+  <p>Press the <gui style="button">?123</gui> button to enter numbers and
   symbols. More symbols are available if you then press the
-  <gui style="button">{#*</gui> button. To return to the alphabet keyboard,
-  press the <gui style="button">Abc</gui> button.</p>
+  <gui style="button">=/&lt;</gui> button. To return to the alphabet keyboard,
+  press the <gui style="button">ABC</gui> button.</p>
 
   <p>You can press the
-  <gui style="button"><media its:translate="no" type="image" src="figures/input-keyboard-symbolic.png" 
width="16" height="16"><span its:translate="yes">keyboard</span></media></gui>
-  icon to hide the keyboard temporarily. The keyboard will show again
-  automatically when you next press on something where you can use it. To make
-  the keyboard show again, open the <link xref="shell-notifications">message
-  tray</link> (by moving your mouse to the bottom of the screen), and press the
-  keyboard icon.</p>
+  <gui style="button"><media its:translate="no" type="image" src="figures/go-down-symbolic.svg" width="16" 
height="16"><span its:translate="yes">down</span></media></gui>
+  button to hide the keyboard temporarily. The keyboard will show again
+  automatically when you next press on something where you can use it.</p>
+  <p>Press the
+  <gui style="button"><media its:translate="no" type="image" src="figures/emoji-flags-symbolic.svg" 
width="16" height="16"><span its:translate="yes">flag</span></media></gui>
+  button to change your settings for
+  <link xref="session-language">Language</link> or
+  <link xref="keyboard-layouts">Input Sources</link>.</p>
+  <!-- obsolete <p>To make the keyboard show again, open the
+  <link xref="shell-notifications">messagetray</link> (by moving your mouse to
+  the bottom of the screen), and press the keyboard icon.</p> -->
 
 </page>
diff --git a/gnome-help/C/keyboard-repeat-keys.page b/gnome-help/C/keyboard-repeat-keys.page
index b7fa6b97..d35c2a75 100644
--- a/gnome-help/C/keyboard-repeat-keys.page
+++ b/gnome-help/C/keyboard-repeat-keys.page
@@ -9,6 +9,7 @@
     <revision pkgversion="3.8.0" version="0.3" date="2013-03-13" status="candidate"/>
     <revision pkgversion="3.9.92" date="2013-10-11" status="candidate"/>
     <revision pkgversion="3.13.92" date="2013-10-11" status="candidate"/>
+    <revision pkgversion="3.29" date="2018-09-05" status="review"/>
 
     <credit type="author">
       <name>Shaun McCance</name>
@@ -47,11 +48,14 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Universal Access</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Universal Access</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Universal Access</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
      <p>Press <gui>Repeat Keys</gui> in the <gui>Typing</gui> section.</p>
diff --git a/gnome-help/C/keyboard-shortcuts-set.page b/gnome-help/C/keyboard-shortcuts-set.page
index ad7cc6ec..c6c0935d 100644
--- a/gnome-help/C/keyboard-shortcuts-set.page
+++ b/gnome-help/C/keyboard-shortcuts-set.page
@@ -12,6 +12,7 @@
     <revision pkgversion="3.9.92" date="2013-10-11" status="candidate"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="candidate"/>
     <revision pkgversion="3.17.90" date="2015-08-30" status="candidate"/>
+    <revision pkgversion="3.29" date="2018-08-27" status="review"/>
 
     <credit type="author">
       <name>Michael Hill</name>
@@ -59,19 +60,21 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Keyboard</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Keyboard</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Select the <gui>Shortcuts</gui> tab.</p>
+      <p>Click <gui>Devices</gui> in the sidebar.</p>
     </item>
     <item>
-      <p>Select a category in the left pane, and the row for the desired action
-      on the right. The current shortcut definition will change to
-      <gui>New accelerator…</gui></p>
+      <p>Click <gui>Keyboard</gui> in the sidebar to open the panel.</p>
+    </item>
+    <item>
+      <p>Click the row for the desired action. The <gui>Set shortcut</gui>
+      window will be shown.</p>
     </item>
     <item>
       <p>Hold down the desired key combination, or press <key>Backspace</key> to
@@ -88,8 +91,8 @@
 <table rules="rows" frame="top bottom" ui:expanded="false">
 <title>Launchers</title>
   <tr>
-       <td><p>Launch help browser</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Home folder</p></td>
+       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-folder.svg"> 
<key>Explorer</key> key symbol</media> or <media its:translate="no" type="image" mime="image/svg" 
src="figures/keyboard-key-computer.svg"> <key>Explorer</key> key symbol</media> or 
<key>Explorer</key></p></td>
   </tr>
   <tr>
        <td><p>Launch calculator</p></td>
@@ -100,49 +103,53 @@
        <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-mail.svg"> 
<key>Mail</key> key symbol</media> or <key>Mail</key></p></td>
   </tr>
   <tr>
-       <td><p>Launch web browser</p></td>
-       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-world.svg"> 
<key>WWW</key> key symbol</media> or <media its:translate="no" type="image" mime="image/svg" 
src="figures/keyboard-key-home.svg"> <key>WWW</key> key symbol</media> or <key>WWW</key></p></td>
+       <td><p>Launch help browser</p></td>
+       <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Home folder</p></td>
-       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-folder.svg"> 
<key>Explorer</key> key symbol</media> or <media its:translate="no" type="image" mime="image/svg" 
src="figures/keyboard-key-computer.svg"> <key>Explorer</key> key symbol</media> or 
<key>Explorer</key></p></td>
+       <td><p>Launch web browser</p></td>
+       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-world.svg"> 
<key>WWW</key> key symbol</media> or <media its:translate="no" type="image" mime="image/svg" 
src="figures/keyboard-key-home.svg"> <key>WWW</key> key symbol</media> or <key>WWW</key></p></td>
   </tr>
   <tr>
        <td><p>Search</p></td>
        <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-search.svg"> 
<key>Search</key> key symbol</media> or <key>Search</key></p></td>
   </tr>
+  <tr>
+       <td><p>Settings</p></td>
+       <td><p><key>Tools</key></p></td>
+  </tr>
+
 </table>
 
 <table rules="rows" frame="top bottom" ui:expanded="false">
 <title>Navigation</title>
   <tr>
-       <td><p>Move window to workspace 1</p></td>
+       <td><p>Hide all normal windows</p></td>
        <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Move window to workspace 2</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Move to workspace above</p></td>
+       <td><p><keyseq><key>Super</key><key>Page Up</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Move window to workspace 3</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Move to workspace below</p></td>
+       <td><p><keyseq><key>Super</key><key>Page Down</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Move window to workspace 4</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Move window one monitor down</p></td>
+       <td><p><keyseq><key>Shift</key><key 
xref="keyboard-key-super">Super</key><key>&#8595;</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Move window one workspace to the left</p></td>
-       <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>Alt</key><key>&#8592;</key></keyseq></p></td>
+       <td><p>Move window one monitor to the left</p></td>
+       <td><p><keyseq><key>Shift</key><key>Super</key><key>&#8592;</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Move window one workspace to the right</p></td>
-       <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>Alt</key><key>&#8594;</key></keyseq></p></td>
+       <td><p>Move window one monitor to the right</p></td>
+       <td><p><keyseq><key>Shift</key><key>Super</key><key>&#8594;</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Move window one workspace up</p></td>
-       <td><p><keyseq><key>Shift</key><key xref="keyboard-key-super">Super</key>
-  <key>Page Up</key></keyseq></p></td>
+       <td><p>Move window one monitor up</p></td>
+       <td><p><keyseq><key>Shift</key><key>Super</key><key>&#8593;</key></keyseq></p></td>
   </tr>
   <tr>
        <td><p>Move window one workspace down</p></td>
@@ -150,40 +157,51 @@
   </p></td>
   </tr>
   <tr>
-       <td><p>Switch applications</p></td>
-       <td><p><keyseq><key>Super</key><key>Tab</key></keyseq></p></td>
+       <td><p>Move window one workspace up</p></td>
+       <td><p><keyseq><key>Shift</key><key>Super</key>
+  <key>Page Up</key></keyseq></p></td>
   </tr>
   <tr>
-  <td><p>Switch windows</p></td>
-  <td><p>Disabled</p></td>
+       <td><p>Move window to last workspace</p></td>
+       <td><p><keyseq><key>Shift</key><key>Super</key><key>End</key></keyseq>
+  </p></td>
   </tr>
   <tr>
-       <td><p>Switch windows of an application</p></td>
+       <td><p>Move window to workspace 1</p></td>
+       <td><p><keyseq><key>Shift</key><key>Super</key><key>Home</key></keyseq>
+  </p></td>
+  </tr>
+  <tr>
+       <td><p>Move window to workspace 2</p></td>
        <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Switch system controls</p></td>
-       <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>Tab</key></keyseq></p></td>
+       <td><p>Move window to workspace 3</p></td>
+       <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Switch windows directly</p></td>
-       <td><p><keyseq><key>Alt</key><key>Esc</key></keyseq></p></td>
+       <td><p>Move window to workspace 4</p></td>
+       <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Switch windows of an app directly</p></td>
-       <td><p><keyseq><key>Alt</key><key>F6</key></keyseq></p></td>
+       <td><p>Switch applications</p></td>
+       <td><p><keyseq><key>Super</key><key>Tab</key></keyseq></p></td>
+  </tr>
+  <tr>
+       <td><p>Switch system controls</p></td>
+       <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>Tab</key></keyseq></p></td>
   </tr>
   <tr>
        <td><p>Switch system controls directly</p></td>
        <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>Esc</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Hide all normal windows</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Switch to last workspace</p></td>
+       <td><p><keyseq><key>Super</key><key>End</key></keyseq></p></td>
   </tr>
   <tr>
        <td><p>Switch to workspace 1</p></td>
-       <td><p>Disabled</p></td>
+       <td><p><keyseq><key>Super</key><key>Home</key></keyseq></p></td>
   </tr>
   <tr>
        <td><p>Switch to workspace 2</p></td>
@@ -198,133 +216,140 @@
        <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Move to workspace left</p></td>
-       <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>&#8592;</key></keyseq></p></td>
+        <td><p>Switch windows</p></td>
+        <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Move to workspace right</p></td>
-       <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>&#8594;</key></keyseq></p></td>
+       <td><p>Switch windows directly</p></td>
+       <td><p><keyseq><key>Alt</key><key>Esc</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Move to workspace above</p></td>
-       <td><p><keyseq><key>Super</key><key>Page Up</key></keyseq></p></td>
+       <td><p>Switch windows of an app directly</p></td>
+       <td><p><keyseq><key>Alt</key><key>F6</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Move to workspace below</p></td>
-       <td><p><keyseq><key>Super</key><key>Page Down</key></keyseq></p></td>
+       <td><p>Switch windows of an application</p></td>
+       <td><p>Disabled</p></td>
   </tr>
 </table>
 
 <table rules="rows" frame="top bottom" ui:expanded="false">
 <title>Screenshots</title>
   <tr>
-       <td><p>Save a screenshot to file</p></td>
-       <td><p><key>Print</key></p></td>
-  </tr>
-  <tr>
-       <td><p>Save a screenshot of a window to file</p></td>
-       <td><p><keyseq><key>Alt</key><key>Print</key></keyseq></p></td>
+       <td><p>Copy a screenshot of a window to clipboard</p></td>
+       <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>Print</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Save a screenshot of an area to file</p></td>
-       <td><p><keyseq><key>Shift</key><key>Print</key></keyseq></p></td>
+       <td><p>Copy a screenshot of an area to clipboard</p></td>
+       <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>Print</key></keyseq></p></td>
   </tr>
   <tr>
        <td><p>Copy a screenshot to clipboard</p></td>
        <td><p><keyseq><key>Ctrl</key><key>Print</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Copy a screenshot of a window to clipboard</p></td>
-       <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>Print</key></keyseq></p></td>
+        <td><p>Record a short screencast</p></td>
+        <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>Alt</key><key>R</key>
+        </keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Copy a screenshot of an area to clipboard</p></td>
-       <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>Print</key></keyseq></p></td>
+       <td><p>Save a screenshot of a window to Pictures</p></td>
+       <td><p><keyseq><key>Alt</key><key>Print</key></keyseq></p></td>
+  </tr>
+  <tr>
+       <td><p>Save a screenshot of an area to Pictures</p></td>
+       <td><p><keyseq><key>Shift</key><key>Print</key></keyseq></p></td>
   </tr>
   <tr>
-  <td><p>Record a screencast</p></td>
-  <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>Alt</key><key>R</key>
-  </keyseq></p></td>
+       <td><p>Save a screenshot to Pictures</p></td>
+       <td><p><key>Print</key></p></td>
   </tr>
 </table>
 
 <table rules="rows" frame="top bottom" ui:expanded="false">
 <title>Sound and Media</title>
   <tr>
-       <td><p>Volume mute</p></td>
-       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-mute.svg"> 
<key>Mute</key> key symbol</media> (Audio mute)</p></td>
-  </tr>
-  <tr>
-       <td><p>Volume down</p></td>
-       <td><p><media its:translate="no" type="image" mime="image/svg" 
src="figures/keyboard-key-voldown.svg"> <key>Volume Down</key> key symbol</media> (Audio lower 
volume)</p></td>
-  </tr>
-  <tr>
-       <td><p>Volume up</p></td>
-       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-volup.svg"> 
<key>Volume Up</key> key symbol</media> (Audio raise volume)</p></td>
+       <td><p>Eject</p></td>
+       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-eject.svg"> 
<key>Eject</key> key symbol</media> (Eject)</p></td>
   </tr>
   <tr>
        <td><p>Launch media player</p></td>
        <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-media.svg"> 
<key>Media</key> key symbol</media> (Audio media)</p></td>
   </tr>
+  <tr>
+       <td><p>Next track</p></td>
+       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-next.svg"> 
<key>Next</key> key symbol</media> (Audio next)</p></td>
+  </tr>  <tr>
+       <td><p>Pause playback</p></td>
+       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-pause.svg"> 
<key>Pause</key> key symbol</media> (Audio pause)</p></td>
+  </tr>
   <tr>
        <td><p>Play (or play/pause)</p></td>
        <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-play.svg"> 
<key>Play</key> key symbol</media> (Audio play)</p></td>
   </tr>
   <tr>
-       <td><p>Pause playback</p></td>
-       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-pause.svg"> 
<key>Pause</key> key symbol</media> (Audio pause)</p></td>
+       <td><p>Previous track</p></td>
+       <td><p><media its:translate="no" type="image" mime="image/svg" 
src="figures/keyboard-key-previous.svg"> <key>Previous</key> key symbol</media> (Audio previous)</p></td>
   </tr>
   <tr>
        <td><p>Stop playback</p></td>
        <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-stop.svg"> 
<key>Stop</key> key symbol</media> (Audio stop)</p></td>
   </tr>
   <tr>
-       <td><p>Previous track</p></td>
-       <td><p><media its:translate="no" type="image" mime="image/svg" 
src="figures/keyboard-key-previous.svg"> <key>Previous</key> key symbol</media> (Audio previous)</p></td>
+       <td><p>Volume down</p></td>
+       <td><p><media its:translate="no" type="image" mime="image/svg" 
src="figures/keyboard-key-voldown.svg"> <key>Volume Down</key> key symbol</media> (Audio lower 
volume)</p></td>
   </tr>
   <tr>
-       <td><p>Next track</p></td>
-       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-next.svg"> 
<key>Next</key> key symbol</media> (Audio next)</p></td>
+       <td><p>Volume mute</p></td>
+       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-mute.svg"> 
<key>Mute</key> key symbol</media> (Audio mute)</p></td>
   </tr>
   <tr>
-       <td><p>Eject</p></td>
-       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-eject.svg"> 
<key>Eject</key> key symbol</media> (Eject)</p></td>
+       <td><p>Volume up</p></td>
+       <td><p><media its:translate="no" type="image" mime="image/svg" src="figures/keyboard-key-volup.svg"> 
<key>Volume Up</key> key symbol</media> (Audio raise volume)</p></td>
   </tr>
 </table>
 
 <table rules="rows" frame="top bottom" ui:expanded="false">
 <title>System</title>
   <tr>
-       <td><p>Show the run command prompt</p></td>
-       <td><p><keyseq><key>Alt</key><key>F2</key></keyseq></p></td>
+        <td><p>Focus the active notification</p></td>
+        <td><p><keyseq><key>Super</key><key>N</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Show the activities overview</p></td>
-       <td><p><keyseq><key>Alt</key><key>F1</key></keyseq></p></td>
+       <td><p>Lock screen</p></td>
+       <td><p><keyseq><key>Super</key><key>L</key></keyseq></p></td>
   </tr>
   <tr>
        <td><p>Log out</p></td>
        <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>Delete</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Lock screen</p></td>
-       <td><p><keyseq><key>Super</key><key>L</key></keyseq></p></td>
+        <td><p>Open the application menu</p></td>
+        <td><p><keyseq><key>Super</key><key>F10</key></keyseq></p></td>
+  </tr>
+  <tr>
+        <td><p>Restore the keyboard shortcuts</p></td>
+        <td><p><keyseq><key>Super</key><key>Esc</key></keyseq></p></td>
+  </tr>
+  <tr>
+        <td><p>Show all applications</p></td>
+        <td><p><keyseq><key>Super</key><key>A</key></keyseq></p></td>
   </tr>
   <tr>
-  <td><p>Show the message tray</p></td>
-  <td><p><keyseq><key>Super</key><key>M</key></keyseq></p></td>
+       <td><p>Show the activities overview</p></td>
+       <td><p><keyseq><key>Alt</key><key>F1</key></keyseq></p></td>
   </tr>
   <tr>
-  <td><p>Focus the active notification</p></td>
-  <td><p><keyseq><key>Super</key><key>N</key></keyseq></p></td>
+       <td><p>Show the notification list</p></td>
+       <td><p><keyseq><key>Super</key><key>V</key></keyseq></p></td>
   </tr>
   <tr>
-  <td><p>Show all applications</p></td>
-  <td><p><keyseq><key>Super</key><key>A</key></keyseq></p></td>
+       <td><p>Show the overview</p></td>
+       <td><p><keyseq><key>Super</key><key>S</key></keyseq></p></td>
   </tr>
   <tr>
-  <td><p>Open the application menu</p></td>
-  <td><p><keyseq><key>Super</key><key>F10</key></keyseq></p></td>
+       <td><p>Show the run command prompt</p></td>
+       <td><p><keyseq><key>Alt</key><key>F2</key></keyseq></p></td>
   </tr>
 </table>
 
@@ -337,38 +362,22 @@
 
   <tr>
   <td><p>Switch to previous input source</p></td>
-  <td><p>Disabled</p></td>
-  </tr>
-  <tr>
-  <td><p>Modifiers-only switch to next source</p></td>
-  <td><p>Disabled</p></td>
-  </tr>
-  <tr>
-  <td><p>Compose Key</p></td>
-  <td><p>Disabled</p></td>
-  </tr>
-  <tr>
-  <td><p>Alternative Characters Key</p></td>
-  <td><p>Disabled</p></td>
+  <td><p><keyseq><key>Shift</key><key>Super</key><key>Space</key></keyseq></p></td>
   </tr>
 </table>
 
 <table rules="rows" frame="top bottom" ui:expanded="false">
 <title>Universal Access</title>
   <tr>
-       <td><p>Turn zoom on or off</p></td>
-       <td><p><keyseq><key>Alt</key><key>Super</key><key>8</key></keyseq></p></td>
-  </tr>
-  <tr>
-       <td><p>Zoom in</p></td>
-  <td><p><keyseq><key>Alt</key><key>Super</key><key>=</key></keyseq></p></td>
+       <td><p>Decrease text size</p></td>
+       <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Zoom out</p></td>
-  <td><p><keyseq><key>Alt</key><key>Super</key><key>-</key></keyseq></p></td>
+       <td><p>High contrast on or off</p></td>
+       <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Turn screen reader on or off</p></td>
+       <td><p>Increase text size</p></td>
        <td><p>Disabled</p></td>
   </tr>
   <tr>
@@ -376,16 +385,20 @@
        <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Increase text size</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Turn screen reader on or off</p></td>
+       <td><p><keyseq><key>Alt</key><key>Super</key><key>S</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Decrease text size</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Turn zoom on or off</p></td>
+       <td><p><keyseq><key>Alt</key><key>Super</key><key>8</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>High contrast on or off</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Zoom in</p></td>
+  <td><p><keyseq><key>Alt</key><key>Super</key><key>=</key></keyseq></p></td>
+  </tr>
+  <tr>
+       <td><p>Zoom out</p></td>
+  <td><p><keyseq><key>Alt</key><key>Super</key><key>-</key></keyseq></p></td>
   </tr>
 </table>
 
@@ -396,43 +409,35 @@
        <td><p><keyseq><key>Alt</key><key>Space</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Toggle fullscreen mode</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Close window</p></td>
+       <td><p><keyseq><key>Alt</key><key>F4</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Toggle maximization state</p></td>
-       <td><p><keyseq><key>Alt</key><key>F10</key></keyseq></p></td>
+        <td><p>Hide window</p></td>
+        <td><p><keyseq><key>Super</key><key>H</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Maximize window</p></td>
-       <td><p><keyseq><key>Super</key><key>&#8593;</key></keyseq></p></td>
+       <td><p>Lower window below other windows</p></td>
+       <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Restore window</p></td>
-  <td><p><keyseq><key>Super</key><key>&#8595;</key></keyseq></p></td>
+       <td><p>Maximize window</p></td>
+       <td><p><keyseq><key>Super</key><key>&#8593;</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Toggle shaded state</p></td>
+       <td><p>Maximize window horizontally</p></td>
        <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Close window</p></td>
-       <td><p><keyseq><key>Alt</key><key>F4</key></keyseq></p></td>
-  </tr>
-  <tr>
-  <td><p>Hide window</p></td>
-  <td><p><keyseq><key>Super</key><key>H</key></keyseq></p></td>
+       <td><p>Maximize window vertically</p></td>
+       <td><p>Disabled</p></td>
   </tr>
   <tr>
        <td><p>Move window</p></td>
        <td><p><keyseq><key>Alt</key><key>F7</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Resize window</p></td>
-       <td><p><keyseq><key>Alt</key><key>F8</key></keyseq></p></td>
-  </tr>
-  <tr>
-       <td><p>Toggle window on all workspaces or one</p></td>
+       <td><p>Raise window above other windows</p></td>
        <td><p>Disabled</p></td>
   </tr>
   <tr>
@@ -440,28 +445,32 @@
        <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Raise window above other windows</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Resize window</p></td>
+       <td><p><keyseq><key>Alt</key><key>F8</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Lower window below other windows</p></td>
-       <td><p>Disabled</p></td>
+       <td><p>Restore window</p></td>
+        <td><p><keyseq><key>Super</key><key>&#8595;</key></keyseq></p></td>
   </tr>
   <tr>
-       <td><p>Maximize window vertically</p></td>
+       <td><p>Toggle fullscreen mode</p></td>
        <td><p>Disabled</p></td>
   </tr>
   <tr>
-       <td><p>Maximize window horizontally</p></td>
+       <td><p>Toggle maximization state</p></td>
+       <td><p><keyseq><key>Alt</key><key>F10</key></keyseq></p></td>
+  </tr>
+  <tr>
+       <td><p>Toggle window on all workspaces or one</p></td>
        <td><p>Disabled</p></td>
   </tr>
   <tr>
-  <td><p>View split on left</p></td>
-  <td><p><keyseq><key>Super</key><key>&#8592;</key></keyseq></p></td>
+        <td><p>View split on left</p></td>
+        <td><p><keyseq><key>Super</key><key>&#8592;</key></keyseq></p></td>
   </tr>
   <tr>
-  <td><p>View split on right</p></td>
-  <td><p><keyseq><key>Super</key><key>&#8594;</key></keyseq></p></td>
+        <td><p>View split on right</p></td>
+        <td><p><keyseq><key>Super</key><key>&#8594;</key></keyseq></p></td>
   </tr>
 </table>
 
@@ -475,7 +484,7 @@
 
   <steps>
     <item>
-      <p>Click the <gui style="button">+</gui> button. The <gui>Custom
+      <p>Click the <gui style="button">+</gui> button. The <gui>Add Custom
       Shortcut</gui> window will appear.</p>
     </item>
     <item>
@@ -486,9 +495,9 @@
       command.</p>
     </item>
     <item>
-      <p>Click <gui>Disabled</gui> in the row that was just added. When it
-      changes to <gui>New accelerator…</gui>, hold down the desired shortcut
-      key combination.</p>
+      <p>Click the row that was just added. When the
+      <gui>Set Custom Shortcut</gui> window opens, hold down the desired
+      shortcut key combination.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/mouse-doubleclick.page b/gnome-help/C/mouse-doubleclick.page
index f6a1a2c4..6a029a31 100644
--- a/gnome-help/C/mouse-doubleclick.page
+++ b/gnome-help/C/mouse-doubleclick.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.9" date="2013-10-16" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
     <revision pkgversion="3.20" date="20156-06-15" status="final"/>
+    <revision pkgversion="3.29" date="2018-08-20" status="review"/>
 
     <credit type="author">
       <name>Phil Bull</name>
@@ -30,33 +31,43 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Control how quickly you need to press the mouse button
-    a second time to double-click.</desc>
+    <desc>Control how quickly you need to press the mouse button a second time
+    to double-click.</desc>
   </info>
 
-<title>Adjust the double-click speed</title>
-
-<p>Double-clicking only happens when you press the mouse button twice
-quickly enough. If the second press is too long after the first, you’ll
-just get two separate clicks, not a double click. If you have difficulty
-pressing the mouse button quickly, you should increase the timeout.</p>
-
-<steps>
-  <item><p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-  start typing <gui>Universal Access</gui>.</p></item>
-  <item><p>Click on <gui>Universal Access</gui> to open the panel.</p></item>
-  <item><p>Under <gui>Pointing &amp; Clicking</gui>, adjust the <gui>Double-click</gui>
-  slider to a value you find comfortable.</p></item>
-</steps>
-
-<p>If your mouse double-clicks when you want it to single-click
-even though you have increased the double-click timeout,
-your mouse may be faulty. Try plugging a different mouse into your computer
-and see if that works properly. Alternatively, plug your mouse into a
-different computer and see if it still has the same problem.
-</p>
-
-<note><p>This setting will affect both your mouse and touchpad,
-as well as any other pointing device.</p></note>
+  <title>Adjust the double-click speed</title>
+
+  <p>Double-clicking only happens when you press the mouse button twice
+  quickly enough. If the second press is too long after the first, you’ll
+  just get two separate clicks, not a double click. If you have difficulty
+  pressing the mouse button quickly, you should increase the timeout.</p>
+
+  <steps>
+    <item>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Universal Access</gui> in the sidebar to open the panel.</p>
+    </item>
+    <item>
+      <p>Under <gui>Pointing &amp; Clicking</gui>, adjust the
+      <gui>Double-Click Delay</gui> slider to a value you find comfortable.</p>
+    </item>
+  </steps>
+
+  <p>If your mouse double-clicks when you want it to single-click even though
+  you have increased the double-click timeout, your mouse may be faulty. Try
+  plugging a different mouse into your computer and see if that works properly.
+  Alternatively, plug your mouse into a different computer and see if it still
+  has the same problem.</p>
+
+  <note>
+    <p>This setting will affect both your mouse and touchpad, as well as any
+    other pointing device.</p>
+  </note>
 
 </page>
diff --git a/gnome-help/C/mouse-lefthanded.page b/gnome-help/C/mouse-lefthanded.page
index 86806949..068b6b1b 100644
--- a/gnome-help/C/mouse-lefthanded.page
+++ b/gnome-help/C/mouse-lefthanded.page
@@ -9,6 +9,7 @@
     <revision pkgversion="3.8" date="2013-03-13" status="candidate"/>
     <revision pkgversion="3.10" date="2013-10-29" status="candidate"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.29" date="2018-08-21" status="review"/>
 
     <credit type="author">
       <name>Phil Bull</name>
@@ -39,15 +40,21 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Mouse &amp; Touchpad</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Mouse &amp; Touchpad</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>In the <gui>General</gui> section, switch <gui>Primary button</gui>
-      to <gui>Right</gui>.</p>
+      <p>Click <gui>Devices</gui> in the sidebar.</p>
+    </item>
+    <item>
+      <p>Click <gui>Mouse &amp; Touchpad</gui> in the sidebar to open the panel.</p>
+    </item>
+    <item>
+      <p>In the <gui>General</gui> section, click to switch
+      <gui>Primary button</gui> to <gui>Right</gui>.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/mouse-mousekeys.page b/gnome-help/C/mouse-mousekeys.page
index 13859605..4eb08032 100644
--- a/gnome-help/C/mouse-mousekeys.page
+++ b/gnome-help/C/mouse-mousekeys.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.8" date="2013-03-16" status="outdated"/>
     <revision pkgversion="3.10" date="2013-11-07" status="review"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.29" date="2018-08-20" status="review"/>
 
     <credit type="author">
       <name>Phil Bull</name>
@@ -35,7 +36,7 @@
     keypad.</desc>
   </info>
 
-  <title>Click and move mouse pointer using the keypad</title>
+  <title>Click and move the mouse pointer using the keypad</title>
 
   <p>If you have difficulties using a mouse or other pointing device, you can
   control the mouse pointer using the numeric keypad on your keyboard. This
@@ -43,21 +44,24 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Universal Access</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
       <p>You can access the <gui>Activities</gui> overview by pressing on it,
       by moving your mouse pointer against the top-left corner of the screen,
-      using <keyseq><key>Ctrl</key><key>Alt</key><key>Tab</key></keyseq>
-      followed by <key>Enter</key> or using
-      <key xref="keyboard-key-super">Super</key>.</p>
+      by using <keyseq><key>Ctrl</key><key>Alt</key><key>Tab</key></keyseq>
+      followed by <key>Enter</key>, or by using the
+      <key xref="keyboard-key-super">Super</key> key.</p>
     </item>
     <item>
-      <p>Click on <gui>Universal Access</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Universal Access</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
       <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>
+      <gui>Pointing &amp; Clicking</gui> section, then press <key>Enter</key>
+      to switch <gui>Mouse Keys</gui> to <gui>ON</gui>.</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-sensitivity.page b/gnome-help/C/mouse-sensitivity.page
index d74c1d63..d9d7b6d1 100644
--- a/gnome-help/C/mouse-sensitivity.page
+++ b/gnome-help/C/mouse-sensitivity.page
@@ -4,12 +4,13 @@
       id="mouse-sensitivity">
 
   <info>
-    <link type="guide" xref="mouse"/>
+    <link type="guide" xref="mouse" group="#first"/>
     <link type="guide" xref="a11y#mobility" group="pointing"/>
 
     <revision pkgversion="3.8" date="2013-03-13" status="candidate"/>
     <revision pkgversion="3.10" date="2013-10-29" status="review"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.29" date="2018-08-05" status="review"/>
 
     <credit type="author">
       <name>Phil Bull</name>
@@ -34,35 +35,37 @@
     touchpad.</desc>
   </info>
 
-  <title>Adjust speed of the mouse and touchpad</title>
+  <title>Adjust the speed of the mouse and touchpad</title>
 
   <p>If your pointer moves too fast or slow when you move your mouse or use
   your touchpad, you can adjust the pointer speed for these devices.</p>
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Mouse &amp; Touchpad</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Mouse &amp; Touchpad</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Adjust the <gui>Pointer Speed</gui> slider until the pointer motion
-      is comfortable for you. You will see one slider per each pointing device,
-      such as mouse or touchpad.</p>
+      <p>Click <gui>Devices</gui> in the sidebar.</p>
+    </item>
+    <item>
+      <p>Click <gui>Mouse &amp; Touchpad</gui> in the sidebar to open the panel.</p>
+    </item>
+    <item>
+      <p>Adjust the <gui>Mouse Speed</gui> or <gui>Touchpad Speed</gui> slider
+      until the pointer motion is comfortable for you. Sometimes the most
+      comfortable settings for one type of device are not the best for
+      the other.</p>
     </item>
   </steps>
 
-  <p>You can set different pointer speed for each type of device. For example,
-  you can have one scroll speed for a laptop touchpad and another for a mouse.
-  Sometimes the most comfortable settings for one type of device are not the
-  best for another.</p>
-
   <note>
     <p>The <gui>Touchpad</gui> section only appears if your system has a
     touchpad, while the <gui>Mouse</gui> section is only visible when a mouse
-    is plugged in.</p>
+    is connected.</p>
   </note>
 
 </page>
diff --git a/gnome-help/C/mouse-touchpad-click.page b/gnome-help/C/mouse-touchpad-click.page
index 9156292b..eacbba59 100644
--- a/gnome-help/C/mouse-touchpad-click.page
+++ b/gnome-help/C/mouse-touchpad-click.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.7" date="2012-11-16" status="outdated"/>
     <revision pkgversion="3.10" date="2013-10-29" status="review"/>
     <revision pkgversion="3.18" date="2015-09-28" status="final"/>
+    <revision pkgversion="3.29" date="2018-08-20" status="review"/>
 
     <credit type="author">
       <name>Shaun McCance</name>
@@ -43,19 +44,29 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Mouse &amp; Touchpad</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Mouse &amp; Touchpad</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>In the <gui>Touchpad</gui> section, check <gui>Tap to click</gui>.</p>
+      <p>Click <gui>Devices</gui> in the sidebar.</p>
+    </item>
+    <item>
+      <p>Click <gui>Mouse &amp; Touchpad</gui> in the sidebar 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>
       <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>
+    </item>
   </steps>
 
   <list>
@@ -98,15 +109,24 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Mouse &amp; Touchpad</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Devices</gui> in the sidebar.</p>
+    </item>
+    <item>
+      <p>Click <gui>Mouse &amp; Touchpad</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
-      <p>Click on <gui>Mouse &amp; Touchpad</gui> to open the panel.</p>
+      <p>In the <gui>Touchpad</gui> section, make sure <gui>Touchpad</gui> is
+      set to <gui>ON</gui>.</p>
     </item>
     <item>
-      <p>In the <gui>Touchpad</gui> section, check <gui>Two finger
-      scroll</gui>.</p>
+      <p>Set <gui>Two-finger Scrolling</gui> to <gui>ON</gui>.</p>
     </item>
   </steps>
 
@@ -130,16 +150,25 @@
   touchpad.</p>
 
   <steps>
+   <item>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Devices</gui> in the sidebar.</p>
+    </item>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Mouse &amp; Touchpad</gui>.</p>
+      <p>Click <gui>Mouse &amp; Touchpad</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
-      <p>Click on <gui>Mouse &amp; Touchpad</gui> to open the panel.</p>
+      <p>In the <gui>Touchpad</gui> section, make sure <gui>Touchpad</gui> is
+      set to <gui>ON</gui>.</p>
     </item>
     <item>
-      <p>In the <gui>Touchpad</gui> section, check <gui>Natural
-      scrolling</gui>.</p>
+      <p>Set <gui>Natural Scrolling</gui> to <gui>ON</gui>.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/mouse.page b/gnome-help/C/mouse.page
index abdb9ac4..0251f7d5 100644
--- a/gnome-help/C/mouse.page
+++ b/gnome-help/C/mouse.page
@@ -28,7 +28,7 @@
     </desc>
   </info>
 
-<title>Mouse</title>
+<title>Mouse &amp; Touchpad</title>
 <links type="topic" style="2column"/>
 
 <comment>
diff --git a/gnome-help/C/prefs.page b/gnome-help/C/prefs.page
index defb1719..5b984eb5 100644
--- a/gnome-help/C/prefs.page
+++ b/gnome-help/C/prefs.page
@@ -13,7 +13,7 @@
 
     <desc>
       <link xref="keyboard">Keyboard</link>,
-      <link xref="mouse">mouse</link>,
+      <link xref="mouse">mouse &amp; touchpad</link>,
       <link xref="prefs-display">display</link>,
       <link xref="prefs-language">languages</link>,
       <link xref="user-accounts">user accounts</link>…
@@ -35,4 +35,4 @@ to quick set for a group of content types.</p>
 a reorg of the options. Double-check everything before writing for 3.4.</p>
 </comment>
 
-</page>
\ No newline at end of file
+</page>
diff --git a/gnome-help/C/sharing-desktop.page b/gnome-help/C/sharing-desktop.page
index eaf7b4b4..d757a979 100644
--- a/gnome-help/C/sharing-desktop.page
+++ b/gnome-help/C/sharing-desktop.page
@@ -9,6 +9,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"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
@@ -57,11 +58,14 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Sharing</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Sharing</gui> to open the panel.</p>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <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
@@ -145,22 +149,30 @@
   choose where your desktop can be shared.</p>
   </section>
 
-  <section id="notification-icon">
+  <section id="disconnect">
   <title>Stop sharing your desktop</title>
 
-  <p>You can disconnect someone who is viewing your desktop using the
-  <gui>notification icon</gui> in the message Tray. To do so:</p>
-    <steps>
-      <item><p>Open the message tray by pressing
-      <keyseq><key>Super</key><key>M</key></keyseq>, or by moving your mouse
-      pointer to the very bottom of your screen.</p></item>
-      <item><p>Click on the <gui>Desktop</gui> icon in the
-      <gui>Message Tray</gui>. This will open the <app>Sharing</app> panel.</p>
-      </item>
-      <item><p>Select <gui>Screen Sharing</gui>.</p></item>
-      <item><p>Toggle the <gui>Screen Sharing</gui> slider to <gui>Off</gui>.
-      </p></item>
-    </steps>
+  <p>To disconnect someone who is viewing your desktop:</p>
+
+  <steps>
+    <item>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>Sharing</gui> in the sidebar to open the panel.</p>
+    </item>
+    <item>
+      <p><gui>Screen Sharing</gui> will show as <gui>Active</gui>. Click on
+      it.</p>
+    </item>
+    <item>
+      <p>Toggle the switch at the top to <gui>OFF</gui>.</p>
+    </item>
+  </steps>
 
   </section>
 
diff --git a/gnome-help/C/shell-introduction.page b/gnome-help/C/shell-introduction.page
index 5b7a4e6c..45b89237 100644
--- a/gnome-help/C/shell-introduction.page
+++ b/gnome-help/C/shell-introduction.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.6.0" date="2012-10-13" status="review"/>
     <revision pkgversion="3.10" date="2013-11-02" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="candidate"/>
+    <revision pkgversion="3.29" date="2018-08-28" status="review"/>
 
     <credit type="author">
       <name>Shaun McCance</name>
@@ -188,7 +189,7 @@
     </item>
     <item>
       <p><link xref="shell-notifications">Learn more about notifications and
-      the message tray.</link></p>
+      the notification list.</link></p>
     </item>
   </list>
 
@@ -303,9 +304,9 @@ messages will be presented, such as when your battery is critically low.</p>
     (top) workspace. In addition, the identifier also displays the total number
     of available workspaces. To switch to a different workspace, you can click
     the identifier and select the workspace you want to use from the menu.</p>
-    <p>If an application or a system component wants to get your attention, it
+<!--     <p>If an application or a system component wants to get your attention, it
     will display a blue icon at the right-hand side of the window list.
-    Clicking the blue icon shows the message tray.</p>
+    Clicking the blue icon shows the message tray.</p> -->
   </if:when>
 </if:choose>
 
diff --git a/gnome-help/C/shell-keyboard-shortcuts.page b/gnome-help/C/shell-keyboard-shortcuts.page
index 21d7e0b8..3ea1df4d 100644
--- a/gnome-help/C/shell-keyboard-shortcuts.page
+++ b/gnome-help/C/shell-keyboard-shortcuts.page
@@ -12,6 +12,7 @@
     <revision pkgversion="3.8.0" version="0.4" date="2013-04-23" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="review"/>
     <revision pkgversion="3.20" date="2016-08-13" status="candidate"/>
+    <revision pkgversion="3.29" date="2018-08-27" status="review"/>
 
     <credit type="author copyright">
       <name>Shaun McCance</name>
@@ -43,8 +44,8 @@ information on navigating user interfaces with only the keyboard.</p>
 <title>Getting around the desktop</title>
   <tr xml:id="alt-f1">
     <td><p>
-      <keyseq><key>Alt</key><key>F1</key></keyseq> or the
-      <key xref="keyboard-key-super">Super</key> key
+      <keyseq><key>Alt</key><key>F1</key></keyseq> or the</p>
+      <p><key xref="keyboard-key-super">Super</key> key
     </p></td>
     <td><p>Switch between the <gui>Activities</gui> overview and desktop. In
     the overview, start typing to instantly search your applications, contacts,
@@ -82,8 +83,8 @@ information on navigating user interfaces with only the keyboard.</p>
     <td>
       <p>Give keyboard focus to the top bar. In the <gui>Activities</gui>
       overview, switch keyboard focus between the top bar, dash, windows
-      overview, applications list, search field, and message tray. Use the
-      arrow keys to navigate.</p>
+      overview, applications list, and search field. Use the arrow keys to
+      navigate.</p>
     </td>
   </tr>
   <tr xml:id="super-a">
@@ -91,43 +92,42 @@ information on navigating user interfaces with only the keyboard.</p>
     <td><p>Show the list of applications.</p></td>
   </tr>
   <tr xml:id="super-updown">
-    <td><p>
-      <keyseq><key>Super</key><key>Page Up</key></keyseq> or
-      <keyseq><key>Ctrl</key><key>Alt</key><key>Up</key></keyseq>, and
-      <keyseq><key>Super</key><key>Page Down</key></keyseq> or
-      <keyseq><key>Ctrl</key><key>Alt</key><key>Down</key></keyseq>
+    <td><p><keyseq><key>Super</key><key>Page Up</key></keyseq></p>
+    <p>and</p>
+    <p><keyseq><key>Super</key><key>Page Down</key></keyseq>
     </p></td>
     <td><p><link xref="shell-workspaces-switch">Switch between
      workspaces</link>.</p></td>
   </tr>
-  <tr xml:id="super-shift-updown">
+  <tr xml:id="shift-super-updown">
     <td><p>
-      <keyseq><key>Super</key><key>Shift</key><key>Page Up</key></keyseq> and
-      <keyseq><key>Super</key><key>Shift</key><key>Page Down</key></keyseq>
+      <keyseq><key>Shift</key><key>Super</key><key>Page Up</key></keyseq></p>
+      <p>and</p>
+      <p><keyseq><key>Shift</key><key>Super</key><key>Page Down</key></keyseq>
     </p></td>
     <td><p><link xref="shell-workspaces-movewindow">Move the current window to a
      different workspace</link>.</p></td>
   </tr>
-  <tr xml:id="super-shift-left">
-    <td><p><keyseq><key>Super</key><key>Shift</key><key>&#8592;</key></keyseq></p></td>
+  <tr xml:id="shift-super-left">
+    <td><p><keyseq><key>Shift</key><key>Super</key><key>&#8592;</key></keyseq></p></td>
     <td><p>Move the current window one monitor to the left.</p></td>
   </tr>
-  <tr xml:id="super-shift-right">
-    <td><p><keyseq><key>Super</key><key>Shift</key><key>&#8594;</key></keyseq></p></td>
+  <tr xml:id="shift-super-right">
+    <td><p><keyseq><key>Shift</key><key>Super</key><key>&#8594;</key></keyseq></p></td>
     <td><p>Move the current window one monitor to the right.</p></td>
   </tr>
   <tr xml:id="ctrl-alt-Del">
     <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>Delete</key></keyseq></p></td>
-    <td><p><link xref="shell-exit">Power Off</link>.</p></td>
+    <td><p><link xref="shell-exit#logout">Log Out</link>.</p></td>
   </tr>
-  <tr xml:id="ctrl-alt-l">
+  <tr xml:id="super-l">
     <td><p><keyseq><key>Super</key><key>L</key></keyseq></p></td>
     <td><p><link xref="shell-exit#lock-screen">Lock the screen.</link></p></td>
   </tr>
-  <tr xml:id="super-m">
-    <td><p><keyseq><key>Super</key><key>M</key></keyseq></p></td>
-    <td><p>Open <link xref="shell-notifications#messagetray">the message
-    tray</link>. Press <keyseq><key>Super</key><key>M</key></keyseq> again or
+  <tr xml:id="super-v">
+    <td><p><keyseq><key>Super</key><key>V</key></keyseq></p></td>
+    <td><p>Show <link xref="shell-notifications#notificationlist">the notification
+    list</link>. Press <keyseq><key>Super</key><key>V</key></keyseq> again or
     <key>Esc</key> to close.</p></td>
   </tr>
 </table>
diff --git a/gnome-help/C/shell-notifications.page b/gnome-help/C/shell-notifications.page
index 44390d9c..2350b6d6 100644
--- a/gnome-help/C/shell-notifications.page
+++ b/gnome-help/C/shell-notifications.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.10" date="2013-11-02" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="review"/>
     <revision pkgversion="3.16" date="2015-03-02" status="outdated"/>
+    <revision pkgversion="3.29" date="2018-08-27" status="review"/>
 
     <credit type="author">
       <name>Marina Zhurakhinskaya</name>
@@ -31,7 +32,7 @@
     <desc>Messages drop down from the top of the screen telling you when
     certain events happen.</desc> </info>
 
-<title>Notifications and the message tray</title>
+<title>Notifications and the notification list</title>
 
 <section id="what">
   <title>What is a notification?</title>
@@ -40,7 +41,9 @@
   notification will be shown at the top of the screen.</p>
 
   <p>For example, if you get a new chat message or a new email, you will get a
-  notification informing you.</p>
+  notification informing you. Chat notifications are given special treatment,
+  and are represented by the individual contacts who sent you the chat
+  messages.</p>
 
 <!--  <p>To minimize distraction, some notifications first appear as a single line.
   You can move your mouse over them to see their full content.</p>-->
@@ -50,37 +53,28 @@
   button.</p>
 
   <p>Clicking the close button on some notifications dismisses them. Others,
-  like Rhythmbox or your chat application, will stay hidden in the message 
-  tray.</p>
+  like Rhythmbox or your chat application, will stay hidden in the notification 
+  list.</p>
 
 </section>
 
-<section id="messagetray">
+<section id="notificationlist">
 
-  <title>The message tray</title>
+  <title>The notification list</title>
 
-  <p if:test="!platform:gnome-classic">The message tray gives you a way to get
-  back to your notifications when it is convenient for you. It appears when you
-  click on the clock, or press
-  <keyseq><key xref="keyboard-key-super">Super</key><key>M</key></keyseq>. The
-  message tray contains all the notifications that you have not acted upon or
-  that permanently reside in it.</p>
+  <p>The notification list gives you a way to
+  get back to your notifications when it is convenient for you. It appears when
+  you click on the clock, or press
+  <keyseq><key xref="keyboard-key-super">Super</key><key>V</key></keyseq>. The
+  notification list contains all the notifications that you have not acted upon
+  or that permanently reside in it.</p>
 
-  <p if:test="platform:gnome-classic">The message tray gives you a way to get
-  back to your notifications when it is convenient for you. It appears when you
-  move your mouse to the bottom-right corner of the screen, or press <keyseq>
-  <key xref="keyboard-key-super">Super</key><key>M</key></keyseq>. You can also
-  show the message tray by clicking the blue number icon at the right-hand
-  side of the window list. The message tray contains all the notifications that
-  you have not acted upon or that permanently reside in it.</p>
+  <p>You can view a notification by clicking on it in the list. You can close
+  the notification list by pressing
+  <keyseq><key>Super</key><key>V</key></keyseq> again or <key>Esc</key>.</p>
 
-  <p>You can view the notifications by clicking on the message tray items.
-  These are usually messages sent by applications. However, chat notifications
-  are given special treatment, and are represented by the individual contacts
-  who sent you the chat messages.</p>
-
-  <p>You can close the message tray by pressing
-  <keyseq><key>Super</key><key>M</key></keyseq> again or <key>Esc</key>.</p>
+  <p>Click the <gui>Clear List</gui> button to empty the list of
+  notifications.</p>
 
 </section>
 
@@ -93,35 +87,30 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Notifications</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> 
+      overview and start typing <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Click on <gui>Settings</gui>.</p>
     </item>
     <item>
-      <p>Click on <gui>Notifications</gui> to open the panel.</p>
+      <p>Click on <gui>Notifications</gui> in the sidebar to open the panel.</p>
     </item>
     <item>
-      <p>Switch <gui>Notification Banners</gui> to <gui>OFF</gui>.</p>
+      <p>Switch <gui>Notification Popups</gui> to <gui>OFF</gui>.</p>
     </item>
   </steps>
 
-  <p if:test="!platform:gnome-classic">When switched off, most notifications
-  will not pop up at the top of the screen. <!--Very important notifications, such
-  as when your battery is critically low, will still pop up.--> Notifications will
-  still be available in the message tray when you display it (by clicking on
-  the clock, or by pressing <keyseq><key>Super</key><key>M</key></keyseq>), and
-  they will start popping up again when you switch the toggle to <gui>ON</gui>
-  again.</p>
+  <p>When switched off, most notifications will not pop up at the top of the
+  screen. <!--Very important notifications, such as when your battery is
+  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>
 
   <p>You can also disable or re-enable notifications for individual
   applications from the <gui>Notifications</gui> panel.</p>
 
-  <p if:test="platform:gnome-classic">When switched off, most notifications will
-  not pop up at the bottom of the screen. Very important notifications, such as
-  when your battery is critically low, will still pop up. Notifications will
-  still be available in the message tray when you display it (by moving your mouse
-  to the bottom-right corner of the screen, or by pressing <keyseq><key>Super</key>
-  <key>M</key></keyseq>), and they will start popping up again when you switch the
-  toggle to <gui>ON</gui> again.</p>
 
 </section>
 
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index 7c3ec25c..d2c65642 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -193,6 +193,7 @@ HELP_FILES = \
        display-brightness.page \
        display-dual-monitors.page \
        display-night-light.page \
+       emoji-flags-symbolic.svg \
        files-autorun.page \
        files-browse.page \
        files-copy.page \
@@ -215,6 +216,7 @@ HELP_FILES = \
        get-involved.page \
        gnome-classic.page \
        gnome-version.page \
+       go-down-symbolic.svg \
        hardware-auth.page \
        hardware-cardreader.page \
        hardware-driver.page \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]