gnome-help: Update to workspace management in Classic Mode since 3.34

5 files changed, 97 insertions, 56 deletions

diff --git a/gnome-help/C/shell-introduction.page b/gnome-help/C/shell-introduction.page
index cfaa1d88..448c6ecf 100644
--- a/gnome-help/C/shell-introduction.page
+++ b/gnome-help/C/shell-introduction.page
@@ -270,11 +270,9 @@ messages will be presented, such as when your battery is critically low.</p>
     <p>The window list at the bottom of the screen provides access to all your
     open windows and applications and lets you quickly minimize and restore
     them.</p>
-    <p>At the right-hand side of the window list, GNOME displays a short
-    identifier for the current workspace, such as <gui>1</gui> for the first
-    (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>At the right-hand side of the window list, GNOME displays the four
+    workspaces. To switch to a different workspace, select the workspace you
+    want to use.</p>
   </if:when>
 </if:choose>
 
diff --git a/gnome-help/C/shell-keyboard-shortcuts.page b/gnome-help/C/shell-keyboard-shortcuts.page
index 7307fccb..01b84adc 100644
--- a/gnome-help/C/shell-keyboard-shortcuts.page
+++ b/gnome-help/C/shell-keyboard-shortcuts.page
@@ -1,6 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/"
+      xmlns:if="http://projectmallard.org/if/1.0/"
       xmlns:ui="http://projectmallard.org/ui/1.0/"
-      type="topic" style="tip" version="1.0 ui/1.0"
+      type="topic" style="tip" version="1.0 if/1.0 ui/1.0"
       id="shell-keyboard-shortcuts">
 
   <info>
@@ -93,19 +94,24 @@ 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></p>
-    <p>and</p>
-    <p><keyseq><key>Super</key><key>Page Down</key></keyseq>
-    </p></td>
+    <td>
+      <p if:test="!platform:gnome-classic"><keyseq><key>Super</key><key>Page Up</key></keyseq></p>
+      <p if:test="platform:gnome-classic"><keyseq><key>Ctrl</key><key>Alt</key><key>→</key></keyseq></p>
+      <p>and</p>
+      <p if:test="!platform:gnome-classic"><keyseq><key>Super</key><key>Page Down</key></keyseq></p>
+      <p if:test="platform:gnome-classic"><keyseq><key>Ctrl</key><key>Alt</key><key>←</key></keyseq></p>
+    </td>
     <td><p><link xref="shell-workspaces-switch">Switch between
      workspaces</link>.</p></td>
   </tr>
   <tr xml:id="shift-super-updown">
-    <td><p>
-      <keyseq><key>Shift</key><key>Super</key><key>Page Up</key></keyseq></p>
+    <td>
+      <p if:test="!platform:gnome-classic"><keyseq><key>Shift</key><key>Super</key><key>Page Up</key></keyseq></p>
+      <p if:test="platform:gnome-classic"><keyseq><key>Shift</key><key>Ctrl</key><key>Alt</key><key>→</key></keyseq></p>
       <p>and</p>
-      <p><keyseq><key>Shift</key><key>Super</key><key>Page Down</key></keyseq>
-    </p></td>
+      <p if:test="!platform:gnome-classic"><keyseq><key>Shift</key><key>Super</key><key>Page Down</key></keyseq></p>
+      <p if:test="platform:gnome-classic"><keyseq><key>Shift</key><key>Ctrl</key><key>Alt</key><key>←</key></keyseq></p>
+    </td>
     <td><p><link xref="shell-workspaces-movewindow">Move the current window to a
      different workspace</link>.</p></td>
   </tr>
diff --git a/gnome-help/C/shell-workspaces-movewindow.page b/gnome-help/C/shell-workspaces-movewindow.page
index 3cba109a..cb1493ca 100644
--- a/gnome-help/C/shell-workspaces-movewindow.page
+++ b/gnome-help/C/shell-workspaces-movewindow.page
@@ -11,6 +11,7 @@
     <revision pkgversion="3.8" version="0.3" date="2013-05-10" status="review"/>
     <revision pkgversion="3.10" date="2013-11-04" status="candidate"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="candidate"/>
+    <revision pkgversion="3.35.91" date="2020-02-27" status="candidate"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -20,6 +21,10 @@
       <name>Michael Hill</name>
       <email>mdhillca@gmail.com</email>
     </credit>
+    <credit type="editor">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -29,32 +34,45 @@
 
   <title>Move a window to a different workspace</title>
 
+ <if:choose>
+ <if:when test="platform:gnome-classic">
+  <steps>
+    <title>Using the mouse:</title>
+    <item>
+      <p>Press the button at the bottom left of the screen in the window list.</p>
+    </item>
+    <item>
+      <p>Click and drag the window towards the bottom right of the screen.</p>
+    </item>
+    <item>
+      <p>Drop the window onto one of the workspaces in the <em>workspace
+      selector</em> at the right-hand side of the window list. This workspace
+      now contains the window you have dropped.</p>
+    </item>
+  </steps>
+ </if:when>
+ <if:when test="!platform:gnome-classic">
   <steps>
     <title>Using the mouse:</title>
     <item>
-      <p if:test="!platform:gnome-classic">Open the
-      <gui xref="shell-introduction#activities">Activities</gui> overview.</p>
-      <p if:test="platform:gnome-classic">Open the
-      <gui xref="shell-introduction#activities">Activities Overview</gui> from the
-      <gui xref="shell-introduction#activities">Applications</gui> menu
-      at the top left of the screen.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui>
+      overview.</p>
     </item>
     <item>
       <p>Click and drag the window toward the right of the screen.</p>
     </item>
     <item>
       <p>The <em xref="shell-workspaces">workspace selector</em> will
-      appear.</p>
+      expand.</p>
     </item>
     <item>
-      <p if:test="!platform:gnome-classic">Drop the window onto an empty
-      workspace. This workspace now contains the window you have dropped, and a
-      new empty workspace appears at the bottom of the <em>workspace
-      selector</em>.</p>
-      <p if:test="platform:gnome-classic">Drop the window onto an empty
-      workspace. This workspace now contains the window you have dropped.</p>
+      <p>Drop the window onto an empty workspace. This workspace now contains
+      the window you have dropped, and a new empty workspace appears at the
+      bottom of the <em>workspace selector</em>.</p>
     </item>
   </steps>
+ </if:when>
+ </if:choose>
 
   <steps>
     <title>Using the keyboard:</title>
@@ -64,12 +82,18 @@
       <em xref="shell-windows-switching">window switcher</em>).</p>
     </item>
     <item>
-      <p>Press <keyseq><key>Super</key><key>Shift</key><key>Page
+      <p if:test="!platform:gnome-classic">Press <keyseq><key>Super</key><key>Shift</key><key>Page
       Up</key></keyseq> to move the window to a workspace which is above the
       current workspace on the <em>workspace selector</em>.</p>
-      <p>Press <keyseq><key>Super</key><key>Shift</key><key>Page
+      <p if:test="!platform:gnome-classic">Press <keyseq><key>Super</key><key>Shift</key><key>Page
       Down</key></keyseq> to move the window to a workspace which is below the
       current workspace on the <em>workspace selector</em>.</p>
+      <p if:test="platform:gnome-classic">Press <keyseq><key>Shift</key><key>Ctrl</key>
+      <key>Alt</key><key>→</key></keyseq> to move the window to a workspace which
+      is left of the current workspace on the <em>workspace selector</em>.</p>
+      <p if:test="platform:gnome-classic">Press <keyseq><key>Shift</key><key>Ctrl</key>
+      <key>Alt</key><key>←</key></keyseq> to move the window to a workspace which
+      is right of the current workspace on the <em>workspace selector</em>.</p>
     </item>
   </steps>
 
diff --git a/gnome-help/C/shell-workspaces-switch.page b/gnome-help/C/shell-workspaces-switch.page
index acc343e9..68eab3d1 100644
--- a/gnome-help/C/shell-workspaces-switch.page
+++ b/gnome-help/C/shell-workspaces-switch.page
@@ -9,11 +9,16 @@
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="candidate"/>
+    <revision pkgversion="3.35.91" date="2020-02-27" status="candidate"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list@gnome.org</email>
     </credit>
+    <credit type="editor">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -25,40 +30,40 @@
  <steps>  
  <title>Using the mouse:</title>
  <item>
-    <p if:test="!platform:gnome-classic">Open the
-    <gui xref="shell-introduction#activities">Activities</gui> overview.</p>
-  <p if:test="platform:gnome-classic">At the top left of the screen, click the
-  <gui xref="shell-introduction#activities">Applications</gui> menu and choose 
-  <gui>Activities Overview</gui>.</p>
+  <p if:test="!platform:gnome-classic">Open the
+  <gui xref="shell-introduction#activities">Activities</gui> overview.</p>
+  <p if:test="platform:gnome-classic">At the bottom right of the screen, click
+  on one of the four workspaces to activate the workspace.</p>
  </item>
- <item>
+ <item if:test="!platform:gnome-classic">
   <p>Click on a workspace in the <link xref="shell-workspaces">workspace
   selector</link> on the right side of the screen to view the open windows on
   that workspace.</p>
  </item>
- <item>
+ <item if:test="!platform:gnome-classic">
   <p>Click on any window thumbnail to activate the workspace.</p>
  </item>
  </steps>
  
-  <p if:test="platform:gnome-classic">Alternatively, you can switch between
-  workspaces by clicking the workspace identifier at the right-hand side of
-  the window list on the bottom bar and selecting the workspace you want to
-  use from the menu.</p>
-
  <list>
  <title>Using the keyboard:</title>  
   <item>
-    <p>Press
+    <p if:test="!platform:gnome-classic">Press
     <keyseq><key xref="keyboard-key-super">Super</key><key>Page Up</key></keyseq>
     or <keyseq><key>Ctrl</key><key>Alt</key><key>Up</key></keyseq> to move to
     the workspace shown above the current workspace in the workspace selector.
     </p>
+    <p if:test="platform:gnome-classic">Press <keyseq><key>Ctrl</key>
+    <key>Alt</key><key>←</key></keyseq> to move to the workspace shown left of
+    of the current workspace on the <em>workspace selector</em>.</p>
   </item>
   <item>
-    <p>Press <keyseq><key>Super</key><key>Page Down</key></keyseq> or
+    <p if:test="!platform:gnome-classic">Press <keyseq><key>Super</key><key>Page Down</key></keyseq> or
     <keyseq><key>Ctrl</key><key>Alt</key><key>Down</key></keyseq> to move to the
     workspace shown below the current workspace in the workspace selector.</p>
+    <p if:test="platform:gnome-classic">Press <keyseq><key>Ctrl</key>
+    <key>Alt</key><key>→</key></keyseq> to move to the workspace shown right of
+    the current workspace on the <em>workspace selector</em>.</p>
   </item>
  </list>
 
diff --git a/gnome-help/C/shell-workspaces.page b/gnome-help/C/shell-workspaces.page
index 4c18402f..70a9ec10 100644
--- a/gnome-help/C/shell-workspaces.page
+++ b/gnome-help/C/shell-workspaces.page
@@ -10,11 +10,16 @@
     <revision pkgversion="3.8.0" date="2013-04-23" status="review"/>
     <revision pkgversion="3.10.3" date="2014-01-26" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="candidate"/>
+    <revision pkgversion="3.35.91" date="2020-02-27" status="candidate"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list@gnome.org</email>
     </credit>
+    <credit type="editor">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -48,25 +53,28 @@
 <list>
   <item>
     <p if:test="!platform:gnome-classic">In the
-    <gui xref="shell-introduction#activities">Activities</gui> overview, move your cursor
-    to the right-most side of the screen.</p>
-    <p if:test="platform:gnome-classic">Press the
+    <gui xref="shell-introduction#activities">Activities</gui> overview, move
+    your cursor to the right-most side of the screen.</p>
+    <p if:test="platform:gnome-classic">Click the button at the bottom left of
+    the screen in the window list, or press the
     <key xref="keyboard-key-super">Super</key> key to open the
-    <gui>Activities</gui> overview and then move your cursor to the right-most
-    side of the screen.</p>
+    <gui>Activities</gui> overview.</p>
   </item>
   <item>
-    <p if:test="!platform:gnome-classic">A vertical panel will appear showing
+    <p if:test="!platform:gnome-classic">A vertical panel will expand showing
     workspaces in use, plus an empty workspace. This is the
     workspace selector.</p>
-    <p if:test="platform:gnome-classic">A vertical panel will appear showing
-    available workspaces. This is the workspace selector.</p>
+    <p if:test="platform:gnome-classic">In the bottom right corner, you see four
+    boxes. This is the workspace selector.</p>
   </item>
-  <item if:test="!platform:gnome-classic">
-    <p>To add a workspace, drag and drop a window from an existing workspace
-    onto the empty workspace in the workspace selector. This workspace now
-    contains the window you have dropped,
-    and a new empty workspace will appear below it.</p>
+  <item>
+    <p if:test="!platform:gnome-classic">To add a workspace, drag and drop a
+    window from an existing workspace onto the empty workspace in the workspace
+    selector. This workspace now contains the window you have dropped, and a new
+    empty workspace will appear below it.</p>
+    <p if:test="platform:gnome-classic">Drag and drop a window from your current
+    workspace onto an empty workspace in the workspace selector. This workspace
+    now contains the window you have dropped.</p>
   </item>
   <item if:test="!platform:gnome-classic">
     <p>To remove a workspace, simply close all of its windows or move them to