From efde3041948294d280aa1315c365843c5122e3de Mon Sep 17 00:00:00 2001
From: Shaun McCance <shaunm@gnome.org>
Date: Mon, 20 Dec 2010 11:29:27 -0500
Subject: [gnome-help] Basic guide organization from Natalia Ruz

---
 gnome-help/C/a11y-feature.page.tmpl           | 35 +++++++++++++++++++++++++++
 gnome-help/C/clock-style.page                 |  2 +-
 gnome-help/C/clock-timezone.page              |  2 +-
 gnome-help/C/clock-weather.page               |  2 +-
 gnome-help/C/clock.page                       | 18 ++++++++++++++
 gnome-help/C/display-dim.page                 |  2 +-
 gnome-help/C/files-arrange.page               |  2 +-
 gnome-help/C/files-copy.page                  |  2 +-
 gnome-help/C/files-delete.page                |  2 +-
 gnome-help/C/files-hidden.page                |  2 +-
 gnome-help/C/files-listview-columns.page      |  1 +
 gnome-help/C/files-lost.page                  |  2 +-
 gnome-help/C/files-move.page                  |  2 +-
 gnome-help/C/files-open.page                  |  2 +-
 gnome-help/C/files-preview-music.page         |  1 +
 gnome-help/C/files-recover.page               |  2 +-
 gnome-help/C/files-renaming.page              |  2 +-
 gnome-help/C/files-special.page               |  2 +-
 gnome-help/C/files-tilde.page                 |  2 +-
 gnome-help/C/files.page                       | 10 +++++++-
 gnome-help/C/look-background-online.page      |  2 +-
 gnome-help/C/look-background.page             |  2 +-
 gnome-help/C/look-fonts-bigger.page           |  2 +-
 gnome-help/C/look-fonts-change.page           |  2 +-
 gnome-help/C/look-fonts-details.page          |  2 +-
 gnome-help/C/look-fonts-rendering.page        |  2 +-
 gnome-help/C/look-fonts-resolution.page       |  2 +-
 gnome-help/C/look-fonts-smoothing.page        |  2 +-
 gnome-help/C/look-fonts-toobig.page           |  2 +-
 gnome-help/C/look-theme-custom.page           |  2 +-
 gnome-help/C/look-theme-icons.page            |  2 +-
 gnome-help/C/look-theme-online.page           |  2 +-
 gnome-help/C/look-theme.page                  |  2 +-
 gnome-help/C/look-windowbuttons.page          |  2 +-
 gnome-help/C/look.page                        | 10 +++++++-
 gnome-help/C/mouse-wakeup.page                |  2 +-
 gnome-help/C/power-batterybroken.page         |  2 +-
 gnome-help/C/power-batterycapacity.page       |  2 +-
 gnome-help/C/power-batteryestimate.page       |  2 +-
 gnome-help/C/power-batterylife.page           |  2 +-
 gnome-help/C/power-batteryoptimal.page        |  2 +-
 gnome-help/C/power-batteryslow.page           |  2 +-
 gnome-help/C/power-batterywindows.page        |  2 +-
 gnome-help/C/power-brighter.page              |  2 +-
 gnome-help/C/power-closelid.page              |  2 +-
 gnome-help/C/power-constantfan.page           |  2 +-
 gnome-help/C/power-history.page               |  2 +-
 gnome-help/C/power-hotcomputer.page           |  2 +-
 gnome-help/C/power-lowpower.page              |  2 +-
 gnome-help/C/power-nowireless.page            |  2 +-
 gnome-help/C/power-othercountry.page          |  2 +-
 gnome-help/C/power-spindown.page              |  2 +-
 gnome-help/C/power-suspendfail.page           |  2 +-
 gnome-help/C/power-suspendhibernate.page      |  2 +-
 gnome-help/C/power-turnoffbutton.page         |  2 +-
 gnome-help/C/power-whydim.page                |  2 +-
 gnome-help/C/power-willnotturnon.page         |  2 +-
 gnome-help/C/power.page                       | 24 ++++++++++++++++++
 gnome-help/C/session-authmethods.page         |  2 +-
 gnome-help/C/session-changegdmtheme.page      |  2 +-
 gnome-help/C/session-exit.page                |  2 +-
 gnome-help/C/session-language.page            |  2 +-
 gnome-help/C/session-login.page               |  2 +-
 gnome-help/C/session-loginsound.page          |  2 +-
 gnome-help/C/session-netlogin.page            |  2 +-
 gnome-help/C/session-screenlocks.page         |  2 +-
 gnome-help/C/session-suspend.page             |  2 +-
 gnome-help/C/session-switchuser.page          |  2 +-
 gnome-help/C/session.page                     | 27 +++++++++++++++++++++
 gnome-help/C/time-change.page                 |  2 +-
 gnome-help/C/user-add.page                    |  2 +-
 gnome-help/C/user-addguest.page               |  2 +-
 gnome-help/C/user-admin-change.page           |  2 +-
 gnome-help/C/user-admin-explain.page          |  2 +-
 gnome-help/C/user-admin-privdescriptions.page |  2 +-
 gnome-help/C/user-admin-problems.page         |  2 +-
 gnome-help/C/user-admin-restrictothers.page   |  2 +-
 gnome-help/C/user-admin.page                  |  7 +++++-
 gnome-help/C/user-changepassword.page         |  2 +-
 gnome-help/C/user-changepicture.page          |  2 +-
 gnome-help/C/user-forgottenpassword.page      |  2 +-
 gnome-help/C/user-goodpassword.page           |  2 +-
 gnome-help/C/user-goodpassword.page.orig      | 24 ++++++++++++++++++
 83 files changed, 227 insertions(+), 76 deletions(-)
 create mode 100644 gnome-help/C/a11y-feature.page.tmpl
 create mode 100644 gnome-help/C/clock.page
 create mode 100644 gnome-help/C/power.page
 create mode 100644 gnome-help/C/session.page
 create mode 100644 gnome-help/C/user-goodpassword.page.orig

(limited to 'gnome-help')

diff --git a/gnome-help/C/a11y-feature.page.tmpl b/gnome-help/C/a11y-feature.page.tmpl
new file mode 100644
index 0000000..bee4d0f
--- /dev/null
+++ b/gnome-help/C/a11y-feature.page.tmpl
@@ -0,0 +1,35 @@
+<?yelp-tmpl-desc Description of how to accomplish a user task?>
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="a11y"
+      id="@ID@">
+  <info>
+    <link type="guide" xref="a11y"/>
+
+    <revision version="0.1" date="@DATE@" status="stub"/>
+
+    <credit type="author copyright">
+      <name>@NAME@</name>
+      <email>@EMAIL@</email>
+      <years>@YEAR@</years>
+    </credit>
+
+    <desc></desc>
+  </info>
+
+  <title>@TITLE@</title>
+
+  <comment>
+    <cite date="@DATE@" href="mailto:@EMAIL@">@NAME@</cite>
+    <p>This assumes the reader knows how to.... By the end of this page,
+    the reader will be able to....</p>
+  </comment>
+
+  <p>Short introductory text...</p>
+
+  <steps>
+    <item><p>First step...</p></item>
+    <item><p>Second step...</p></item>
+    <item><p>Third step...</p></item>
+  </steps>
+
+</page>
diff --git a/gnome-help/C/clock-style.page b/gnome-help/C/clock-style.page
index b62e3cf..733de65 100644
--- a/gnome-help/C/clock-style.page
+++ b/gnome-help/C/clock-style.page
@@ -3,7 +3,7 @@
       id="clock-style">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="clock"/>
     <desc>Display the time in 24-hour format, show the date, show seconds and so on.</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/clock-timezone.page b/gnome-help/C/clock-timezone.page
index b9f1016..e214654 100644
--- a/gnome-help/C/clock-timezone.page
+++ b/gnome-help/C/clock-timezone.page
@@ -3,7 +3,7 @@
       id="clock-timezone">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="clock"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/clock-weather.page b/gnome-help/C/clock-weather.page
index d67d016..a72c7cd 100644
--- a/gnome-help/C/clock-weather.page
+++ b/gnome-help/C/clock-weather.page
@@ -3,7 +3,7 @@
       id="clock-weather">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="clock"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/clock.page b/gnome-help/C/clock.page
new file mode 100644
index 0000000..84e4256
--- /dev/null
+++ b/gnome-help/C/clock.page
@@ -0,0 +1,18 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="clock">
+<info>
+    <link type="guide" xref="index" />
+    <credit type="author">
+      <name>Natalia Ruz</name>
+      <email>nruz@alumnos.inf.utfsm.cl</email>
+    </credit>
+    <license>Creative Commons Share Alike 3.0</license>
+    <!--<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />-->
+</info>
+
+<title>Clock Settings</title>
+
+
+
+</page>
diff --git a/gnome-help/C/display-dim.page b/gnome-help/C/display-dim.page
index 3edc533..2ee3f72 100644
--- a/gnome-help/C/display-dim.page
+++ b/gnome-help/C/display-dim.page
@@ -4,7 +4,7 @@
       id="display-dim">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="look#style"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/files-arrange.page b/gnome-help/C/files-arrange.page
index 2bb786c..df802d2 100644
--- a/gnome-help/C/files-arrange.page
+++ b/gnome-help/C/files-arrange.page
@@ -2,7 +2,7 @@
       type="topic" id="files-arrange">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#management"/>
     <desc>Learn how to sort and arrange files in a folder.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-07-26" status="draft"/>
diff --git a/gnome-help/C/files-copy.page b/gnome-help/C/files-copy.page
index 0decd5b..571fc5a 100644
--- a/gnome-help/C/files-copy.page
+++ b/gnome-help/C/files-copy.page
@@ -2,7 +2,7 @@
       type="topic" id="files-copy">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#management"/>
     <link type="seealso" xref="files-move"/>
     <desc>Make a copy of a file or folder in a new location.</desc>
 
diff --git a/gnome-help/C/files-delete.page b/gnome-help/C/files-delete.page
index 518ad18..2ab7263 100644
--- a/gnome-help/C/files-delete.page
+++ b/gnome-help/C/files-delete.page
@@ -2,7 +2,7 @@
       type="topic" id="files-delete">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#management"/>
     <desc>Remove files or folders you no longer need.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-06-16" status="final"/>
diff --git a/gnome-help/C/files-hidden.page b/gnome-help/C/files-hidden.page
index 6ebac36..b5f493a 100644
--- a/gnome-help/C/files-hidden.page
+++ b/gnome-help/C/files-hidden.page
@@ -2,7 +2,7 @@
       type="topic" id="files-hidden">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#others"/>
     <desc>Make a file invisible, so you can't see it in the file browser.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-07-25" status="draft"/>
diff --git a/gnome-help/C/files-listview-columns.page b/gnome-help/C/files-listview-columns.page
index ba8c38f..7eedc03 100644
--- a/gnome-help/C/files-listview-columns.page
+++ b/gnome-help/C/files-listview-columns.page
@@ -2,6 +2,7 @@
       type="topic" id="files-listview-columns">
 
   <info>
+    <link type="guide" xref="files#others"/>
     <desc>Descriptions of the columns of information that can be viewed in the file browser's list view.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-07-26" status="stub"/>
diff --git a/gnome-help/C/files-lost.page b/gnome-help/C/files-lost.page
index 0211581..45c4cee 100644
--- a/gnome-help/C/files-lost.page
+++ b/gnome-help/C/files-lost.page
@@ -2,7 +2,7 @@
       type="topic" id="files-lost">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#others"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/files-move.page b/gnome-help/C/files-move.page
index c6dbf5a..03b017d 100644
--- a/gnome-help/C/files-move.page
+++ b/gnome-help/C/files-move.page
@@ -2,7 +2,7 @@
       type="topic" id="files-move">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#management"/>
     <link type="seealso" xref="files-copy"/>
     <desc>Relocate a file or folder to a new location.</desc>
 
diff --git a/gnome-help/C/files-open.page b/gnome-help/C/files-open.page
index 72a6dcd..9d96499 100644
--- a/gnome-help/C/files-open.page
+++ b/gnome-help/C/files-open.page
@@ -2,7 +2,7 @@
       type="topic" id="files-open">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#management"/>
     <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="final"/>
diff --git a/gnome-help/C/files-preview-music.page b/gnome-help/C/files-preview-music.page
index 12034e2..296f2fa 100644
--- a/gnome-help/C/files-preview-music.page
+++ b/gnome-help/C/files-preview-music.page
@@ -2,6 +2,7 @@
       type="topic" id="files-preview-music">
 
   <info>
+    <link type="guide" xref="files#others"/>
     <desc>Move the mouse pointer over a music file and it will start playing.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-07-26" status="draft"/>
diff --git a/gnome-help/C/files-recover.page b/gnome-help/C/files-recover.page
index cc53d54..a78c3d8 100644
--- a/gnome-help/C/files-recover.page
+++ b/gnome-help/C/files-recover.page
@@ -2,7 +2,7 @@
       type="topic" id="files-recover">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/files-renaming.page b/gnome-help/C/files-renaming.page
index e66e6b0..46f66dd 100644
--- a/gnome-help/C/files-renaming.page
+++ b/gnome-help/C/files-renaming.page
@@ -2,7 +2,7 @@
       type="topic" id="files-renaming">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#management"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/files-special.page b/gnome-help/C/files-special.page
index 045a710..ffb73a9 100644
--- a/gnome-help/C/files-special.page
+++ b/gnome-help/C/files-special.page
@@ -2,7 +2,7 @@
       type="topic" id="files-special">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#others"/>
     <desc>Use emblems to label a file.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-07-25" status="draft"/>
diff --git a/gnome-help/C/files-tilde.page b/gnome-help/C/files-tilde.page
index 3a0f062..2ceec1a 100644
--- a/gnome-help/C/files-tilde.page
+++ b/gnome-help/C/files-tilde.page
@@ -2,7 +2,7 @@
       type="topic" id="files-tilde">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#problems"/>
     <link type="seealso" xref="files-hidden"/>
     <desc>Files with a "~" at the end of their name (e.g. <file>example.txt~</file>) are hidden files.</desc>
 
diff --git a/gnome-help/C/files.page b/gnome-help/C/files.page
index 0eae7eb..e5348ce 100644
--- a/gnome-help/C/files.page
+++ b/gnome-help/C/files.page
@@ -17,5 +17,13 @@
   </info>
 
 <title>Files and folders</title>
-
+<section id="management" style="2column">
+    <title>How to manage your files and folders</title>
+</section>
+<section id="others" style="2column">
+    <title>More about files and folders management</title>
+</section>
+<section id="problems" style="2column">
+    <title>Common problems</title>
+</section>
 </page>
diff --git a/gnome-help/C/look-background-online.page b/gnome-help/C/look-background-online.page
index 1278e29..8ea9c90 100644
--- a/gnome-help/C/look-background-online.page
+++ b/gnome-help/C/look-background-online.page
@@ -2,7 +2,7 @@
       type="topic" id="look-background-online">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#customize"/>
     <link type="seealso" xref="look-background"/>
     
     <desc>How to get desktop backgrounds or wallpapers online</desc>
diff --git a/gnome-help/C/look-background.page b/gnome-help/C/look-background.page
index 9616ef6..61e6522 100644
--- a/gnome-help/C/look-background.page
+++ b/gnome-help/C/look-background.page
@@ -2,7 +2,7 @@
       type="topic" id="look-background">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#customize"/>
     
     <desc>How to change the desktop background</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-08-03" status="review"/>
diff --git a/gnome-help/C/look-fonts-bigger.page b/gnome-help/C/look-fonts-bigger.page
index 0911a12..cdf4050 100644
--- a/gnome-help/C/look-fonts-bigger.page
+++ b/gnome-help/C/look-fonts-bigger.page
@@ -2,7 +2,7 @@
       type="topic" id="look-fonts-bigger">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#style"/>
     <link type="seealso" xref="look-fonts-change"/>
     
     <desc>How to make the text on screen bigger</desc>
diff --git a/gnome-help/C/look-fonts-change.page b/gnome-help/C/look-fonts-change.page
index 4ffa6a2..8d68721 100644
--- a/gnome-help/C/look-fonts-change.page
+++ b/gnome-help/C/look-fonts-change.page
@@ -2,7 +2,7 @@
       type="topic" id="look-fonts-change">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#style"/>
     
     <desc>How to modify font preferences</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-08-03" status="review"/>
diff --git a/gnome-help/C/look-fonts-details.page b/gnome-help/C/look-fonts-details.page
index cf70dbe..d8c1059 100644
--- a/gnome-help/C/look-fonts-details.page
+++ b/gnome-help/C/look-fonts-details.page
@@ -2,7 +2,7 @@
       type="topic" id="look-fonts-details">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#problems"/>
     <link type="seealso" xref="look-fonts-change"/>
     
     <desc>XXXXXX</desc>
diff --git a/gnome-help/C/look-fonts-rendering.page b/gnome-help/C/look-fonts-rendering.page
index 6a57a49..68ca04e 100644
--- a/gnome-help/C/look-fonts-rendering.page
+++ b/gnome-help/C/look-fonts-rendering.page
@@ -2,7 +2,7 @@
       type="topic" id="look-fonts-rendering">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#problems"/>
     
     <desc>XXXXXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-07-26" status="stub"/>
diff --git a/gnome-help/C/look-fonts-resolution.page b/gnome-help/C/look-fonts-resolution.page
index 561d25b..f66a819 100644
--- a/gnome-help/C/look-fonts-resolution.page
+++ b/gnome-help/C/look-fonts-resolution.page
@@ -2,7 +2,7 @@
       type="topic" id="look-fonts-resolution">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#problems"/>
     
     <desc>The font resolution governs the amount of detail used to display letters on the screen</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-08-23" status="draft"/>
diff --git a/gnome-help/C/look-fonts-smoothing.page b/gnome-help/C/look-fonts-smoothing.page
index e642c04..0aae57c 100644
--- a/gnome-help/C/look-fonts-smoothing.page
+++ b/gnome-help/C/look-fonts-smoothing.page
@@ -2,7 +2,7 @@
       type="topic" id="look-fonts-smoothing">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#problems"/>
     
     <desc>XXXXXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-07-26" status="stub"/>
diff --git a/gnome-help/C/look-fonts-toobig.page b/gnome-help/C/look-fonts-toobig.page
index c2af4f5..ef934d1 100644
--- a/gnome-help/C/look-fonts-toobig.page
+++ b/gnome-help/C/look-fonts-toobig.page
@@ -2,7 +2,7 @@
       type="topic" id="look-fonts-toobig">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#problems"/>
     
     <desc>How to change the screen resolution</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-08-23" status="review"/>
diff --git a/gnome-help/C/look-theme-custom.page b/gnome-help/C/look-theme-custom.page
index e58d890..95288f5 100644
--- a/gnome-help/C/look-theme-custom.page
+++ b/gnome-help/C/look-theme-custom.page
@@ -2,7 +2,7 @@
       type="topic" id="look-theme-custom">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#customize"/>
     <link type="seealso" xref="mouse-cursor-size" />
     <link type="seealso" xref="mouse-cursor-style" />
     <link type="seealso" xref="mouse-highlightcolor" />
diff --git a/gnome-help/C/look-theme-icons.page b/gnome-help/C/look-theme-icons.page
index ca7bb4c..b3a5cd4 100644
--- a/gnome-help/C/look-theme-icons.page
+++ b/gnome-help/C/look-theme-icons.page
@@ -2,7 +2,7 @@
       type="topic" id="look-theme-icons">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#style"/>
     
     <desc>How to change system icons</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-08-23" status="review"/>
diff --git a/gnome-help/C/look-theme-online.page b/gnome-help/C/look-theme-online.page
index 3cb592f..761a17f 100644
--- a/gnome-help/C/look-theme-online.page
+++ b/gnome-help/C/look-theme-online.page
@@ -2,7 +2,7 @@
       type="topic" id="look-theme-online">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#customize"/>
     
     <desc>How to download themes from the internet</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-08-23" status="review"/>
diff --git a/gnome-help/C/look-theme.page b/gnome-help/C/look-theme.page
index 07178e7..ade12de 100644
--- a/gnome-help/C/look-theme.page
+++ b/gnome-help/C/look-theme.page
@@ -2,7 +2,7 @@
       type="topic" id="look-theme">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#customize"/>
     
     <desc>How to change the appearance of your desktop</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-08-23" status="review"/>
diff --git a/gnome-help/C/look-windowbuttons.page b/gnome-help/C/look-windowbuttons.page
index e2ae8ee..dbc4ed8 100644
--- a/gnome-help/C/look-windowbuttons.page
+++ b/gnome-help/C/look-windowbuttons.page
@@ -2,7 +2,7 @@
       type="topic" id="look-windowbuttons">
 
   <info>
-    <link type="guide" xref="look"/>
+    <link type="guide" xref="look#style"/>
     
     <desc>How to change the layout of the window buttons</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-08-12" status="review"/>
diff --git a/gnome-help/C/look.page b/gnome-help/C/look.page
index 903f77a..751810e 100644
--- a/gnome-help/C/look.page
+++ b/gnome-help/C/look.page
@@ -15,5 +15,13 @@
   </info>
 
 <title>Look and Feel</title>
-	
+	<section id="style" style="2column">
+	    <title>Change the look and feel of your computer</title>
+	</section>
+	<section id="customize" style="2column">
+	    <title>Get and customize themes and backgrounds</title>
+	</section>
+	<section id="problems" style="2column">
+	    <title>Common problems</title>
+	</section>
 </page>
diff --git a/gnome-help/C/mouse-wakeup.page b/gnome-help/C/mouse-wakeup.page
index bc62b92..ae55f9a 100644
--- a/gnome-help/C/mouse-wakeup.page
+++ b/gnome-help/C/mouse-wakeup.page
@@ -4,7 +4,7 @@
       id="mouse-wakeup">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="mouse#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-batterybroken.page b/gnome-help/C/power-batterybroken.page
index 0296b07..a573a40 100644
--- a/gnome-help/C/power-batterybroken.page
+++ b/gnome-help/C/power-batterybroken.page
@@ -4,7 +4,7 @@
       id="power-batterybroken">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#battery"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-batterycapacity.page b/gnome-help/C/power-batterycapacity.page
index 651c0d0..378ec5a 100644
--- a/gnome-help/C/power-batterycapacity.page
+++ b/gnome-help/C/power-batterycapacity.page
@@ -4,7 +4,7 @@
       id="power-batterycapacity">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#battery"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-batteryestimate.page b/gnome-help/C/power-batteryestimate.page
index 25cb0d4..ba6fd43 100644
--- a/gnome-help/C/power-batteryestimate.page
+++ b/gnome-help/C/power-batteryestimate.page
@@ -4,7 +4,7 @@
       id="power-batteryestimate">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#battery"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-batterylife.page b/gnome-help/C/power-batterylife.page
index 79228ba..490014c 100644
--- a/gnome-help/C/power-batterylife.page
+++ b/gnome-help/C/power-batterylife.page
@@ -4,7 +4,7 @@
       id="power-batterylife">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#battery"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-batteryoptimal.page b/gnome-help/C/power-batteryoptimal.page
index fad9303..c44a9b8 100644
--- a/gnome-help/C/power-batteryoptimal.page
+++ b/gnome-help/C/power-batteryoptimal.page
@@ -4,7 +4,7 @@
       id="power-batteryoptimal">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#battery"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-batteryslow.page b/gnome-help/C/power-batteryslow.page
index dbb8186..673f70c 100644
--- a/gnome-help/C/power-batteryslow.page
+++ b/gnome-help/C/power-batteryslow.page
@@ -4,7 +4,7 @@
       id="power-batteryslow">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#battery"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-batterywindows.page b/gnome-help/C/power-batterywindows.page
index 0f75d41..72440ca 100644
--- a/gnome-help/C/power-batterywindows.page
+++ b/gnome-help/C/power-batterywindows.page
@@ -4,7 +4,7 @@
       id="power-batterywindows">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#battery"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-brighter.page b/gnome-help/C/power-brighter.page
index cc3b836..3046b4d 100644
--- a/gnome-help/C/power-brighter.page
+++ b/gnome-help/C/power-brighter.page
@@ -4,7 +4,7 @@
       id="power-brighter">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-closelid.page b/gnome-help/C/power-closelid.page
index 79ee540..5e982e4 100644
--- a/gnome-help/C/power-closelid.page
+++ b/gnome-help/C/power-closelid.page
@@ -4,7 +4,7 @@
       id="power-closelid">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-constantfan.page b/gnome-help/C/power-constantfan.page
index f0d5ef6..8abca1b 100644
--- a/gnome-help/C/power-constantfan.page
+++ b/gnome-help/C/power-constantfan.page
@@ -4,7 +4,7 @@
       id="power-constantfan">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-history.page b/gnome-help/C/power-history.page
index ff01686..8457c34 100644
--- a/gnome-help/C/power-history.page
+++ b/gnome-help/C/power-history.page
@@ -4,7 +4,7 @@
       id="power-history">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#battery"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-hotcomputer.page b/gnome-help/C/power-hotcomputer.page
index 5a41de9..b069c2e 100644
--- a/gnome-help/C/power-hotcomputer.page
+++ b/gnome-help/C/power-hotcomputer.page
@@ -4,7 +4,7 @@
       id="power-hotcomputer">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-lowpower.page b/gnome-help/C/power-lowpower.page
index 55fab1b..d65e902 100644
--- a/gnome-help/C/power-lowpower.page
+++ b/gnome-help/C/power-lowpower.page
@@ -4,7 +4,7 @@
       id="power-lowpower">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#battery"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-nowireless.page b/gnome-help/C/power-nowireless.page
index ae6c222..0f98255 100644
--- a/gnome-help/C/power-nowireless.page
+++ b/gnome-help/C/power-nowireless.page
@@ -4,7 +4,7 @@
       id="power-nowireless">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-othercountry.page b/gnome-help/C/power-othercountry.page
index b194fe6..c6bda43 100644
--- a/gnome-help/C/power-othercountry.page
+++ b/gnome-help/C/power-othercountry.page
@@ -4,7 +4,7 @@
       id="power-othercountry">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-spindown.page b/gnome-help/C/power-spindown.page
index e481624..e873f8f 100644
--- a/gnome-help/C/power-spindown.page
+++ b/gnome-help/C/power-spindown.page
@@ -4,7 +4,7 @@
       id="power-spindown">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-suspendfail.page b/gnome-help/C/power-suspendfail.page
index c2acbf0..e99f068 100644
--- a/gnome-help/C/power-suspendfail.page
+++ b/gnome-help/C/power-suspendfail.page
@@ -4,7 +4,7 @@
       id="power-suspendfail">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-suspendhibernate.page b/gnome-help/C/power-suspendhibernate.page
index 09cd779..970a72c 100644
--- a/gnome-help/C/power-suspendhibernate.page
+++ b/gnome-help/C/power-suspendhibernate.page
@@ -4,7 +4,7 @@
       id="power-suspendhibernate">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-turnoffbutton.page b/gnome-help/C/power-turnoffbutton.page
index 70bde1c..bda2f7e 100644
--- a/gnome-help/C/power-turnoffbutton.page
+++ b/gnome-help/C/power-turnoffbutton.page
@@ -4,7 +4,7 @@
       id="power-turnoffbutton">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#preferences"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-whydim.page b/gnome-help/C/power-whydim.page
index b4921a5..067843b 100644
--- a/gnome-help/C/power-whydim.page
+++ b/gnome-help/C/power-whydim.page
@@ -4,7 +4,7 @@
       id="power-whydim">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power-willnotturnon.page b/gnome-help/C/power-willnotturnon.page
index 23e0eb5..963ff93 100644
--- a/gnome-help/C/power-willnotturnon.page
+++ b/gnome-help/C/power-willnotturnon.page
@@ -4,7 +4,7 @@
       id="power-willnotturnon">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="power#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-06-29" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/power.page b/gnome-help/C/power.page
new file mode 100644
index 0000000..da302a8
--- /dev/null
+++ b/gnome-help/C/power.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="power">
+<info>
+    <link type="guide" xref="index" />
+    <credit type="author">
+      <name>Natalia Ruz</name>
+      <email>nruz@alumnos.inf.utfsm.cl</email>
+    </credit>
+    <license>Creative Commons Share Alike 3.0</license>
+    <!--<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />-->
+</info>
+
+<title>Power Settings</title>
+
+<section id="battery" style="2column">
+    <title>Facts and problems related with your laptop battery</title>
+</section>
+
+<section id="problems" style="2column">
+    <title>Common problems</title>
+</section>
+
+</page>
diff --git a/gnome-help/C/session-authmethods.page b/gnome-help/C/session-authmethods.page
index e1c6d09..0319236 100644
--- a/gnome-help/C/session-authmethods.page
+++ b/gnome-help/C/session-authmethods.page
@@ -3,7 +3,7 @@
       id="session-authmethods">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="session#login"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/session-changegdmtheme.page b/gnome-help/C/session-changegdmtheme.page
index b241443..322bffd 100644
--- a/gnome-help/C/session-changegdmtheme.page
+++ b/gnome-help/C/session-changegdmtheme.page
@@ -3,7 +3,7 @@
       id="session-changegdmtheme">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="session#style"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/session-exit.page b/gnome-help/C/session-exit.page
index e1267dc..d274706 100644
--- a/gnome-help/C/session-exit.page
+++ b/gnome-help/C/session-exit.page
@@ -3,7 +3,7 @@
       id="session-exit">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="session#login"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/session-language.page b/gnome-help/C/session-language.page
index 06ca2df..c3848d8 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="index"/>
+    <link type="guide" xref="session#style"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/session-login.page b/gnome-help/C/session-login.page
index f24ad9d..dcebfbb 100644
--- a/gnome-help/C/session-login.page
+++ b/gnome-help/C/session-login.page
@@ -3,7 +3,7 @@
       id="session-login">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="session#login"/>
     <desc>Accessibility options, session types and other log-in screen options.</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/session-loginsound.page b/gnome-help/C/session-loginsound.page
index f926b07..56df951 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="index"/>
+    <link type="guide" xref="session#style"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/session-netlogin.page b/gnome-help/C/session-netlogin.page
index 4a1bd91..6ee3f3d 100644
--- a/gnome-help/C/session-netlogin.page
+++ b/gnome-help/C/session-netlogin.page
@@ -3,7 +3,7 @@
       id="session-netlogin">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="session#login"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/session-screenlocks.page b/gnome-help/C/session-screenlocks.page
index 4ab79ef..d666528 100644
--- a/gnome-help/C/session-screenlocks.page
+++ b/gnome-help/C/session-screenlocks.page
@@ -3,7 +3,7 @@
       id="session-screenlocks">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="session#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/session-suspend.page b/gnome-help/C/session-suspend.page
index 4d01afd..da853ce 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="index"/>
+    <link type="guide" xref="session#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/session-switchuser.page b/gnome-help/C/session-switchuser.page
index eef4114..fd8760c 100644
--- a/gnome-help/C/session-switchuser.page
+++ b/gnome-help/C/session-switchuser.page
@@ -3,7 +3,7 @@
       id="session-switchuser">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="session#login"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/session.page b/gnome-help/C/session.page
new file mode 100644
index 0000000..d699485
--- /dev/null
+++ b/gnome-help/C/session.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="session">
+<info>
+    <link type="guide" xref="index" />
+    <credit type="author">
+      <name>Natalia Ruz</name>
+      <email>nruz@alumnos.inf.utfsm.cl</email>
+    </credit>
+    <license>Creative Commons Share Alike 3.0</license>
+    <!--<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />-->
+</info>
+
+<title>Session Settings</title>
+
+<section id="login" style="2column">
+    <title>Log-in and Log-out facts</title>
+</section>
+
+<section id="style" style="2column">
+    <title>Change appearance and set your preferences</title>
+</section>
+
+<section id="problems" style="2column">
+    <title>Common Problems</title>
+</section>
+</page>
diff --git a/gnome-help/C/time-change.page b/gnome-help/C/time-change.page
index 894e2df..77bfac3 100644
--- a/gnome-help/C/time-change.page
+++ b/gnome-help/C/time-change.page
@@ -3,7 +3,7 @@
       id="time-change">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="clock"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-add.page b/gnome-help/C/user-add.page
index 81af057..9ce3417 100644
--- a/gnome-help/C/user-add.page
+++ b/gnome-help/C/user-add.page
@@ -3,7 +3,7 @@
       id="user-add">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="user-admin#manage"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-addguest.page b/gnome-help/C/user-addguest.page
index f0eb986..8031a89 100644
--- a/gnome-help/C/user-addguest.page
+++ b/gnome-help/C/user-addguest.page
@@ -3,7 +3,7 @@
       id="user-addguest">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="user-admin#manage"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-admin-change.page b/gnome-help/C/user-admin-change.page
index 2916576..8fc4c67 100644
--- a/gnome-help/C/user-admin-change.page
+++ b/gnome-help/C/user-admin-change.page
@@ -3,7 +3,7 @@
       id="user-admin-change">
 
   <info>
-    <link type="guide" xref="user-admin"/>
+    <link type="guide" xref="user-admin#manage"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-admin-explain.page b/gnome-help/C/user-admin-explain.page
index dd1833b..c78cbd9 100644
--- a/gnome-help/C/user-admin-explain.page
+++ b/gnome-help/C/user-admin-explain.page
@@ -3,7 +3,7 @@
       id="user-admin-explain">
 
   <info>
-    <link type="guide" xref="user-admin"/>
+    <link type="guide" xref="user-admin#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-admin-privdescriptions.page b/gnome-help/C/user-admin-privdescriptions.page
index e420985..dac44a7 100644
--- a/gnome-help/C/user-admin-privdescriptions.page
+++ b/gnome-help/C/user-admin-privdescriptions.page
@@ -3,7 +3,7 @@
       id="user-admin-privdescriptions">
 
   <info>
-    <link type="guide" xref="user-admin"/>
+    <link type="guide" xref="user-admin#manage"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-admin-problems.page b/gnome-help/C/user-admin-problems.page
index b674568..93d160d 100644
--- a/gnome-help/C/user-admin-problems.page
+++ b/gnome-help/C/user-admin-problems.page
@@ -3,7 +3,7 @@
       id="user-admin-problems">
 
   <info>
-    <link type="guide" xref="user-admin"/>
+    <link type="guide" xref="user-admin#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-admin-restrictothers.page b/gnome-help/C/user-admin-restrictothers.page
index 534fcda..1109993 100644
--- a/gnome-help/C/user-admin-restrictothers.page
+++ b/gnome-help/C/user-admin-restrictothers.page
@@ -3,7 +3,7 @@
       id="user-admin-restrictothers">
 
   <info>
-    <link type="guide" xref="user-admin"/>
+    <link type="guide" xref="user-admin#manage"/>
     <desc>Lock down the computer by stopping others from accessing external disks, changing system settings, installing software, or connecting to other networks.</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-admin.page b/gnome-help/C/user-admin.page
index b4322c2..d44ca6c 100644
--- a/gnome-help/C/user-admin.page
+++ b/gnome-help/C/user-admin.page
@@ -15,7 +15,12 @@
   </info>
 
   <title>Administrators - user accounts with special privileges</title>
-  
+  <section id="manage" style="2column">
+    <title>Managing accounts</title>
+</section>
+<section id="problems" style="2column">
+    <title>Common Problems</title>
+</section>
   <comment>
    <cite date="2010-10-31" href="mailto:gnome-doc-list@gnome.org">GNOME Documentation Project</cite>
    <p>Collect together topics on administrative user accounts</p>
diff --git a/gnome-help/C/user-changepassword.page b/gnome-help/C/user-changepassword.page
index 6f6861f..2e4f7ed 100644
--- a/gnome-help/C/user-changepassword.page
+++ b/gnome-help/C/user-changepassword.page
@@ -3,7 +3,7 @@
       id="user-changepassword">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="user-admin#manage"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-changepicture.page b/gnome-help/C/user-changepicture.page
index b711e3a..dbf33f5 100644
--- a/gnome-help/C/user-changepicture.page
+++ b/gnome-help/C/user-changepicture.page
@@ -3,7 +3,7 @@
       id="user-changepicture">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="user-admin#manage"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-forgottenpassword.page b/gnome-help/C/user-forgottenpassword.page
index fc9307b..e8d8783 100644
--- a/gnome-help/C/user-forgottenpassword.page
+++ b/gnome-help/C/user-forgottenpassword.page
@@ -3,7 +3,7 @@
       id="user-forgottenpassword">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="user-admin#problems"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-goodpassword.page b/gnome-help/C/user-goodpassword.page
index c5a8ebc..d39d89a 100644
--- a/gnome-help/C/user-goodpassword.page
+++ b/gnome-help/C/user-goodpassword.page
@@ -3,7 +3,7 @@
       id="user-goodpassword">
 
   <info>
-    <link type="guide" xref="index"/>
+    <link type="guide" xref="user-admin#manage"/>
     <desc>XXX</desc>
     <revision pkgversion="0.1" version="0.1" date="2010-10-31" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/user-goodpassword.page.orig b/gnome-help/C/user-goodpassword.page.orig
new file mode 100644
index 0000000..c5a8ebc
--- /dev/null
+++ b/gnome-help/C/user-goodpassword.page.orig
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="user-goodpassword">
+
+  <info>
+    <link type="guide" xref="index"/>
+    <desc>XXX</desc>
+    <revision pkgversion="0.1" version="0.1" date="2010-10-31" 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>Choosing a good, secure password</title>
+  
+  <comment>
+   <cite date="2010-10-31" href="mailto:gnome-doc-list@gnome.org">GNOME Documentation Project</cite>
+   <p>Tips on what makes a secure password.</p>
+  </comment>
+	
+</page>
-- 
cgit