[gnome-user-docs] Adapt content for classic mode



commit 3aa4612e8f82f69ccf75dddd72c06059a4c7e91d
Author: Petr Kovar <pkovar redhat com>
Date:   Tue Apr 9 18:06:00 2013 +0200

    Adapt content for classic mode
    
    Started by Matthias Clasen, contributions by Jana Svarova & Petr Kovar.
    
    This commit adjusts the content in a few places, using a new conditional
    test token, platform:gnome-classic.
    https://bugzilla.gnome.org/show_bug.cgi?id=697155
    
    Shortened shell-windows.page.
    
    Updates for workspace selector.

 gnome-help/C/a11y-stickykeys.page             |   10 +-
 gnome-help/C/clock-calendar.page              |   12 ++-
 gnome-help/C/nautilus-connect.page            |    8 +-
 gnome-help/C/session-fingerprint.page         |    4 +-
 gnome-help/C/shell-apps-favorites.page        |   28 ++--
 gnome-help/C/shell-apps-open.page             |   21 ++-
 gnome-help/C/shell-exit.page                  |    8 +-
 gnome-help/C/shell-introduction.page          |  217 +++++++++++++++++--------
 gnome-help/C/shell-keyboard-shortcuts.page    |    2 +-
 gnome-help/C/shell-notifications.page         |   33 +++--
 gnome-help/C/shell-terminology.page           |   48 ++++--
 gnome-help/C/shell-windows-lost.page          |   36 +++--
 gnome-help/C/shell-windows-maximize.page      |    9 +-
 gnome-help/C/shell-windows-switching.page     |    5 +-
 gnome-help/C/shell-windows.page               |   46 +++---
 gnome-help/C/shell-workspaces-movewindow.page |   37 +++--
 gnome-help/C/shell-workspaces-switch.page     |   33 +++--
 gnome-help/C/shell-workspaces.page            |   54 +++++--
 gnome-help/C/status-icons.page                |   11 ++
 19 files changed, 417 insertions(+), 205 deletions(-)
---
diff --git a/gnome-help/C/a11y-stickykeys.page b/gnome-help/C/a11y-stickykeys.page
index 1952691..e835c37 100644
--- a/gnome-help/C/a11y-stickykeys.page
+++ b/gnome-help/C/a11y-stickykeys.page
@@ -29,10 +29,10 @@
 
   <p><em>Sticky keys</em> allows you to type keyboard shortcuts one key at a
   time rather than having to hold down all of the keys at once. For example,
-  the <keyseq><key>Alt</key><key>Tab</key></keyseq> shortcut switches between
-  windows. Without sticky keys turned on, you would have to hold down both keys
-  at the same time; with sticky keys turned on, you would press <key>Alt</key>
-  and then <key>Tab</key> to do the same.</p>
+  the <keyseq><key xref="keyboard-key-super">Super</key><key>Tab</key></keyseq>
+  shortcut switches between windows. Without sticky keys turned on, you would
+  have to hold down both keys at the same time; with sticky keys turned on, you
+  would press <key>Super</key> and then <key>Tab</key> to do the same.</p>
 
   <p>You might want to turn on sticky keys if you find it difficult to hold
   down several keys at once.</p>
@@ -67,7 +67,7 @@
   <p>If you press two keys at once, you can have sticky keys turn itself off
   temporarily to let you enter a keyboard shortcut in the normal way.</p>
 
-  <p>For example, if you have sticky keys turned on but press <key>Alt</key>
+  <p>For example, if you have sticky keys turned on but press <key>Super</key>
   and <key>Tab</key> simultaneously, sticky keys would not wait for you to
   press another key if you had this option turned on. It <em>would</em> wait if
   you only pressed one key, however. This is useful if you are able to press
diff --git a/gnome-help/C/clock-calendar.page b/gnome-help/C/clock-calendar.page
index 7352962..a02f35d 100644
--- a/gnome-help/C/clock-calendar.page
+++ b/gnome-help/C/clock-calendar.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="task"
       id="clock-calendar">
 
@@ -33,7 +34,7 @@
   <p>To view your appointments:</p>
   <steps>
    <item>
-    <p>Click on the clock in the middle of the top bar.</p>
+    <p>Click on the clock on the top bar.</p>
    </item>
    <item>
     <p>Click the date for which you want to see your appointments on the
@@ -46,9 +47,18 @@
    </item>
   </steps>
 
+ <if:choose>
+ <if:when test="!platform:gnome-classic">
  <media type="image" src="figures/shell-appts.png" width="500" height="396">
   <p>Clock, calendar, and appointments</p>
  </media>
+ </if:when>
+ <if:when test="platform:gnome-classic">
+ <media type="image" src="figures/shell-appts-classic.png" width="373" height="250">
+  <p>Clock, calendar, and appointments</p>
+ </media>
+ </if:when>
+ </if:choose>
 
   <p>To quickly get to the full <app>Evolution</app> calendar, click on the
  clock and click <gui>Open Calendar</gui>.</p>
diff --git a/gnome-help/C/nautilus-connect.page b/gnome-help/C/nautilus-connect.page
index 26c9f4d..681c6e1 100644
--- a/gnome-help/C/nautilus-connect.page
+++ b/gnome-help/C/nautilus-connect.page
@@ -70,7 +70,7 @@ internet/network address.</p>
   </example>
 <p>The <em>scheme</em> specifies the protocol or type of server. The
   <em>example.com</em> portion of the address is called the <em>domain name</em>.
-  If a user name is required, it is inserted before the server name:</p>
+  If a username is required, it is inserted before the server name:</p>
   <example>
     <p><sys>scheme://username servername example com/folder</sys></p>
   </example>
@@ -86,7 +86,7 @@ internet/network address.</p>
 
 <p>You can connect to different types of servers. Some servers are public,
    and allow anybody to connect. Other servers require you to log in with a
-   user name and password.</p>
+   username and password.</p>
 <p>You may not have permissions to perform certain actions on files on a server.
   For example, on public FTP sites, you will probably not be able to delete
   files.</p>
@@ -127,14 +127,14 @@ internet/network address.</p>
   <title>Public FTP</title>
   <p>Sites that allow you to download files will sometimes provide
   public or anonymous FTP access. These servers do not require a
-  user name and password, and will usually not allow you to delete
+  username and password, and will usually not allow you to delete
   or upload files.</p>
   <p>A typical anonymous FTP URL looks like this:</p>
   <example>
     <p><sys>ftp://ftp.example.com/path/</sys></p>
   </example>
   <p>Some anonymous FTP sites require you to log in with a
-  public user name and password, or with a public user name using
+  public username and password, or with a public username using
   your email address as the password. For these servers, use the
   <gui>FTP (with login)</gui> method, and use the credentials
   specified by the FTP site.</p>
diff --git a/gnome-help/C/session-fingerprint.page b/gnome-help/C/session-fingerprint.page
index 7b452bb..62c00d5 100644
--- a/gnome-help/C/session-fingerprint.page
+++ b/gnome-help/C/session-fingerprint.page
@@ -75,7 +75,7 @@
       The login screen appears.</p>
     </item>
     <item>
-      <p>At the login screen, select your user name from the list. The password
+      <p>At the login screen, select your username from the list. The password
       entry form will appear.</p>
     </item>
     <item>
@@ -96,4 +96,4 @@
   <p>If you previously created a login keyring, it is secured by your password.
   To unlock it, enter your password.</p>
        
-</page>
\ No newline at end of file
+</page>
diff --git a/gnome-help/C/shell-apps-favorites.page b/gnome-help/C/shell-apps-favorites.page
index a1251fa..0a2e3b7 100644
--- a/gnome-help/C/shell-apps-favorites.page
+++ b/gnome-help/C/shell-apps-favorites.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-apps-favorites">
@@ -25,19 +26,26 @@
 
 <title>Pin your favorite apps to the dash</title>
 
-<p>To add an application to the <link xref="shell-terminology">dash</link> for
- easy access:</p>
+  <p>To add an application to the <link xref="shell-terminology">dash</link> for
+  easy access:</p>
  <steps>
-  <item><p>Open the <link xref="shell-terminology">Activities overview</link>.</p></item>
-  <item>
-   <p>Click on the grid button in the dash and find the application you want to
-    add. Right-click on the application icon and select
-     <gui>Add to Favorites</gui>.</p>
-   <p>Alternately, you can click-and-drag the icon into the dash.</p>
+  <item><p if:test="!platform:gnome-classic">Open the
+  <link xref="shell-terminology">Activities overview</link>.</p>
+  <p if:test="platform:gnome-classic">Press the
+  <key xref="keyboard-key-super">Super</key> key to open the
+  <link xref="shell-terminology">Activities overview</link>.</p></item>
+  <item><p>Click on the grid button in the dash and find the application you
+  want to add. Right-click on the application icon and select <gui>Add to
+  Favorites</gui>.</p>
+  <p>Alternately, you can click-and-drag the icon into the dash.</p>
   </item>
   </steps>
 
-<p>To remove an application icon from the dash, right click on the application
- icon and select <gui>Remove from Favorites</gui>.</p>
+  <p>To remove an application icon from the dash, right click on the application
+  icon and select <gui>Remove from Favorites</gui>.</p>
+
+  <note style="tip" if:test="platform:gnome-classic"><p>Favorite applications also
+  appear in the <gui>Favorites</gui> section of the main menu.</p>
+  </note>
 
 </page>
diff --git a/gnome-help/C/shell-apps-open.page b/gnome-help/C/shell-apps-open.page
index 2a21176..6dffd9d 100644
--- a/gnome-help/C/shell-apps-open.page
+++ b/gnome-help/C/shell-apps-open.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-apps-open">
@@ -31,13 +32,19 @@ to overview in list item below, not just workspace thumbnail.) Right-click
 icon to choose a window to focus or get new window. Mention middle-click?</p>
 </comment>
 
-  <p>Move your mouse pointer to the <gui>Activities</gui> corner at the top
-  left of the screen to show the <gui>Activities Overview</gui>. This is where
-  you can find all of your applications. You can also open the overview by
-  pressing the <link xref="keyboard-key-super">Super key</link>.</p>
+  <p if:test="platform:gnome-classic">You can start applications from the
+  <gui>Applications</gui> menu at the top left of the screen, or you can use
+  the <gui>Activities Overview</gui> by pressing the
+  <key xref="keyboard-key-super">Super</key> key.</p>
+
+  <p if:test="!platform:gnome-classic">Move your mouse pointer to the
+  <gui>Activities</gui> corner at the top left of the screen to show the
+  <gui>Activities</gui> overview. This is where you can find all of your
+  applications. You can also open the overview by pressing the
+  <key xref="keyboard-key-super">Super</key> key.</p>
 
   <p>There are several ways of opening an application once you're in the
- activities overview:</p>
+  <gui>Activities</gui> overview:</p>
 
 <list>
 
@@ -49,8 +56,8 @@ icon to choose a window to focus or get new window. Mention middle-click?</p>
 
  <item>
   <p>Some applications have icons in the <em>dash</em>, the vertical strip of
- icons on the left-hand side of the activities overview. Click one of these to
- start the corresponding application.</p>
+ icons on the left-hand side of the <gui>Activities</gui> overview. Click one of
+ these to start the corresponding application.</p>
   <p>If you have applications that you use very frequently, you can
  <link xref="shell-apps-favorites">add them to the dash</link> yourself.</p>
  </item>
diff --git a/gnome-help/C/shell-exit.page b/gnome-help/C/shell-exit.page
index fc6ea78..276a10c 100644
--- a/gnome-help/C/shell-exit.page
+++ b/gnome-help/C/shell-exit.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="task"
       id="shell-exit">
 
@@ -51,10 +52,15 @@
   <p>To <gui>Log Out</gui> or <gui>Switch User</gui>, click your name on the
  top bar and select the appropriate option.</p>
 
-<note>
+<note if:test="!platform:gnome-classic">
   <p>The <gui>Log Out</gui> and <gui>Switch User</gui> entries only appear in
   the menu if you have more than one user account on your system.</p>
 </note>
+
+<note if:test="platform:gnome-classic">
+  <p>The <gui>Switch User</gui> entry only appears in the menu if you have more
+   than one user account on your system.</p>
+</note>
 </section>
 
 <section id="lock-screen">
diff --git a/gnome-help/C/shell-introduction.page b/gnome-help/C/shell-introduction.page
index 434e653..20c820c 100644
--- a/gnome-help/C/shell-introduction.page
+++ b/gnome-help/C/shell-introduction.page
@@ -31,38 +31,67 @@
   <p>Add a screen shot of a message tray</p>
 </comment>
 
-<p>GNOME 3 features a completely reimagined user interface designed to
-stay out of your way, minimize distractions, and help you get things done.
-When you first log in, you will see an empty desktop and the top bar.</p>
+  <p>GNOME 3 features a completely reimagined user interface designed to
+  stay out of your way, minimize distractions, and help you get things done.
+  When you first log in, you will see an empty desktop and the top bar.</p>
 
+<if:choose>
+<if:when test="!platform:gnome-classic">
 <media type="image" src="figures/shell-top-bar.png"
        width="500" height="40" if:test="!target:mobile">
   <p>GNOME shell top bar</p>
 </media>
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/shell-top-bar-classic.png"
+       width="500" height="40" if:test="!target:mobile">
+  <p>GNOME shell top bar</p>
+</media>
+</if:when>
+</if:choose>
 
-<p>The top bar provides access to your windows and applications, your calendar
-and appointments, and <link xref="status-icons">system properties</link> like
-sound, networking, and power. Under your name in the top bar, you can set your
-availability, change your profile or settings, log out or switch users, or turn
-off your computer.</p>
+  <p>The top bar provides access to your windows and applications, your
+  calendar and appointments, and
+  <link xref="status-icons">system properties</link> like sound, networking,
+  and power. Under your name in the top bar, you can set your availability,
+  change your profile or settings, log out or switch users, or turn off your
+  computer.</p>
 
 <links type="section"/>
 
 <section id="activities">
 <title>Activities overview</title>
 
+<if:choose>
+<if:when test="!platform:gnome-classic">
 <media type="image" src="figures/shell-activities.png"
        width="128" height="75" style="floatend floatright"
        if:test="!target:mobile">
   <p>Activities button</p>
 </media>
-
-<p>To access your windows and applications, click the <gui>Activities</gui>
-button, or just throw your mouse pointer to the top-left hot corner.
-You can also press the <link xref="keyboard-key-super">Super key</link> on
-your keyboard. You can see your windows and applications in the overview.
-You can also just start typing to search your applications, files, and
-folders.</p>
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/shell-activities-classic.png"
+       width="108" height="69" style="floatend floatright"
+       if:test="!target:mobile">
+  <p>Activities button</p>
+</media>
+</if:when>
+</if:choose>
+
+  <p if:test="!platform:gnome-classic">To access your windows and applications,
+  click the <gui>Activities</gui> button, or just move your mouse pointer to
+  the top-left hot corner. You can also press the
+  <key xref="keyboard-key-super">Super</key> key on your keyboard. You can
+  see your windows and applications in the overview. You can also just start
+  typing to search your applications, files, and folders.</p>
+
+  <p if:test="platform:gnome-classic">To access your windows and applications,
+  click the <gui>Applications</gui> menu at the top left of the screen and
+  select the <gui>Activities Overview</gui> item. You can also press the
+  <key xref="keyboard-key-super">Super</key> key to see your windows and
+  applications in the <gui>Activities</gui> overview. Just start typing to
+  search your applications, files, and folders.</p>
 
 <media type="image" src="figures/shell-dash.png"
        width="49" height="300" style="floatstart floatleft"
@@ -70,46 +99,60 @@ folders.</p>
   <p>The dash</p>
 </media>
 
-<p>On the left of the overview, you will find the <em>dash</em>. The dash
-shows you your favorite and running applications. Click any icon in the dash to
-open that application; if the application is already running, it will be
-highlighted. Clicking its icon will bring up the most recently used window. You
-can also drag the icon to the overview, or onto any workspace on the right.</p>
-
-<p>Right-clicking the icon displays a menu that allows you to pick any window in
-a running application, or to open a new window. You can also click the icon
-while holding down <key>Ctrl</key> to open a new window.</p>
-
-<p>When you enter the overview, you will initially be in the windows overview.
-This shows you live thumbnails of all the windows on the current workspace.
-Click any window to focus that window and exit the overview. You can also
-use the scroll wheel on your mouse to zoom in on any window thumbnail.</p>
-
-<p>Click the grid button at the bottom of the dash to display the applications
-overview. This shows you all the applications installed on your computer. Click
-any application to run it, or drag an application to the overview or onto
-a workspace thumbnail. You can also drag an application onto the dash
-to make it a favorite. Your favorite applications stay in the dash even
-when they're not running, so you can access them quickly.</p>
+  <p>On the left of the overview, you will find the <em>dash</em>. The dash
+  shows you your favorite and running applications. Click any icon in the
+  dash to open that application; if the application is already running, it will
+  be highlighted. Clicking its icon will bring up the most recently used 
+  window. You can also drag the icon to the overview, or onto any workspace on
+  the right.</p>
+
+  <p>Right-clicking the icon displays a menu that allows you to pick any window
+  in a running application, or to open a new window. You can also click the icon
+  while holding down <key>Ctrl</key> to open a new window.</p>
+
+  <p>When you enter the overview, you will initially be in the windows overview.
+  This shows you live thumbnails of all the windows on the current workspace.
+  Click any window to focus that window and exit the overview. You can also
+  use the scroll wheel on your mouse to zoom in on any window thumbnail.</p>
+
+  <p>Click the grid button at the bottom of the dash to display the applications
+  overview. This shows you all the applications installed on your computer. Click
+  any application to run it, or drag an application to the overview or onto
+  a workspace thumbnail. You can also drag an application onto the dash
+  to make it a favorite. Your favorite applications stay in the dash even
+  when they're not running, so you can access them quickly.</p>
 
 <list style="compact">
-  <item><p><link xref="shell-apps-open">Learn more about starting applications.</link></p></item>
-  <item><p><link xref="shell-windows">Learn more about windows and workspaces.</link></p></item>
+  <item><p><link xref="shell-apps-open">Learn more about starting applications.
+  </link></p></item>
+  <item><p><link xref="shell-windows">Learn more about windows and workspaces.
+  </link></p></item>
 </list>
 </section>
 
 <section id="clock">
 <title>Clock, calendar &amp; appointments</title>
+<if:choose>
+<if:when test="!platform:gnome-classic">
 <media type="image" src="figures/shell-appts.png"
        width="250" height="198" style="floatend floatright"
        if:test="!target:mobile">
   <p>Clock, calendar, and appointments</p>
 </media>
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/shell-appts-classic.png"
+       width="373" height="250" style="floatend floatright"
+       if:test="!target:mobile">
+  <p>Clock, calendar, and appointments</p>
+</media>
+</if:when>
+</if:choose>
 
-<p>Click the clock in the middle of the top bar to see the current date,
-a month-by-month calendar, and a list of your upcoming appointments.
-You can also access the date and time settings and open your full
-<app>Evolution</app> calendar directly from the menu.</p>
+  <p>Click the clock on the top bar to see the current date,
+  a month-by-month calendar, and a list of your upcoming appointments.
+  You can also access the date and time settings and open your full
+  <app>Evolution</app> calendar directly from the menu.</p>
 
 <list style="compact">
   <item><p><link xref="clock-calendar">Learn more about the calendar and
@@ -120,24 +163,35 @@ You can also access the date and time settings and open your full
 <section id="yourname">
 <title>You and your computer</title>
 
+<if:choose>
+<if:when test="!platform:gnome-classic">
 <media type="image" src="figures/shell-exit.png"
        width="250" height="200" style="floatend floatright"
        if:test="!target:mobile">
   <p>User menu</p>
 </media>
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/shell-exit-classic.png"
+       width="250" height="200" style="floatend floatright"
+       if:test="!target:mobile">
+  <p>User menu</p>
+</media>
+</if:when>
+</if:choose>
 
-<p>Click your name in the top-right corner to manage your profile and
-your computer.</p>
+  <p>Click your name in the top-right corner to manage your profile and
+  your computer.</p>
 
-<p>You can quickly set your availability directly from the menu. This will set
-your status for your contacts to see in instant messaging applications such as
-<app>Empathy</app>.</p>
+  <p>You can quickly set your availability directly from the menu. This will set
+  your status for your contacts to see in instant messaging applications such as
+  <app>Empathy</app>.</p>
 
 <comment>
 <cite date="2012-02-19">shaunm</cite>
-<p>These are separate now. Write another blurb about "Notifications".
-I'm also dropping shell-session-status UNTIL the docs for this get
-cleared up. It was orphaned and incorrect.</p>
+  <p>These are separate now. Write another blurb about "Notifications".
+  I'm also dropping shell-session-status UNTIL the docs for this get
+  cleared up. It was orphaned and incorrect.</p>
 </comment>
 
 <!--
@@ -152,13 +206,13 @@ messages will be presented, such as when your battery is critically low.</p>
 </list>
 -->
 
-<p>The menu also allows you to edit your personal information and change
-the system settings.</p>
+  <p>The menu also allows you to edit your personal information and change
+  the system settings.</p>
 
-<p>When you leave your computer, you can lock your screen to prevent other
-people from using it. You can quickly switch users without logging out
-completely to give somebody else access to the computer. Or you can
-suspend or power off the computer from the menu.</p>
+  <p>When you leave your computer, you can lock your screen to prevent other
+  people from using it. You can quickly switch users without logging out
+  completely to give somebody else access to the computer. Or you can
+  suspend or power off the computer from the menu.</p>
 
 <list style="compact">
   <item><p><link xref="shell-exit">Learn more about switching users,
@@ -175,24 +229,26 @@ suspend or power off the computer from the menu.</p>
   <p>Lock Screen</p>
 </media>
 
-<p>When you lock your screen, or it locks automatically, the lock screen is
-displayed. In addition to protecting your desktop while you're away from your
-computer, the lock screen displays the date, time, and your name as the
-logged-in user. It also shows information about your battery and network status,
-and allows you to control media playback.</p>
+  <p>When you lock your screen, or it locks automatically, the lock screen is
+  displayed. In addition to protecting your desktop while you're away from your
+  computer, the lock screen displays the date, time, and your name as the
+  logged-in user. It also shows information about your battery and network
+  status, and allows you to control media playback.</p>
 
 <list style="compact">
-  <item><p><link xref="shell-lockscreen">Learn more about the lock screen.</link></p></item>
+  <item><p><link xref="shell-lockscreen">Learn more about the lock screen.</link>
+  </p></item>
 </list>
 </section>
 
 <section id="message-tray">
 <title>Message Tray</title>
 
-<p>The message tray can be brought into view by pushing your mouse pointer
-against the bottom of the screen or by pressing
-<keyseq><key>Super</key><key>M</key></keyseq>. This is where your
-notifications are stored until you are ready to view them.</p>
+  <p>The message tray can be brought into view by moving your mouse into the
+  bottom-right corner, or by pressing
+  <keyseq><key xref="keyboard-key-super">Super</key><key>M</key></keyseq>.
+  This is where your notifications are stored until you are ready to view
+  them.</p>
 
 <list style="compact">
 <item><p><link xref="shell-notifications">Learn more about notifications and
@@ -200,4 +256,33 @@ notifications are stored until you are ready to view them.</p>
 </list>
 </section>
 
+<section id="window-list">
+<title>Window List</title>
+
+<if:choose>
+<if:when test="!platform:gnome-classic">
+
+  <p>GNOME features a different approach to switching windows than a
+  permanently visible window list found in other desktop environments.
+  This lets you focus on the task at hand without distractions.</p>
+
+<list style="compact">
+<item><p><link xref="shell-windows-switching">Learn more about switching windows.
+</link></p></item>
+</list>
+
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/shell-window-list-classic.png"
+       width="500" height="40" if:test="!target:mobile">
+  <p>Window List</p>
+</media>
+
+  <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. Clicking on the blue icon shows the message tray.</p>
+</if:when>
+</if:choose>
+</section>
+
 </page>
diff --git a/gnome-help/C/shell-keyboard-shortcuts.page b/gnome-help/C/shell-keyboard-shortcuts.page
index d860f8c..cdfb911 100644
--- a/gnome-help/C/shell-keyboard-shortcuts.page
+++ b/gnome-help/C/shell-keyboard-shortcuts.page
@@ -9,7 +9,7 @@
     <link type="seealso" xref="keyboard-key-super"/>
     <desc>Get around the desktop using the keyboard.</desc>
 
-    <revision pkgversion="3.7.5" version="0.3" date="2013-02-10" status="review"/>
+    <revision pkgversion="3.8.0" version="0.4" date="2013-04-23" status="review"/>
 
     <credit type="author copyright">
       <name>Shaun McCance</name>
diff --git a/gnome-help/C/shell-notifications.page b/gnome-help/C/shell-notifications.page
index d7061a1..2e41c36 100644
--- a/gnome-help/C/shell-notifications.page
+++ b/gnome-help/C/shell-notifications.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="ui"
       id="shell-notifications">
 
@@ -9,7 +10,7 @@
     <desc>Messages pop-up at the bottom of the screen telling you when certain
     events happen.</desc>
 
-    <revision pkgversion="3.6.2" version="0.2" date="2012-11-12" status="review"/>
+    <revision pkgversion="3.8.0" version="0.3" date="2013-04-23" status="review"/>
 
     <credit type="author">
       <name>Marina Zhurakhinskaya</name>
@@ -51,12 +52,20 @@
 
 <title>The message tray</title>
 
-  <p>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>. The
-  message tray 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>. The message
+  tray 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 on 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 the notifications by clicking on the message tray items. These
  are usually messages sent by applications. However, chat notifications are
@@ -82,10 +91,10 @@
 
   <p>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
-  messaging tray when you display it (by moving your mouse to the bottom right
-  corner, or pressing <keyseq><key>Super</key><key>M</key></keyseq>), and they
-  will redisplay when you switch the toggle to <gui>ON</gui> again.</p>
-
+  low, will still pop up. Notifications will still be available in the messaging
+  tray when you display it (by moving your mouse to the bottom right corner, or
+  pressing <keyseq><key>Super</key><key>M</key></keyseq>), and they will
+  redisplay when you switch the toggle to <gui>ON</gui> again.</p>
+  
 </section>
 </page>
diff --git a/gnome-help/C/shell-terminology.page b/gnome-help/C/shell-terminology.page
index 5f1890f..7aac098 100644
--- a/gnome-help/C/shell-terminology.page
+++ b/gnome-help/C/shell-terminology.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="reference"
       id="shell-terminology">
 
@@ -7,7 +8,7 @@
 
     <desc>An overview of terms used to describe different parts of the desktop.</desc>
 
-    <revision pkgversion="3.7.1" version="0.3" date="2012-11-16" status="outdated"/>
+    <revision pkgversion="3.8.0" version="0.4" date="2013-04-23" status="outdated"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -28,15 +29,19 @@
 <terms>
  <item>
   <title>Activities overview</title>
-  <p>The <em>activities overview</em> is the screen that's displayed when you
- click on <gui>Activities</gui> at the top left of the screen.</p>
+  <p if:test="!platform:gnome-classic">The <em>activities overview</em> is the
+  screen that is displayed when you click <gui>Activities</gui> at the top
+  left of the screen.</p>
+  <p if:test="platform:gnome-classic">The <em>activities overview</em> is the
+  screen that is displayed when you select <gui>Activities Overview</gui> in
+  the <gui>Applications</gui> menu at the top left of the screen.</p>
  </item>
 
  <item>
-  <title>Alt-Tab window switcher</title>
-  <p>When you hold down the <key>Alt</key> key and then press <key>Tab</key>, a
- <em>window switcher</em> appears. This shows the icons of the applications you
- have currently open.</p>
+  <title>Super-Tab window switcher</title>
+  <p>When you hold down the <key xref="keyboard-key-super">Super</key> key and
+  then press <key>Tab</key>, a <em>window switcher</em> appears. This shows the
+  icons of the applications you have currently open.</p>
  </item>
 
  <item>
@@ -61,23 +66,36 @@
  without having to unlock.</p>
  </item>
 
+ <item if:test="platform:gnome-classic">
+  <title>Main menu</title>
+  <p>The <em>main menu</em> is opened when you click <gui>Applications</gui>
+  at the top left of the screen.</p>
+ </item>
+
  <item>
   <title>Notifications</title>
   <p><em>Notifications</em> are messages that pop up at the bottom of the
   screen, telling you that something just happened. For example, when someone
   chatting with you sends a message, a notification will pop up to tell you. If
   you don't want to deal with a message right now, it is hidden in your
-  messaging tray. Move your mouse to the bottom-right corner (or press
+  message tray. Move your mouse to the bottom-right corner (or press
   <keyseq><key xref="keyboard-key-super">Super</key><key>M</key></keyseq>) to
-  see your messaging tray.</p>
+  see your message tray.</p>
+ </item>
+
+ <item if:test="platform:gnome-classic">
+  <title>Places menu</title>
+  <p>The <em>places menu</em> is opened when you click <gui>Places</gui>
+  on the <gui>top bar</gui>. It gives you quick access to important folders,
+  for example <gui>Downloads</gui> or <gui>Pictures</gui>.</p>
  </item>
 
  <item>
   <title>Settings</title>
   <p>The <em>settings</em> are where you can change preferences and so on,
- similar to the Control Panel in Windows or the System Preferences in Mac OS.
- Click your name on the top-right of the top bar and select
- <gui>Settings</gui> to access them.</p>
+  similar to the Control Panel in Windows or the System Preferences in Mac OS.
+  Click your name on the top-right of the top bar and select <gui>Settings</gui>
+  to access them.</p>
  </item>
 
  <item>
@@ -99,6 +117,12 @@
  the right-hand side of the <gui>Windows</gui> view in the activities overview.</p>
  </item>
 
+ <item if:test="platform:gnome-classic">
+  <title>Window list</title>
+  <p>The <em>window list</em> is the bar at the very bottom of the screen, which
+  shows buttons for all your open windows.</p>
+ </item>
+
 </terms>
 
 </page>
diff --git a/gnome-help/C/shell-windows-lost.page b/gnome-help/C/shell-windows-lost.page
index 43961dc..3a66e03 100644
--- a/gnome-help/C/shell-windows-lost.page
+++ b/gnome-help/C/shell-windows-lost.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-windows-lost">
@@ -8,7 +9,7 @@
     <link type="guide" xref="shell-windows#working-with-windows"/>
 
     <desc>Check the activities overview or other workspaces.</desc>
-    <revision pkgversion="3.6.0" version="0.2" date="2012-10-14" status="review"/>
+    <revision pkgversion="3.8.0" version="0.3" date="2013-04-23" status="review"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
@@ -23,36 +24,37 @@
 
 <title>Find a lost window</title>
   <p>A window on a different workspace, or hidden behind another window, is easily
- found using the <link xref="shell-terminology">activities overview</link>:</p>
+  found using the <link xref="shell-terminology">activities overview</link>:</p>
 
 <list>
  <item>
   <p>Open the activities overview. If the missing window is on the current
- <link xref="shell-windows#working-with-workspaces">workspace</link>, it will be
- shown here in thumbnail. Simply click the thumbnail to redisplay the window, or</p>
+  <link xref="shell-windows#working-with-workspaces">workspace</link>, it will be
+  shown here in thumbnail. Simply click the thumbnail to redisplay the window, or</p>
  </item>
  <item>
-  <p>Click on the different workspaces in the
- <link xref="shell-terminology">workspace selector</link> on the right-hand side
- of the screen to try to find your window, or</p>
+  <p>Click different workspaces in the
+ <link xref="shell-terminology">workspace selector</link> at the right-hand side
+  of the screen to try to find your window, or</p>
  </item>
  <item>
-  <p>Right-click on the application in the dash and its open windows will be
- listed. Click on the window in the list to switch to it.</p>
+  <p>Right-click the application in the dash and its open windows will be
+  listed. Click the window in the list to switch to it.</p>
  </item>
 </list>
 
-<p>Using the window switcher:</p>
+  <p>Using the window switcher:</p>
 <list>
  <item>
-  <p>Press <keyseq><key>Alt</key><key>Tab</key></keyseq> to display the window
- switcher. Continue to hold down the <key>Alt</key> key and press <key>Tab</key>
- to cycle through the open windows, or <keyseq><key>Shift</key><key>Tab</key></keyseq>
- to cycle backwards.</p>
+  <p>Press <keyseq><key xref="keyboard-key-super">Super</key><key>Tab</key>
+  </keyseq> to display the <link xref="shell-terminology">window switcher</link>.
+  Continue to hold down the <key>Super</key> key and press <key>Tab</key> to
+  cycle through the open windows, or <keyseq><key>Shift</key><key>Tab</key>
+  </keyseq> to cycle backwards.</p>
  </item>
- <item>
-  <p>If an application has multiple open windows, hold down <key>Alt</key> and press
- <key>`</key> (or the key above <key>Tab</key>) to step through them.</p>
+ <item if:test="!platform:gnome-classic">
+  <p>If an application has multiple open windows, hold down <key>Super</key> and
+  press <key>`</key> (or the key above <key>Tab</key>) to step through them.</p>
  </item>
 </list>
 
diff --git a/gnome-help/C/shell-windows-maximize.page b/gnome-help/C/shell-windows-maximize.page
index 0822fab..db35815 100644
--- a/gnome-help/C/shell-windows-maximize.page
+++ b/gnome-help/C/shell-windows-maximize.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-windows-maximize">
@@ -29,8 +30,12 @@
 
   <p>To maximize a window, grab the titlebar and drag it to the top of the
   screen, or just double-click the titlebar. To maximize a window using the
-  keyboard, hold down the <link xref="keyboard-key-super">Super key</link> and
-  press <key>&#8593;</key>, or press <keyseq><key>Alt</key><key>F10</key></keyseq>.</p>
+  keyboard, hold down the <key xref="keyboard-key-super">Super</key> key and
+  press <key>&#8593;</key>, or press <keyseq><key>Alt</key><key>F10</key></keyseq>.
+  </p>
+
+  <p if:test="platform:gnome-classic">You can also maximize a window by
+  clicking the maximize button in the titlebar.</p>
 
   <p>To restore a window to its unmaximized size, drag it away from the edges
   of the screen. If the window is fully maximized, you can double-click the
diff --git a/gnome-help/C/shell-windows-switching.page b/gnome-help/C/shell-windows-switching.page
index 67a6ac7..2459a12 100644
--- a/gnome-help/C/shell-windows-switching.page
+++ b/gnome-help/C/shell-windows-switching.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-windows-switching">
@@ -42,14 +43,14 @@
   backwards.</p></item>
 </list>
 
-<note style="tip">
+<note style="tip" if:test="!platform:gnome-classic">
   <p>Windows in the window switcher are grouped by application. Previews of
   applications with multiple windows pop down as you click through. Hold down
   <key xref="keyboard-key-super">Super</key> and press <key>`</key> (or the key
   above <key>Tab</key>) to step through the list.</p>
 </note>
 
-<note>
+<note if:test="!platform:gnome-classic">
   <p>In the window switcher, applications from different workspaces are divided
   by vertical separators.</p>
 </note>
diff --git a/gnome-help/C/shell-windows.page b/gnome-help/C/shell-windows.page
index 0101966..704da4f 100644
--- a/gnome-help/C/shell-windows.page
+++ b/gnome-help/C/shell-windows.page
@@ -20,28 +20,36 @@
 
 <title>Windows and workspaces</title>
 
-<p>Like other desktops, Gnome uses windows to display your running applications. Using both the 
<gui>overview</gui> and the <gui>dash</gui>, you can launch new applications and control which window is 
active.</p>
+  <p>Like other desktops, GNOME uses windows to display your running
+  applications. Using both the <gui>Activities</gui> overview and the
+  <gui>dash</gui>, you can launch new applications and control active windows.</p>
 
-<p>In addition to windows, you can also group your applications together within workspaces. Visit the window 
and workspace help topics below to better learn how to use these features.</p>
-<!--
+  <p>You can also group your applications together within workspaces.
+  Visit the window and workspace help topics below to better
+  learn how to use these features.</p>
+<!-- 
+  <p>In the <gui>Activities</gui> overview, the <gui>dash</gui> displays your 
+  favorite applications as well as your running applications. 
+  The <gui>dash</gui> will place a slight glow behind any running applications.
+  </p>
+      
+  <p>Clicking the application icon will launch it if it is not running.  
+  If it is already running, clicking the application will open the last used 
+  window of that application.</p>
 
-Want to keep this intro simple . . . what to do here?
+  <p>Right clicking the application icon for a running application will 
+  bring all windows for that application forward. A menu with the titles of your
+  windows will be displayed. You can select a window from this menu. It also 
+  provides options to open a new window for that application and to remove or 
+  add that application to favorites depending on its current status.</p>
 
-<p>In the <gui>Activities</gui> overview, the <gui>dash</gui> displays your favorite applications as well as 
your running applications. The <gui>dash</gui> will place a slight glow behind any running applications.
- </p>
- <p>
-  Clicking on the application icon will launch it if it is not running, and will open the last used window 
of that application if it is already running.
-</p>
-
-<p>
-Right clicking on the application icon for a running application will bring all windows for that application 
forward. A menu with the titles of your windows will be displayed.  You can select a window from this menu. 
It also provides options to open a new window for that application and to remove or add that application to 
favorites depending on its current status.
-</p>
-
-<p>
-   Windows are shown on their corresponding <link xref="shell-windows-workspaces">workspaces</link>.
-</p>
+  <p>Windows are shown on their corresponding 
+  <link xref="shell-windows-workspaces">workspaces</link>.</p>
 -->
-<comment><p>Briefly explain the different window states that exist and how you can use and recognize those 
states. Discuss interesting ways of arranging windows (i.e. if there is a "Tile" option or something like 
that). Mention, in passing, how you can move and resize windows in multiple ways.</p>
+<comment><p>Briefly explain the different window states that exist and how you
+can use and recognize those states. Discuss interesting ways of arranging windows
+(i.e. if there is a "Tile" option or something like that). Mention, in passing,
+how you can move and resize windows in multiple ways.</p>
 <p>Very brief overview of what you can do with windows. Link to relevant topics.</p>
 </comment>
 <section id="working-with-windows" style="2column">
@@ -58,4 +66,4 @@ Right clicking on the application icon for a running application will bring all
  <title>Working with workspaces</title>
 </section>
 
-</page>
\ No newline at end of file
+</page>
diff --git a/gnome-help/C/shell-workspaces-movewindow.page b/gnome-help/C/shell-workspaces-movewindow.page
index cf4c2ea..4ebbf95 100644
--- a/gnome-help/C/shell-workspaces-movewindow.page
+++ b/gnome-help/C/shell-workspaces-movewindow.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-workspaces-movewindow">
@@ -11,7 +12,7 @@
     <desc>Go to the Activities overview and drag the window to a different
     workspace.</desc>
 
-    <revision pkgversion="3.6.0" version="0.2" date="2012-10-14" status="review"/>
+    <revision pkgversion="3.8.0" version="0.3" date="2013-04-23" status="review"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -28,30 +29,36 @@
 
 <title>Move a window to a different workspace</title>
 
-<p>Using the mouse:</p>
-
-<steps>
+ <steps>
+ <title>Using the mouse:</title>
  <item>
-  <p>Open the <link xref="shell-terminology">Activities</link> overview.</p>
+  <p if:test="!platform:gnome-classic">Open the <link xref="shell-terminology">
+  Activities overview</link>.</p>
+  <p if:test="platform:gnome-classic">Open the <link xref="shell-terminology">
+  Activities overview</link> by opening the <gui>Applications</gui> drop-down
+  menu at the top left of the screen.</p>
  </item>
  <item>
   <p>Click and drag the window toward the right of the screen.</p>
  </item>
  <item>
-  <p>The <link xref="shell-terminology">workspace selector</link> will appear.</p>
+  <p>The <link xref="shell-terminology">workspace selector</link> will appear.
+  </p>
  </item>
  <item>
-  <p>Drop the window onto an empty workspace.  This workspace now contains the
- window you dropped into it, and a new empty workspace appears at the bottom of
- the <gui>workspace selector</gui>.</p>
+  <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 <gui>workspace selector</gui>.</p>
+  <p if:test="platform:gnome-classic">Drop the window onto an empty workspace.
+  This workspace now contains the window you have dropped.</p>
  </item>
-</steps>
+ </steps>
 
-<p>Using the keyboard:</p>
-
-<steps>
-  <item><p>Select the window you want to move (e.g. using the
-   <keyseq><key>Alt</key><key>Tab</key></keyseq>
+ <steps> 
+ <title>Using the keyboard:</title>
+  <item>
+   <p>Select the window you want to move (e.g. using the
+   <keyseq><key xref="keyboard-key-super">Super</key><key>Tab</key></keyseq>
    <link xref="shell-terminology">window switcher</link>).</p>
   </item>
   <item>
diff --git a/gnome-help/C/shell-workspaces-switch.page b/gnome-help/C/shell-workspaces-switch.page
index d821dfc..e81f099 100644
--- a/gnome-help/C/shell-workspaces-switch.page
+++ b/gnome-help/C/shell-workspaces-switch.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-workspaces-switch">
@@ -21,21 +22,29 @@
 
   </info>
 
-<title>Switch between workspaces</title>
+ <title>Switch between workspaces</title>
 
-<terms>
-<item>
+ <steps>  
  <title>Using the mouse:</title>
-  <p>In the <gui>Activities</gui> overview, click on a workspace in the
- <link xref="shell-terminology">workspace selector</link> on the right side of
- the screen to view the open windows on that workspace. Click on any window
- thumbnail to activate the workspace.</p>
-</item>
-
-<item>
- <title>Using the keyboard:</title>
+ <item>
+  <p if:test="!platform:gnome-classic">Open the <link xref="shell-terminology">
+  Activities overview</link>.</p>
+  <p if:test="platform:gnome-classic">At the top left of the screen, click the
+  <gui>Applications</gui> drop-down menu and choose <gui>Activities Overview
+  </gui>.</p>
+ </item>
+ <item>
+  <p>Click on a workspace in the <link xref="shell-terminology">workspace
+  selector</link> on the right side of the screen to view the open windows on
+  that workspace.</p>
+ </item>
+ <item>
+  <p>Click on any window thumbnail to activate the workspace.</p>
+ </item>
+ </steps>
 
  <list>
+ <title>Using the keyboard:</title>  
   <item>
    <p>Press <keyseq><key>Super</key><key>Page Up</key></keyseq> to move to a
     workspace which is above the current workspace in the workspace selector.
@@ -48,7 +57,5 @@
   </item>
  </list>
 
-</item>
-</terms>
 
 </page>
diff --git a/gnome-help/C/shell-workspaces.page b/gnome-help/C/shell-workspaces.page
index 0c5191b..a0accac 100644
--- a/gnome-help/C/shell-workspaces.page
+++ b/gnome-help/C/shell-workspaces.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="ui"
       id="shell-workspaces">
 
@@ -8,7 +9,7 @@
 
     <desc>Workspaces are a way of grouping windows on your desktop.</desc>
 
-    <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
+    <revision pkgversion="3.8.0" date="2013-04-23" status="review"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -26,32 +27,53 @@
   <p>Workspace selector</p>
 </media>
 
-  <p>Workspaces refer to the grouping of windows on your desktop. You can create
- many workspaces, which act like virtual desktops. Workspaces are meant to reduce
- clutter and make the desktop easier to navigate.</p>
+  <p if:test="!platform:gnome-classic">Workspaces refer to the grouping of
+  windows on your desktop. You can create multiple workspaces, which act like
+  virtual desktops. Workspaces are meant to reduce clutter and make the desktop
+  easier to navigate.</p>
+
+  <p if:test="platform:gnome-classic">Workspaces refer to the grouping of
+  windows on your desktop. You can use multiple workspaces, which act like
+  virtual desktops. Workspaces are meant to reduce clutter and make the desktop
+  easier to navigate.</p>
 
   <p>Workspaces can be used to organize your work. For example, you could have
- all your communication windows, such as e-mail and your chat program, on one
- workspace, and the work you are doing on a different workspace. Your music
- manager could be on a third workspace.</p>
+  all your communication windows, such as e-mail and your chat program, on one
+  workspace, and the work you are doing on a different workspace. Your music
+  manager could be on a third workspace.</p>
 
 <p>Using workspaces:</p>
 
 <list>
  <item>
-  <p>In the <gui>Activities</gui> overview, move your cursor to the right-most side of the screen. A 
vertical panel will appear showing workspaces in use, plus an empty workspace. This is the <link 
xref="shell-terminology">workspace selector</link>.</p>
- </item>
+  <p if:test="!platform:gnome-classic">In the <gui>Activities</gui> overview,
+  move your cursor to the right-most side of the screen.</p>
+  <p if:test="platform:gnome-classic">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>
+  </item>
  <item>
+  <p if:test="!platform:gnome-classic">A vertical panel will appear showing
+  workspaces in use, plus an empty workspace. This is the 
+  <link xref="shell-terminology">workspace selector</link>.</p>
+  <p if:test="platform:gnome-classic">A vertical panel will appear showing
+  available workspaces. This is the <link xref="shell-terminology">workspace
+  selector</link>.</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 dropped into it, and a new empty workspace will appear below it.</p>
+  the empty workspace in the
+  <link xref="shell-terminology">workspace selector</link>. 
+  This workspace now contains the window you have dropped, and a new empty 
+  workspace will appear below it.</p>
  </item>
- <item>
-  <p>To remove a workspace simply close all of its windows or move them to other
- workspaces.</p>
+ <item if:test="!platform:gnome-classic">
+  <p>To remove a workspace, simply close all of its windows or move them to other
+  workspaces.</p>
  </item>
 </list>
 
-<p>There is always at least one workspace.</p>
+<p if:test="!platform:gnome-classic">There is always at least one workspace.</p>
 
-</page>
\ No newline at end of file
+</page>
diff --git a/gnome-help/C/status-icons.page b/gnome-help/C/status-icons.page
index 7b8ee87..cdc47b8 100644
--- a/gnome-help/C/status-icons.page
+++ b/gnome-help/C/status-icons.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="ui"
       id="status-icons">
   <info>
@@ -20,10 +21,20 @@
   <title>What do the icons in the top bar mean?</title>
 <p>This section explains the meaning of icons located on the top right corner of the screen. More 
specifically, the different variations of the icons provided by the GNOME interface are described.</p>
 
+<if:choose>
+<if:when test="!platform:gnome-classic">
 <media type="image" src="figures/top-bar-icons.png"
        width="395" height="70" style="floatend">
   <p>GNOME Shell top bar</p>
 </media>
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/top-bar-icons-classic.png"
+       width="395" height="70" style="floatend">
+  <p>GNOME Shell top bar</p>
+</media>
+</if:when>
+</if:choose>
 
 <links type="section"/>
 


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