More editing of the navigation structure

18 files changed, 48 insertions, 12 deletions

diff --git a/gnome-help/C/look.page b/gnome-help/C/look.page
index 5a4f79d..b4392ef 100644
--- a/gnome-help/C/look.page
+++ b/gnome-help/C/look.page
@@ -2,7 +2,7 @@
       type="guide" id="look">
 
   <info>
-    <link type="guide" xref="index#look-feel"/>
+    <link type="guide" xref="prefs"/>
     
     <desc>XXXXXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-07-26" status="stub"/>
diff --git a/gnome-help/C/session-language.page b/gnome-help/C/session-language.page
index daba194..97f2990 100644
--- a/gnome-help/C/session-language.page
+++ b/gnome-help/C/session-language.page
@@ -3,7 +3,7 @@
       id="session-language">
 
   <info>
-    <link type="guide" xref="shell-prefs#session"/>
+    <link type="guide" xref="prefs#session"/>
     <desc>Switch language at login.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-02-25" status="candidate"/>
     <credit type="author">
diff --git a/gnome-help/C/session-loginsound.page b/gnome-help/C/session-loginsound.page
index 462069c..08e5c21 100644
--- a/gnome-help/C/session-loginsound.page
+++ b/gnome-help/C/session-loginsound.page
@@ -3,7 +3,7 @@
       id="session-loginsound">
 
   <info>
-    <link type="guide" xref="shell-prefs#sound"/>
+    <link type="guide" xref="prefs#sound"/>
     <desc></desc>
 
     <revision pkgversion="3.0" version="0.1" date="2011-03-15" status="candidate"/>
diff --git a/gnome-help/C/session-suspend.page b/gnome-help/C/session-suspend.page
index 69966c4..f3af381 100644
--- a/gnome-help/C/session-suspend.page
+++ b/gnome-help/C/session-suspend.page
@@ -3,7 +3,7 @@
       id="session-suspend">
 
   <info>
-    <link type="guide" xref="shell-prefs#session"/>
+    <link type="guide" xref="prefs#session"/>
     <desc></desc>
     <revision pkgversion="3.0" version="0.1" date="2010-10-31" status="candidate"/>
     <credit type="author">
diff --git a/gnome-help/C/session.page b/gnome-help/C/session.page
index 8a93cd1..8bd8e49 100644
--- a/gnome-help/C/session.page
+++ b/gnome-help/C/session.page
@@ -2,7 +2,7 @@
       type="guide"
       id="session">
 <info>
-    <link type="guide" xref="shell-prefs#session" />
+    <link type="guide" xref="prefs#session" />
     <credit type="author">
       <name>Natalia Ruz</name>
       <email>nruz@alumnos.inf.utfsm.cl</email>
diff --git a/gnome-help/C/shell-apps-favorites.page b/gnome-help/C/shell-apps-favorites.page
index 99a42ee..62a0556 100644
--- a/gnome-help/C/shell-apps-favorites.page
+++ b/gnome-help/C/shell-apps-favorites.page
@@ -3,7 +3,8 @@
       id="shell-apps-favorites">
 
   <info>
-    <link type="guide" xref="index#apps"/>
+    <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 2a1ccf9..3d215c1 100644
--- a/gnome-help/C/shell-apps-forcequit.page
+++ b/gnome-help/C/shell-apps-forcequit.page
@@ -4,7 +4,8 @@
 
   <info>
   
-    <link type="guide" xref="index#apps"/>
+    <link type="guide" xref="shell-overview" />
+    <link type="seealso" xref="shell-apps-open" />
     
     <desc>How to force quit any app.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-10" status="review"/>
diff --git a/gnome-help/C/shell-apps-install.page b/gnome-help/C/shell-apps-install.page
index 13b1d46..b13724b 100644
--- a/gnome-help/C/shell-apps-install.page
+++ b/gnome-help/C/shell-apps-install.page
@@ -4,7 +4,8 @@
 
   <info>
   
-    <link type="guide" xref="index#apps"/>
+    <link type="guide" xref="shell-overview" />
+    <link type="guide" xref="prefs" />
     
     <desc>Find and add programs.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="stub"/>
diff --git a/gnome-help/C/shell-apps-install.page.stub b/gnome-help/C/shell-apps-install.page.stub
index 65a459c..648f8e2 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="index#apps"/>
+    <link type="guide" xref="shell-overview" />
     
     <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 61efbe0..6ead1c1 100644
--- a/gnome-help/C/shell-apps-open.page
+++ b/gnome-help/C/shell-apps-open.page
@@ -4,6 +4,8 @@
 
   <info>
     <link type="guide" xref="index" group="shellintro" />
+    <link type="guide" xref="shell-overview" />
+    
     <desc>Launch apps from the the activities overview.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-03-18" status="review"/>
     <credit type="author">
diff --git a/gnome-help/C/shell-exit.page b/gnome-help/C/shell-exit.page
index 2199575..a3ea89a 100644
--- a/gnome-help/C/shell-exit.page
+++ b/gnome-help/C/shell-exit.page
@@ -5,6 +5,7 @@
   <info>
 
     <link type="guide" xref="index" group="shellintro" />
+    <link type="guide" xref="shell-overview" />
 
     <desc>Lock screen, switch user, log out or suspend or shutdown?</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-02-24" status="candidate"/>
diff --git a/gnome-help/C/shell-files.page b/gnome-help/C/shell-files.page
index ac6e0d4..544c4e0 100644
--- a/gnome-help/C/shell-files.page
+++ b/gnome-help/C/shell-files.page
@@ -5,6 +5,7 @@
   <info>
   
     <link type="guide" xref="index" group="shellintro" />
+    <link type="guide" xref="shell-overview" />
     
     <desc>Photos, music and documents.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="review"/>
diff --git a/gnome-help/C/shell-notifications.page b/gnome-help/C/shell-notifications.page
index 27b25e4..d0a85fc 100644
--- a/gnome-help/C/shell-notifications.page
+++ b/gnome-help/C/shell-notifications.page
@@ -4,7 +4,7 @@
 
   <info>
   
-    <link type="guide" xref="index#shell"/>
+    <link type="guide" xref="shell-overview" />
     
     <desc></desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="stub"/>
diff --git a/gnome-help/C/shell-overview.page b/gnome-help/C/shell-overview.page
new file mode 100644
index 0000000..2171e49
--- /dev/null
+++ b/gnome-help/C/shell-overview.page
@@ -0,0 +1,20 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="shell-overview">
+
+  <info>
+    <link type="guide" xref="index" group="shellintro" />
+    <desc>An overview of the 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>Overview of the desktop</title>
+
+
+</page>
diff --git a/gnome-help/C/shell-prefs.page b/gnome-help/C/shell-prefs.page.old
index 6546fc5..bbd6f20 100644
--- a/gnome-help/C/shell-prefs.page
+++ b/gnome-help/C/shell-prefs.page.old
@@ -4,7 +4,8 @@
 
   <info>
   
-    <link type="guide" xref="index#shell"/>
+    <link type="guide" xref="shell-overview" />
+    <link type="guide" xref="prefs" />
     
     <desc>Alter desktop settings.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="review"/>
diff --git a/gnome-help/C/shell-session-status.page b/gnome-help/C/shell-session-status.page
index 43f53d4..742f70f 100644
--- a/gnome-help/C/shell-session-status.page
+++ b/gnome-help/C/shell-session-status.page
@@ -4,7 +4,8 @@
 
   <info>
   
-    <link type="guide" xref="index#shell"/>
+    <link type="guide" xref="net"/>
+    <link type="guide" xref="shell-overview" />
     
     <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-18" status="review"/>
diff --git a/gnome-help/C/shell-terminology.page b/gnome-help/C/shell-terminology.page
index 2671685..d1339d9 100644
--- a/gnome-help/C/shell-terminology.page
+++ b/gnome-help/C/shell-terminology.page
@@ -4,6 +4,7 @@
 
   <info>
     <link type="guide" xref="index" group="shellintro" />
+    <link type="guide" xref="shell-overview" />
     <desc>An overview of terms 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">
@@ -40,6 +41,11 @@
  </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.</p>
+ </item>
+ 
+ <item>
   <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>
diff --git a/gnome-help/C/shell-windows.page b/gnome-help/C/shell-windows.page
index 79b59db..fa20c17 100644
--- a/gnome-help/C/shell-windows.page
+++ b/gnome-help/C/shell-windows.page
@@ -5,6 +5,7 @@
   <info>
 
     <link type="guide" xref="index" group="shellintro" />
+    <link type="guide" xref="shell-overview" />
 
     <desc>Move and organize your windows.</desc>