From 912b3118d7ec3cffe49c034775a6b0553bb141f0 Mon Sep 17 00:00:00 2001
From: Phil Bull <philbull@gmail.com>
Date: Sun, 20 Mar 2011 16:17:46 -0400
Subject: Some restructuring of the shell- pages, change statuses of some
 guides

---
 gnome-help/C/files-arrange.page                |   1 +
 gnome-help/C/files-open.page                   |   2 +
 gnome-help/C/files-search.page                 |   2 +
 gnome-help/C/files.page                        |   1 +
 gnome-help/C/hardware-problems-bluetooth.page  |   4 +-
 gnome-help/C/hardware-problems-crashes.page    |   4 +-
 gnome-help/C/hardware-problems-graphics.page   |   4 +-
 gnome-help/C/hardware-problems-printing.page   |   4 +-
 gnome-help/C/hardware-problems-scanning.page   |   4 +-
 gnome-help/C/shell-apps-favorites.page         |   1 -
 gnome-help/C/shell-apps-forcequit.page         |   2 +-
 gnome-help/C/shell-apps-install.page.stub      |   2 +-
 gnome-help/C/shell-apps-open.page              |   2 +-
 gnome-help/C/shell-exit.page                   |   2 +-
 gnome-help/C/shell-files.page                  |   2 +-
 gnome-help/C/shell-messages.page               |   6 +-
 gnome-help/C/shell-overview.page               |  13 ++++
 gnome-help/C/shell-session-status.page         |   4 +-
 gnome-help/C/shell-terminology.page            |   2 +-
 gnome-help/C/shell-windows-switching.page      |   1 +
 gnome-help/C/shell-windows-workspaces-add.page | 101 -------------------------
 gnome-help/C/shell-windows-workspaces.page     |  85 +++++++++++++++++++--
 gnome-help/C/shell-windows.page                |   2 +-
 23 files changed, 122 insertions(+), 129 deletions(-)
 delete mode 100644 gnome-help/C/shell-windows-workspaces-add.page

diff --git a/gnome-help/C/files-arrange.page b/gnome-help/C/files-arrange.page
index 001b8e5..3fc70bb 100644
--- a/gnome-help/C/files-arrange.page
+++ b/gnome-help/C/files-arrange.page
@@ -3,6 +3,7 @@
 
   <info>
     <link type="guide" xref="files"/>
+    
     <desc>Learn how to sort and arrange files in a folder.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2011-02-26" status="review"/>
diff --git a/gnome-help/C/files-open.page b/gnome-help/C/files-open.page
index 1212a2e..bae1c6a 100644
--- a/gnome-help/C/files-open.page
+++ b/gnome-help/C/files-open.page
@@ -3,6 +3,8 @@
 
   <info>
     <link type="guide" xref="files#faq"/>
+    <link type="guide" xref="shel-overview#files"/>
+    
     <desc>Open files using non-default applications or change the default for a file type.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-06-16" status="candidate"/>
diff --git a/gnome-help/C/files-search.page b/gnome-help/C/files-search.page
index 9234197..9a6c0f7 100644
--- a/gnome-help/C/files-search.page
+++ b/gnome-help/C/files-search.page
@@ -3,6 +3,8 @@
 
   <info>
     <link type="guide" xref="files#search"/>
+    <link type="guide" xref="shel-overview#files"/>
+    
     <title type='link'>Search for files</title>
     <title type='text'>Search for files</title>
     <desc>How to find a file.</desc>
diff --git a/gnome-help/C/files.page b/gnome-help/C/files.page
index b4b9d75..bf900eb 100644
--- a/gnome-help/C/files.page
+++ b/gnome-help/C/files.page
@@ -5,6 +5,7 @@
     <revision version="0.1" date="2011-03-18" status="stub"/>
 
     <link type="guide" xref="index"/>
+    <link type="guide" xref="shell-overview#files"/>
 
     <credit type="author copyright">
       <name>Shaun McCance</name>
diff --git a/gnome-help/C/hardware-problems-bluetooth.page b/gnome-help/C/hardware-problems-bluetooth.page
index c488061..9ae0a8d 100644
--- a/gnome-help/C/hardware-problems-bluetooth.page
+++ b/gnome-help/C/hardware-problems-bluetooth.page
@@ -2,7 +2,7 @@
       type="guide" style="problem"
       id="hardware-problems-bluetooth">
   <info>
-    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="stub"/>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-20" status="review"/>
 
     <link type="guide" xref="hardware#problems"/>
 
@@ -13,7 +13,7 @@
     </credit>
 
     <desc>
-      Trouble-shoot problems with connecting your bluetooth device
+      Troubleshoot problems with connecting your bluetooth device.
     </desc>
   </info>
 
diff --git a/gnome-help/C/hardware-problems-crashes.page b/gnome-help/C/hardware-problems-crashes.page
index 7629069..02479f3 100644
--- a/gnome-help/C/hardware-problems-crashes.page
+++ b/gnome-help/C/hardware-problems-crashes.page
@@ -2,7 +2,7 @@
       type="guide"  style="problem"
       id="hardware-problems-crashes">
   <info>
-    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="stub"/>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-20" status="review"/>
 
     <link type="guide" xref="hardware#problems"/>
 
@@ -13,7 +13,7 @@
     </credit>
 
     <desc>
-      Trouble-shoot problems with computer crashes
+      Troubleshoot problems with computer crashes.
     </desc>
   </info>
 
diff --git a/gnome-help/C/hardware-problems-graphics.page b/gnome-help/C/hardware-problems-graphics.page
index 16294b3..3b32104 100644
--- a/gnome-help/C/hardware-problems-graphics.page
+++ b/gnome-help/C/hardware-problems-graphics.page
@@ -2,7 +2,7 @@
       type="guide"  style="problem"
       id="hardware-problems-graphics">
   <info>
-    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="stub"/>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-20" status="review"/>
 
     <link type="guide" xref="hardware#problems"/>
 
@@ -13,7 +13,7 @@
     </credit>
 
     <desc>
-      Trouble-shoot screen and graphics problems
+      Troubleshoot screen and graphics problems.
     </desc>
   </info>
 
diff --git a/gnome-help/C/hardware-problems-printing.page b/gnome-help/C/hardware-problems-printing.page
index 282eecc..39c058b 100644
--- a/gnome-help/C/hardware-problems-printing.page
+++ b/gnome-help/C/hardware-problems-printing.page
@@ -2,7 +2,7 @@
       type="guide" style="problem"
       id="hardware-problems-printing">
   <info>
-    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="stub"/>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-20" status="review"/>
 
     <link type="guide" xref="hardware#problems"/>
 
@@ -12,7 +12,7 @@
     </credit>
 
     <desc>
-      Trouble-shoot printing problems
+      Troubleshoot printing problems.
     </desc>
   </info>
 
diff --git a/gnome-help/C/hardware-problems-scanning.page b/gnome-help/C/hardware-problems-scanning.page
index 7b771cb..8988812 100644
--- a/gnome-help/C/hardware-problems-scanning.page
+++ b/gnome-help/C/hardware-problems-scanning.page
@@ -2,7 +2,7 @@
       type="guide" style="problem"
       id="hardware-problems-scanning">
   <info>
-    <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="stub"/>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-20" status="review"/>
 
     <link type="guide" xref="hardware#problems"/>
 
@@ -12,7 +12,7 @@
     </credit>
 
     <desc>
-      Trouble-shoot problems with your scanner
+      Troubleshoot problems with your scanner.
     </desc>
   </info>
 
diff --git a/gnome-help/C/shell-apps-favorites.page b/gnome-help/C/shell-apps-favorites.page
index 21fb9d4..2d06ed8 100644
--- a/gnome-help/C/shell-apps-favorites.page
+++ b/gnome-help/C/shell-apps-favorites.page
@@ -5,7 +5,6 @@
 
   <info>
     <link type="seealso" xref="shell-apps-open"/>
-    <link type="guide" xref="shell-overview" />
     
     <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"/>
diff --git a/gnome-help/C/shell-apps-forcequit.page b/gnome-help/C/shell-apps-forcequit.page
index 0c35edb..5c68173 100644
--- a/gnome-help/C/shell-apps-forcequit.page
+++ b/gnome-help/C/shell-apps-forcequit.page
@@ -5,8 +5,8 @@
 
   <info>
   
-    <link type="guide" xref="shell-overview" />
     <link type="seealso" xref="shell-apps-open" />
+    <link type="guide" xref="shell-windows#working-with-windows" />
     
     <desc>Make an application close if it stops responding.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-03-19" status="review"/>
diff --git a/gnome-help/C/shell-apps-install.page.stub b/gnome-help/C/shell-apps-install.page.stub
index 648f8e2..ba4b336 100644
--- a/gnome-help/C/shell-apps-install.page.stub
+++ b/gnome-help/C/shell-apps-install.page.stub
@@ -4,7 +4,7 @@
 
   <info>
   
-    <link type="guide" xref="shell-overview" />
+    <link type="guide" xref="shell-overview#apps" />
     
     <desc>Find and add programs that let you do new things with your computer.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="stub"/>
diff --git a/gnome-help/C/shell-apps-open.page b/gnome-help/C/shell-apps-open.page
index 9eb4388..d2b0e64 100644
--- a/gnome-help/C/shell-apps-open.page
+++ b/gnome-help/C/shell-apps-open.page
@@ -5,7 +5,7 @@
 
   <info>
     <link type="guide" xref="index" group="shellintro" />
-    <link type="guide" xref="shell-overview" />
+    <link type="guide" xref="shell-overview#apps" />
     
     <desc>Launch apps from the the activities overview.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="review"/>
diff --git a/gnome-help/C/shell-exit.page b/gnome-help/C/shell-exit.page
index 27729ed..754f3f5 100644
--- a/gnome-help/C/shell-exit.page
+++ b/gnome-help/C/shell-exit.page
@@ -5,7 +5,7 @@
   <info>
 
     <link type="guide" xref="index" group="shellintro" />
-    <link type="guide" xref="shell-overview" />
+    <link type="guide" xref="shell-overview#desktop" />
 
     <desc>Learn how to leave your user account, by logging out, switching user and so on.</desc>
     <!-- Should this be a guide which links to other topics? -->
diff --git a/gnome-help/C/shell-files.page b/gnome-help/C/shell-files.page
index c28b8c5..3e5255e 100644
--- a/gnome-help/C/shell-files.page
+++ b/gnome-help/C/shell-files.page
@@ -5,7 +5,7 @@
   <info>
   
     <link type="guide" xref="index" group="shellintro" />
-    <link type="guide" xref="shell-overview" />
+    <link type="guide" xref="shell-overview#files" />
     
     <desc>Photos, music and documents.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-03-19" status="incomplete"/>
diff --git a/gnome-help/C/shell-messages.page b/gnome-help/C/shell-messages.page
index 5dd0482..4703ef0 100644
--- a/gnome-help/C/shell-messages.page
+++ b/gnome-help/C/shell-messages.page
@@ -4,9 +4,9 @@
 
   <info>
   
-    <link type="guide" xref="shell-overview" />
+    <link type="guide" xref="shell-overview#desktop" />
     
-    <desc></desc>
+    <desc>Messages pop-up at the bottom of the screen telling you when certain events happen.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-03-19" status="stub"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -16,7 +16,7 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Notifications</title>
+<title>Pop-up messages</title>
 
 <!-- 
 <p>Explain what messages/notifications are, why they are there, what you can do with them, replaying them, changing preferences etc.</p>
diff --git a/gnome-help/C/shell-overview.page b/gnome-help/C/shell-overview.page
index 9b592a5..58095a0 100644
--- a/gnome-help/C/shell-overview.page
+++ b/gnome-help/C/shell-overview.page
@@ -17,6 +17,19 @@
   </info>
 
 <title>Overview of the desktop</title>
+
 <links type="topic" style="toronto"/>
 
+<section id="desktop" style="2column">
+ <title>The Desktop</title>
+</section>
+
+<section id="apps" style="2column">
+ <title>Applications and windows</title>
+</section>
+
+<section id="files" style="2column">
+ <title>Files and folders</title>
+</section>
+
 </page>
diff --git a/gnome-help/C/shell-session-status.page b/gnome-help/C/shell-session-status.page
index 6908e92..da8be48 100644
--- a/gnome-help/C/shell-session-status.page
+++ b/gnome-help/C/shell-session-status.page
@@ -5,8 +5,8 @@
 
   <info>
   
-    <link type="guide" xref="net"/>
-    <link type="guide" xref="shell-overview" />
+    <link type="guide" xref="shell-overview#desktop" />
+    <link type="guide" xref="web#chat" />
     
     <desc>Change your chat status to tell people if you're busy or available.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-03-19" status="review"/>
diff --git a/gnome-help/C/shell-terminology.page b/gnome-help/C/shell-terminology.page
index 1011ce2..e3b0441 100644
--- a/gnome-help/C/shell-terminology.page
+++ b/gnome-help/C/shell-terminology.page
@@ -4,7 +4,7 @@
 
   <info>
     <link type="guide" xref="index" group="shellintro" />
-    <link type="guide" xref="shell-overview" />
+    <link type="guide" xref="shell-overview#desktop" />
     
     <desc>An overview of terms used to describe different parts of the desktop.</desc>
     
diff --git a/gnome-help/C/shell-windows-switching.page b/gnome-help/C/shell-windows-switching.page
index 99042dd..6d2dab5 100644
--- a/gnome-help/C/shell-windows-switching.page
+++ b/gnome-help/C/shell-windows-switching.page
@@ -6,6 +6,7 @@
   <info>
   
     <link type="guide" xref="shell-windows#working-with-windows"/>
+    <link type="guide" xref="shell-overview#apps"/>
     
     <desc>Learn how to quickly switch between windows, using things like the Alt-Tab switcher.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-03-19" status="review"/>
diff --git a/gnome-help/C/shell-windows-workspaces-add.page b/gnome-help/C/shell-windows-workspaces-add.page
deleted file mode 100644
index 4973df7..0000000
--- a/gnome-help/C/shell-windows-workspaces-add.page
+++ /dev/null
@@ -1,101 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="topic"
-      style="task"
-      id="shell-windows-workspaces-add">
-
-  <info>
-
-    <link type="guide" xref="shell-windows#working-with-workspaces"/>
-    
-    <desc>Workspaces are added automatically; there's always one more workspace available in the activities overview.</desc>
-
-    <revision pkgversion="3.0" version="0.1" date="2011-03-19" status="candidate"/>
-    <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>Add a workspace</title>
-
- <p>In the <gui>Activities</gui> overview, move your cursor to the right-most side of the screen. A vertical panel will appear with your current workspaces plus an extra empty (having no open application windows on it) workspace.
- </p>
- <list>
- <item><p>
-  To add a workspace, move an application window from an existing workspace onto the empty workspace in the right panel.  To do this, click on an application window in a workspace and drag and drop it onto the empty workspace.  This workspace now contains the window you dropped into it, and a new empty workspace should appear at the bottom of the workspace panel.
-  </p></item>
-  <item><p>
-   To remove a workspace simply close all the window in it, or move the window onto a previous workspace.
-   </p>
-
-   </item>
-</list>
-
-<p>There is always at least one workspace.</p>
-
-
-<section id="switch">
- <title>Switch between workspaces</title>
-<terms>
-<item>
-  <title>From the <gui>Activities</gui> overview:</title>
-<p>
-  If you have multiple workspaces open, you can click on each workspace to view the open windows on each workspace.
-  </p>
-  </item>
- <item>
-    <title>From workspace and <gui>Activity</gui> overview:</title>
-<list>
-  <item><p>
-Press <keyseq><key>Ctrl</key><key>Alt</key><key>&#8593;</key></keyseq> to move to a workspace which is above the current workspace.
-</p></item>
-<item><p>
-
- Press <keyseq><key>Ctrl</key><key>Alt</key><key>&#8595;</key></keyseq> to move to a workspace which is below the current workspace.
-</p></item>
-</list>
-
-</item>
-</terms>
-
-</section>
-
-<section id="move">
- <title>Move windows to a different workspace</title>
- <p>
-You can move a window between workspaces.
-</p>
-<p>In a workspace:  </p>
-<steps>
-<item><p>
-Click on the window to make it <em>live</em>.
-</p></item>
-<item><list>
-<item><p>
-Press <keyseq><key>Ctrl</key><key>Alt</key><key>Shift</key><key>&#8593;</key></keyseq> to move the window to a workspace which is above the current workspace. </p></item>
-<item><p>
- Press <keyseq><key>Ctrl</key><key>Alt</key><key>Shift</key><key>	&#8595;</key></keyseq> to move the window to a workspace which is below the current workspace.
- </p></item>
-</list></item>
-</steps>
-
-<p>In the <gui>Activities</gui> overview:</p>
-
-<steps>
-<item><p>
-  Click and drag the window to the right of the screen.
-</p></item>
-<item><p>
-  The panel with the workspaces will appear.
-</p></item>
-<item><p>
-  Drop the window onto the empty workspace. This will move the window to a new workspace and a new empty workspace will be created.
-</p></item>
-</steps>
-</section>
-
-
-</page>
diff --git a/gnome-help/C/shell-windows-workspaces.page b/gnome-help/C/shell-windows-workspaces.page
index a9fd4b7..80414d0 100644
--- a/gnome-help/C/shell-windows-workspaces.page
+++ b/gnome-help/C/shell-windows-workspaces.page
@@ -1,25 +1,100 @@
 <page xmlns="http://projectmallard.org/1.0/"
       type="topic"
+      style="task"
       id="shell-windows-workspaces">
 
   <info>
 
     <link type="guide" xref="shell-windows#working-with-workspaces"/>
+    
+    <desc>Workspaces are added automatically; there's always one more workspace available in the activities overview.</desc>
 
-    <revision pkgversion="3.0" version="0.1" date="2011-03-19" status="review"/>
+    <revision pkgversion="3.0" version="0.1" date="2011-03-19" status="candidate"/>
     <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 a workspace, and how will it help me?</title>
 
-<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>In the <gui>Activities</gui> overview, move your cursor to the right-most side of the screen. A vertical panel will appear with your current workspaces plus an extra empty (having no open application windows on it) workspace.
+ </p>
+ <list>
+ <item><p>
+  To add a workspace, move an application window from an existing workspace onto the empty workspace in the right panel.  To do this, click on an application window in a workspace and drag and drop it onto the empty workspace.  This workspace now contains the window you dropped into it, and a new empty workspace should appear at the bottom of the workspace panel.
+  </p></item>
+  <item><p>
+   To remove a workspace simply close all the window in it, or move the window onto a previous workspace.
+   </p>
+
+   </item>
+</list>
+
+<p>There is always at least one workspace.</p>
+
+
+<section id="switch">
+ <title>Switch between workspaces</title>
+<terms>
+<item>
+  <title>From the <gui>Activities</gui> overview:</title>
+<p>
+  If you have multiple workspaces open, you can click on each workspace to view the open windows on each workspace.
+  </p>
+  </item>
+ <item>
+    <title>From workspace and <gui>Activity</gui> overview:</title>
+<list>
+  <item><p>
+Press <keyseq><key>Ctrl</key><key>Alt</key><key>&#8593;</key></keyseq> to move to a workspace which is above the current workspace.
+</p></item>
+<item><p>
+
+ Press <keyseq><key>Ctrl</key><key>Alt</key><key>&#8595;</key></keyseq> to move to a workspace which is below the current workspace.
+</p></item>
+</list>
+
+</item>
+</terms>
+
+</section>
+
+<section id="move">
+ <title>Move windows to a different workspace</title>
+ <p>
+You can move a window between workspaces.
+</p>
+<p>In a workspace:  </p>
+<steps>
+<item><p>
+Click on the window to make it <em>live</em>.
+</p></item>
+<item><list>
+<item><p>
+Press <keyseq><key>Ctrl</key><key>Alt</key><key>Shift</key><key>&#8593;</key></keyseq> to move the window to a workspace which is above the current workspace. </p></item>
+<item><p>
+ Press <keyseq><key>Ctrl</key><key>Alt</key><key>Shift</key><key>	&#8595;</key></keyseq> to move the window to a workspace which is below the current workspace.
+ </p></item>
+</list></item>
+</steps>
+
+<p>In the <gui>Activities</gui> overview:</p>
+
+<steps>
+<item><p>
+  Click and drag the window to the right of the screen.
+</p></item>
+<item><p>
+  The panel with the workspaces will appear.
+</p></item>
+<item><p>
+  Drop the window onto the empty workspace. This will move the window to a new workspace and a new empty workspace will be created.
+</p></item>
+</steps>
+</section>
 
-<p>You could use workspaces 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>
 </page>
diff --git a/gnome-help/C/shell-windows.page b/gnome-help/C/shell-windows.page
index 99f943a..b02ebc5 100644
--- a/gnome-help/C/shell-windows.page
+++ b/gnome-help/C/shell-windows.page
@@ -6,7 +6,7 @@
   <info>
 
     <link type="guide" xref="index" group="shellintro" />
-    <link type="guide" xref="shell-overview" />
+    <link type="guide" xref="shell-overview#apps" />
 
     <desc>Move and organize your windows.</desc>
 
-- 
cgit