[gnome-user-docs] g-h/user-*: Merge user-privs into a section in user-accounts

[Shaun McCance <shaunm src gnome org>]

commit 6ed8fd449c7ed59d167df54b177ccac61c176c06
Author: Shaun McCance <shaunm gnome org>
Date:   Sun Apr 3 20:54:51 2011 -0400

    g-h/user-*: Merge user-privs into a section in user-accounts

 gnome-help/C/user-accounts.page       |    6 +++++-
 gnome-help/C/user-admin-change.page   |    2 +-
 gnome-help/C/user-admin-explain.page  |    2 +-
 gnome-help/C/user-admin-problems.page |    2 +-
 gnome-help/C/user-privileges.page     |   19 -------------------
 gnome-help/Makefile.am                |    1 -
 6 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/gnome-help/C/user-accounts.page b/gnome-help/C/user-accounts.page
index 05769bb..155cfa9 100644
--- a/gnome-help/C/user-accounts.page
+++ b/gnome-help/C/user-accounts.page
@@ -21,7 +21,7 @@
 
 <title>User accounts</title>
 
-<p>Each person that uses the computer should have a different user account. This allows them to keep their files separate from yours and to choose their own settings. It's also more secure - you can only access a different user account if you know the password.</p>
+<p>Each person that uses the computer should have a different user account. This allows them to keep their files separate from yours and to choose their own settings. It's also more secure. You can only access a different user account if you know the password.</p>
 
 <section id="manage" style="2column">
  <title>Manage user accounts</title>
@@ -30,5 +30,9 @@
 <section id="passwords" style="2column">
  <title>Passwords</title>
 </section>
+
+<section id="privileges" style="2column">
+  <title>User privileges</title>
+</section>
 	
 </page>
diff --git a/gnome-help/C/user-admin-change.page b/gnome-help/C/user-admin-change.page
index 1474abc..b227e80 100644
--- a/gnome-help/C/user-admin-change.page
+++ b/gnome-help/C/user-admin-change.page
@@ -4,7 +4,7 @@
 
   <info>
     
-    <link type="guide" xref="user-privileges"/>
+    <link type="guide" xref="user-accounts#privileges"/>
     <link type="seealso" xref="user-admin-explain" />
     
     <desc>You can change which users are allowed to make changes to the system by giving them administrative privileges.</desc>
diff --git a/gnome-help/C/user-admin-explain.page b/gnome-help/C/user-admin-explain.page
index 89f6af0..a1fecb0 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-privileges"/>
+    <link type="guide" xref="user-accounts#privileges"/>
     
     <desc>You need admin privileges to change important parts fo your system.</desc>
     
diff --git a/gnome-help/C/user-admin-problems.page b/gnome-help/C/user-admin-problems.page
index db36807..bd71dc6 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-privileges"/>
+    <link type="guide" xref="user-accounts#privileges"/>
     
     <desc>You can only do some things, like installing applications, if you have admin privileges.</desc>
     
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index 655cb1f..a40aa3e 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -233,7 +233,6 @@ DOC_PAGES = \
 	user-forgottenpassword.page \
 	user-goodpassword.page \
 	user-modify.page \
-	user-privileges.page \
 	web.page \
 	windows-key.page