* Add shell terminology topic

* Rewrite shell-apps-open to focus on key ways of opening apps
* Make shell-apps-favorites more compact
* Topic on what the windows key is

4 files changed, 120 insertions, 88 deletions

diff --git a/gnome-help/C/shell-apps-favorites.page b/gnome-help/C/shell-apps-favorites.page
index 25988ab..99a42ee 100644
--- a/gnome-help/C/shell-apps-favorites.page
+++ b/gnome-help/C/shell-apps-favorites.page
@@ -3,11 +3,10 @@
       id="shell-apps-favorites">
 
   <info>
-  
     <link type="guide" xref="index#apps"/>
     
-    <desc>Pin and unpin prorgram icons to the dock.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2011-01-10" status="review"/>
+    <desc>Add (or remove) frequently-used program icons on the dash.</desc>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="review"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list@gnome.org</email>
@@ -16,48 +15,17 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Dock Your Favourite Apps</title>
- <p>
-   To add an application icon to the dock for easy access:
- </p>
- 
-  <steps>
-    <item><p>
-      Press the <key>Meta</key> key or Press <keyseq><key>Alt</key><key>F1</key></keyseq> or move your cursor to the top-right corner (hot corner) to enter the <gui>Activities</gui> overview.  
-    </p></item>
-    <item><p>
-      Click on <gui>Applications</gui>.
-    </p></item>
-    <item><p>
-      Right-click on any icon you wish to add the dock.  
-    </p></item>
-    <item><p>
-      Select <gui>Add to Favorites</gui>.
-    </p></item>
-  </steps>
-
-<note>
- <p>
-   Alternately, in the <gui>Applications</gui> overview, you can click-and-drag the icon into the dock.
- </p>
-</note>
+<title>Pin your favorite apps to the dash</title>
 
-  <p>
-    To remove an application icon from the dock:
-  </p>
-  
-  <steps>
-   <item><p>
-     In the <gui>Activities</gui> overview, right click on the application icon in the dock.
-   </p></item>
-   <item><p>
-       Select <gui>Remove from Favorites</gui>.
-   </p></item>
+<p>The dash is where you can put links to all of your favorite applications for easy-access. To add an application to the dash:</p>
+ <steps>
+  <item><p>Open the activities overview by moving your mouse pointer to the top-left of the screen.</p></item>
+  <item>
+   <p>Find the application you want to add to the dock, right-click it and select <gui>Add to Favorites</gui>.</p>
+   <p>Alternately, you can click-and-drag the icon into the dock.</p>
+  </item>
   </steps>
-  
-  
-<comment>
-<p>Explain how users can mark apps as being their favorites, so they get put in the dock thing. Explain what the dock is for. Describe what you can do with the dock (removing apps, hiding (?), dragging onto it.</p>
-</comment>
+
+<p>To remove an application icon from the dash, right click on the application icon and select <gui>Remove from Favorites</gui>.</p>
 
 </page>
diff --git a/gnome-help/C/shell-apps-open.page b/gnome-help/C/shell-apps-open.page
index 976b52c..3c5c249 100644
--- a/gnome-help/C/shell-apps-open.page
+++ b/gnome-help/C/shell-apps-open.page
@@ -4,8 +4,8 @@
 
   <info>
     <link type="guide" xref="index#apps"/>
-    <desc>From the <gui>Activities</gui> overview...</desc>
-    <revision pkgversion="3.0" version="0.1" date="2011-01-17" status="review"/>
+    <desc>Click Activities to see the Activities Overview; this is where you can launch programs from.</desc>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="review"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list@gnome.org</email>
@@ -14,47 +14,38 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Start An Applications</title>
-
-<p>
-     To open an application:
-</p>
-
-  <steps>
-    <item><p>
-      Press the <key>Meta</key> key or Press <keyseq><key>Alt</key><key>F1</key></keyseq> or move your cursor to the top-right corner (hot corner) to enter the <gui>Activities</gui> overview.
-    </p></item>
-    <item><p>
-      Click on <gui>Applications</gui>.
-    </p></item>
-    <item><p>
-      Left-click on the application you wish to open.
-    </p></item>
-  </steps>
-
-  <p>
-    Alternatively you can:
-  </p>
-
-   <steps>
-    <item><p>
-      Press the <key>Meta</key> key or Press <keyseq><key>Alt</key><key>F1</key></keyseq> or move your cursor to the top-right corner (hot corner) to enter the <gui>Activities</gui> overview.
-    </p></item>
-    <item><p>
-      Start typing the name of the application you wish to open.  The name will be entered in the <gui>Search Your Computer</gui> textbox. The <gui>Applications</gui> menu will be displayed with the applications matching your current entry.
-    </p></item>
-    <item><p>
-      Left-click on the application you wish to open.
-    </p></item>
-  </steps>
-  <note style="tip">
-    <p>
-      <keyseq><key>Alt</key><key>F2</key></keyseq> allows entering a command to launch an application. For example, to launch <app>Rhythmbox</app>, press <keyseq><key>Alt</key><key>F2</key></keyseq> and type 'rhythmbox' (without the single-quotes).  The name of the app is the command to launch the program.
-    </p>
-    <p>
-    If you change your mind about starting an application after you have typed <keyseq><key>Alt</key><key>F2</key></keyseq>, press <key>Esc</key> to exit.
-
-    </p>
-  </note>
+<title>Starting applications</title>
+
+<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 open the overview by pressing the <link xref="windows-key">windows key</link> too.)</p>
+
+<p>There are several ways of opening an application once you're in the activities overview:</p>
+
+<list>
+ 
+ <item>
+  <p>Click the <gui>Applications</gui> heading at the top of the screen to see a list of applications you can run. You can filter them by type using the categories on the right, or search using the search bar at the top right. Click the application's icon to start it.</p>
+ </item>
+ 
+ <item>
+  <p>Start typing the name of an application - it should search for it instantly. (If this doesn't happen, click the search bar at the top right of the screen and then start typing.) Then, click the application's icon to start it.</p>
+ </item>
+ 
+ <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 those to start that 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>
+ 
+ <item>
+  <p>You can drag an application's icon from the dash or the list of applications and drop it on one of the workspaces on the strip on the right-hand side of the screen. The application will open on that workspace.</p>
+ </item>
+ 
+</list>
+
+<note style="tip">
+ <title>Quickly running a command</title>
+ <p>Another, more advanced way of running an application is to use its <em>command name</em>, which you can do by presing <keyseq><key>Alt</key><key>F2</key></keyseq>, entering a command, and then pressing <key>Enter</key>.</p>
+ <p>For example, to launch <app>Rhythmbox</app>, press <keyseq><key>Alt</key><key>F2</key></keyseq> and type 'rhythmbox' (without the single-quotes). The name of the app is the command to launch the program.
+ </p>
+</note>
 
 </page>
diff --git a/gnome-help/C/shell-terminology.page b/gnome-help/C/shell-terminology.page
new file mode 100644
index 0000000..340b63d
--- /dev/null
+++ b/gnome-help/C/shell-terminology.page
@@ -0,0 +1,43 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="shell-terminology">
+
+  <info>
+    <link type="guide" xref="index#apps"/>
+    <desc>An overview of the terms that are used to describe different parts of the desktop.</desc>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="draft"/>
+    <credit type="author">
+      <name>GNOME Documentation Project</name>
+      <email>gnome-doc-list@gnome.org</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+<title>Activities overview, dash, top bar, workspaces - what are all of these things?</title>
+
+<!-- FIXME: THIS SHOULD BE ALPHABETICALLY SORTED -->
+
+<terms>
+ <item>
+  <title>Activities overview</title>
+  <p>The <em>activities overview</em> is the screen that's displayed when you click the <gui>Activities</gui> button at the top left of the screen.</p>
+ </item>
+ 
+ <item>
+  <title>Dash</title>
+  <p>The <em>dash</em> is the </p>
+ </item>
+ 
+ <item>
+  <title>Hot corner</title>
+  <p>The <em>hot corner</em> is the corner at the top left of the screen. When you move the pointer there, the activities overview opens.</p>
+ </item>
+ 
+ <item>
+  <title></title>
+  <p></p>
+ </item>
+</terms>
+
+</page>
diff --git a/gnome-help/C/windows-key.page b/gnome-help/C/windows-key.page
new file mode 100644
index 0000000..a803e95
--- /dev/null
+++ b/gnome-help/C/windows-key.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="windows-key">
+
+  <info>
+    <desc>The windows key opens the activities overview. You can usually find it next to the Alt key on your keyboard.</desc>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="draft"/>
+    <credit type="author">
+      <name>GNOME Documentation Project</name>
+      <email>gnome-doc-list@gnome.org</email>
+    </credit>
+    
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+<title>What is the "windows" key?</title>
+
+<p>When you press the "windows" key, the activities overview is displayed. This key can usually be found on the bottom-left of your keyboard, next to the <key>Alt</key> key, and often has a window/squares icon on it.</p>
+
+<p>If you have an Apple Mac, there will not be a windows key on your keyboard. The <key>Command (Cmnd)</key> key can be used instead.</p>
+
+<comment>
+ <p>Need to add info on changing the keybinding using the new preferences windows.</p>
+</comment>
+
+<!--
+<p>You can change which key is used to display the activities overview. Click your name on the top bar and click <gui>System Settings</gui>. Click <gui>Keyboard</gui> and change...</p>
+-->
+
+</page>