remove search topic, update shell terminology

2 files changed, 28 insertions, 4 deletions

diff --git a/gnome-help/C/shell-apps-search.page b/gnome-help/C/shell-apps-search.page.old
index f04e1da..c02f2a3 100644
--- a/gnome-help/C/shell-apps-search.page
+++ b/gnome-help/C/shell-apps-search.page.old
@@ -16,6 +16,9 @@
 
 
 <title>Search for Programs and Applications</title>
+
+<!-- Obsolete page, this stuff is covered elsewhere. -->
+
  <p>
  To search your computer for a program or application:
  </p>
diff --git a/gnome-help/C/shell-terminology.page b/gnome-help/C/shell-terminology.page
index 340b63d..7e08ea1 100644
--- a/gnome-help/C/shell-terminology.page
+++ b/gnome-help/C/shell-terminology.page
@@ -16,7 +16,7 @@
 
 <title>Activities overview, dash, top bar, workspaces - what are all of these things?</title>
 
-<!-- FIXME: THIS SHOULD BE ALPHABETICALLY SORTED -->
+<!-- THIS SHOULD BE ALPHABETICALLY SORTED -->
 
 <terms>
  <item>
@@ -25,8 +25,13 @@
  </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 a list of the windows you have open, with a preview and the name of the currently-selected window.</p>
+ </item>
+ 
+ <item>
   <title>Dash</title>
-  <p>The <em>dash</em> is the </p>
+  <p>The <em>dash</em> is the list of your favorite applications that is shown on the left-hand side of the activities overview. This is sometimes referred to as the <em>dock</em>.</p>
  </item>
  
  <item>
@@ -35,9 +40,25 @@
  </item>
  
  <item>
-  <title></title>
-  <p></p>
+  <title>System settings</title>
+  <p>The <em>System 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>System Settings</gui> to access them.</p>
  </item>
+ 
+ <item>
+  <title>Top bar</title>
+  <p>The <em>top bar</em> is the bar that runs along the very top of the screen. The <gui>Activities</gui> button is on one end of the top bar and your user name is on the other.</p>
+ </item>
+ 
+ <item>
+  <title>Workspace</title>
+  <p>You can put windows on different <em>workspaces</em>. They are a convenient way of grouping and separating windows.</p>
+ </item>
+ 
+ <item>
+  <title>Workspace switcher</title>
+  <p>The <em>workspace switcher</em> is the list of workspaces that is shown on the right-hand side of the <gui>Windows</gui> view in the activities overview.</p>
+ </item>
+ 
 </terms>
 
 </page>