[gnome-help] desktop overview: re-organised topics

6 files changed, 64 insertions, 60 deletions

diff --git a/gnome-help/C/shell-files.page b/gnome-help/C/shell-files.page
index 27e8676..c829fe3 100644
--- a/gnome-help/C/shell-files.page
+++ b/gnome-help/C/shell-files.page
@@ -4,9 +4,9 @@
 
   <info>
   
-    <link type="guide" xref="shell"/>
+    <link type="guide" xref="index#shell"/>
     
-    <desc>Learn how you can manage files.</desc>
+    <desc>Photos, music and documents.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="stub"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -16,8 +16,24 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Documents, photos, music and other files</title>
+<title>Manage Files</title>
+  <!-- <p>Guide page, to aggregate ways of manipulating files.</p> -->
+  
+<section id="photos"><title>Photos</title>
+  <p>
+  </p>
+</section>
+
+<section id="music"><title>Music</title>
+  <p>
+  </p>
+</section>
+
+<section id="documents"><title>Documents</title>
+  <p>
+  </p>
+</section>
+   
 
-<p>Guide page, to aggregate ways of manipulating files.</p>
 
 </page>
diff --git a/gnome-help/C/shell-messages.page b/gnome-help/C/shell-messages.page
deleted file mode 100644
index 82cf64f..0000000
--- a/gnome-help/C/shell-messages.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="topic"
-      id="shell-messages">
-
-  <info>
-  
-    <link type="guide" xref="shell"/>
-    
-    <desc>If an application wants to get your attention, it'll show a notification at the bottom of the screen.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="stub"/>
-    <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>Messages and notifications</title>
-
-<p>Explain what messages/notifications are, why they are there, what you can do with them, replaying them, changing preferences etc.</p>
-
-</page>
diff --git a/gnome-help/C/shell-prefs.page b/gnome-help/C/shell-prefs.page
index c26c5b9..526d122 100644
--- a/gnome-help/C/shell-prefs.page
+++ b/gnome-help/C/shell-prefs.page
@@ -4,9 +4,9 @@
 
   <info>
   
-    <link type="guide" xref="shell"/>
+    <link type="guide" xref="index#shell"/>
     
-    <desc>Change settings, alter the appearance of your desktop, and so on.</desc>
+    <desc>Alter the appearance of your desktop.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="stub"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -16,8 +16,10 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Preferences</title>
+<title>Settings and Preferences</title>
 
+<!--
 <p>This is a guide for aggregating information about changing settings.</p>
+-->
 
 </page>
diff --git a/gnome-help/C/shell-session-exit.page b/gnome-help/C/shell-session-exit.page
deleted file mode 100644
index f67e69a..0000000
--- a/gnome-help/C/shell-session-exit.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="shell-session-exit">
-
-  <info>
-  
-    <link type="guide" xref="shell-session"/>
-    
-    <desc>When you leave your computer, you can put it in a different state in order to save power or allow other people to use it.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="stub"/>
-    <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>Log-out, turn-off, or send your computer to sleep</title>
-
-<p>Aggregate ways of exiting a session (this is a guide page). Brief overview of things you can do.</p>
-
-</page>
diff --git a/gnome-help/C/shell-session-status.page b/gnome-help/C/shell-session-status.page
index 665f092..c3a4051 100644
--- a/gnome-help/C/shell-session-status.page
+++ b/gnome-help/C/shell-session-status.page
@@ -4,9 +4,9 @@
 
   <info>
   
-    <link type="guide" xref="shell-session"/>
+    <link type="guide" xref="index#shell"/>
     
-    <desc>Change your availability so people will know not to start chats or call you when you are away or busy.</desc>
+    <desc>Change IM client status.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="stub"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -16,8 +16,10 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Change your availability</title>
+<title>Change Your Availability</title>
 
+<!--
 <p>Describe how you can change your IM client status using the status indicator applet.</p>
+-->
 
 </page>
diff --git a/gnome-help/C/shell-session.page b/gnome-help/C/shell-session.page
index 5098917..281c8a5 100644
--- a/gnome-help/C/shell-session.page
+++ b/gnome-help/C/shell-session.page
@@ -4,9 +4,9 @@
 
   <info>
   
-    <link type="guide" xref="shell"/>
+    <link type="guide" xref="index#shell"/>
     
-    <desc>You can shut down your computer, send it to sleep, or lock the screen. You can update your chat status too, so people can see that you're not available.</desc>
+    <desc>Shutdown, lock, or sleep?</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="stub"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -16,8 +16,38 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>When you leave/turn off your computer</title>
+<title>Computer Shutdown Options</title>
 
-<p>Aggregate session-related topics.</p>
+<section id = "logout"><title>Logout or Switch User</title>
+ <p>
+ </p>
+</section>
 
+<section id = "lock-screen"><title>Lock Screen</title>
+ <p>
+ </p>
+</section>
+
+<section id = "shut-down"><title>Shut Down Options</title>
+
+<terms>
+  <item>
+    <title>Shutdown</title>
+    <p>Ends your session and turns off the computer.</p>
+  </item>
+  <item>
+    <title>Restart</title>
+    <p>Ends your session and restarts the computer.</p>
+  </item>
+  <item>
+    <title>Suspend</title>
+    <p>Suspends your session quickly, using minimal power while the computer stands by.</p>
+  </item>
+    <item>
+    <title>Hibernatae</title>
+    <p>Suspends your session, using no power until the computer is restarted.</p>
+  </item>
+</terms>
+
+</section>
 </page>