Add new help handbooks, delete obsolete handbooks, fix DocPath in *.desktop files, minor handbook housekeeping.

26 files changed, 465 insertions, 215 deletions

diff --git a/doc/kcontrol/display/index.docbook b/doc/kcontrol/display/index.docbook
index 633ca5379..d51b44dc3 100644
--- a/doc/kcontrol/display/index.docbook
+++ b/doc/kcontrol/display/index.docbook
@@ -56,5 +56,4 @@ Submitting a basic text file is acceptable as the &tde-team; will convert the te
 
 </sect1>
 
-&documentation.index; 
 </article>
diff --git a/doc/kcontrol/displayconfig/index.docbook b/doc/kcontrol/displayconfig/index.docbook
index f702155e0..cc14aba53 100644
--- a/doc/kcontrol/displayconfig/index.docbook
+++ b/doc/kcontrol/displayconfig/index.docbook
@@ -56,5 +56,4 @@ Submitting a basic text file is acceptable as the &tde-team; will convert the te
 
 </sect1>
 
-&documentation.index; 
 </article>
diff --git a/doc/kcontrol/email/CMakeLists.txt b/doc/kcontrol/dnssd/CMakeLists.txt
index 0fc308755..8b04b8f65 100644
--- a/doc/kcontrol/email/CMakeLists.txt
+++ b/doc/kcontrol/dnssd/CMakeLists.txt
@@ -1,12 +1,9 @@
 #################################################
 #
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
 #  Improvements and feedback are welcome
 #
 #  This file is released under GPL >= 2
 #
 #################################################
 
-tde_create_handbook( DESTINATION kcontrol/email )
+tde_create_handbook( DESTINATION kcontrol/dnssd )
diff --git a/doc/kcontrol/dnssd/Makefile.am b/doc/kcontrol/dnssd/Makefile.am
new file mode 100644
index 000000000..416915575
--- /dev/null
+++ b/doc/kcontrol/dnssd/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/dnssd/index.docbook b/doc/kcontrol/dnssd/index.docbook
new file mode 100644
index 000000000..7b26cc442
--- /dev/null
+++ b/doc/kcontrol/dnssd/index.docbook
@@ -0,0 +1,62 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<!-- Note: When updating this empty handbook, remember that usually most handbooks -->
+<!-- use the book model rather than article. Feel free to use article if the new handbook -->
+<!-- remains really short. -->
+
+<article lang="&language;">
+<title>Zeroconf Service Discovery</title>
+
+<articleinfo>
+
+<authorgroup>
+<corpauthor>&tde-team;</corpauthor>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<abstract>
+<para>
+This handbook describes the Zeroconf Service Discovery module.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>Zeroconf</keyword>
+<keyword>dnssd</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="apologies">
+<title>We Apologize</title>
+<para>No documentation has yet been written for this module.</para>
+
+<para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
+web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; mail lists</ulink>, or file a bug report at the <ulink url="http://bugs.trinitydesktop.org/">
+&tde; bug tracker</ulink>.</para>
+
+<para>If you are interested in helping, please consider writing the help file.
+Submitting a basic text file is acceptable as the &tde-team; will convert the text.</para>
+
+<para>Thank you for helping and thank you for your patience.</para>
+
+&underFDL;
+
+</sect1>
+
+&documentation.index; 
+</article>
diff --git a/doc/kcontrol/email/Makefile.am b/doc/kcontrol/email/Makefile.am
deleted file mode 100644
index 137c9a103..000000000
--- a/doc/kcontrol/email/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = kcontrol/email
diff --git a/doc/kcontrol/email/index.docbook b/doc/kcontrol/email/index.docbook
deleted file mode 100644
index 4c65c71b6..000000000
--- a/doc/kcontrol/email/index.docbook
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
-<!ENTITY % addindex "IGNORE">
-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
-]>
-
-<article lang="&language;">
-<articleinfo>
-
-<authorgroup>
-<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
-<author>&Mike.McBride; &Mike.McBride.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
-<date>2002-09-01</date>
-<releaseinfo>3.1.00</releaseinfo>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>KControl</keyword>
-<keyword>email</keyword>
-<keyword>e-mail</keyword>
-</keywordset>
-
-</articleinfo>
-<sect1 id="e-mail">
-<title>Email</title>
-
-
-<sect2 id="email-intro">
-<title>Introduction</title>
-
-<para>The email module of the &kcontrol; allows you to enter and save some
-basic email information. This information is used when performing functions
-related to email within &tde;, for example, when sending bug reports from the
-&tde; crash handler application.</para>
-
-<para>Programs such as &kmail;, which are used for reading and sending
-email, may offer many more options for customizing the way in which
-email is handled. These options depend upon the specific program being
-used.  &kmail;, for instance, offers its own configuration
-facilities.</para>
-
-<para>Some of the information needed for configuring email should have
-been provided by your internet service provider
-(<acronym>ISP</acronym>). If you are connected to a local network, then
-the system administrator of your network should be able to help
-you.</para>
-
-</sect2>
-
-<sect2 id="email-use">
-<title>Use</title>
-
-<para>&tde; automatically establishes some of the information for this control module 
-using the
-login information on the system. You will need to enter the remaining information.</para>
-<para>Looking at the page from top to
-bottom, the options are:</para>
-
-<variablelist>
-<varlistentry>
-<term><guilabel>Full name</guilabel></term>
-<listitem><para>Type your full name as you would like it to appear in the email
-messages that you send.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Organization</guilabel></term>
-<listitem><para>If you work for a company or
-organization, you can enter its name in this text box.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Email address</guilabel></term>
-<listitem><para>To be able to use email, you must enter your email
-address here.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Reply-to address</guilabel></term>
-<listitem><para>If replies to your email messages should be sent to a different
-address, you can enter that address in this text box.</para></listitem>
-</varlistentry>
-</variablelist>
-</sect2>
-
-</sect1>
-
-</article>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-indent-step:0
-sgml-indent-data:nil
-sgml-parent-document:index.docbook
-End:
--->
-
diff --git a/doc/kcontrol/iccconfig/index.docbook b/doc/kcontrol/iccconfig/index.docbook
index 4f90cc4ba..4b1ff59d0 100644
--- a/doc/kcontrol/iccconfig/index.docbook
+++ b/doc/kcontrol/iccconfig/index.docbook
@@ -56,5 +56,4 @@ Submitting a basic text file is acceptable as the &tde-team; will convert the te
 
 </sect1>
 
-&documentation.index; 
 </article>
diff --git a/doc/kcontrol/passwords/CMakeLists.txt b/doc/kcontrol/khotkeys/CMakeLists.txt
index ffcedb07a..794c8b9ca 100644
--- a/doc/kcontrol/passwords/CMakeLists.txt
+++ b/doc/kcontrol/khotkeys/CMakeLists.txt
@@ -1,12 +1,9 @@
 #################################################
 #
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
 #  Improvements and feedback are welcome
 #
 #  This file is released under GPL >= 2
 #
 #################################################
 
-tde_create_handbook( DESTINATION kcontrol/passwords )
+tde_create_handbook( DESTINATION kcontrol/khotkeys )
diff --git a/doc/kcontrol/khotkeys/Makefile.am b/doc/kcontrol/khotkeys/Makefile.am
new file mode 100644
index 000000000..416915575
--- /dev/null
+++ b/doc/kcontrol/khotkeys/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/khotkeys/index.docbook b/doc/kcontrol/khotkeys/index.docbook
new file mode 100644
index 000000000..709fac04b
--- /dev/null
+++ b/doc/kcontrol/khotkeys/index.docbook
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<!-- Note: When updating this empty handbook, remember that usually most handbooks -->
+<!-- use the book model rather than article. Feel free to use article if the new handbook -->
+<!-- remains really short. -->
+
+<article lang="&language;">
+<title>Input Actions</title>
+
+<articleinfo>
+
+<authorgroup>
+<corpauthor>&tde-team;</corpauthor>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<abstract>
+<para>
+This handbook describes the Input Actions module.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>storage</keyword>
+<keyword>media</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="apologies">
+<title>We Apologize</title>
+<para>No documentation has yet been written for this module.</para>
+
+<para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
+web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; mail lists</ulink>, or file a bug report at the <ulink url="http://bugs.trinitydesktop.org/">
+&tde; bug tracker</ulink>.</para>
+
+<para>If you are interested in helping, please consider writing the help file.
+Submitting a basic text file is acceptable as the &tde-team; will convert the text.</para>
+
+<para>Thank you for helping and thank you for your patience.</para>
+
+&underFDL;
+
+</sect1>
+
+</article>
diff --git a/doc/kcontrol/media/CMakeLists.txt b/doc/kcontrol/media/CMakeLists.txt
new file mode 100644
index 000000000..c74597dd6
--- /dev/null
+++ b/doc/kcontrol/media/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/media )
diff --git a/doc/kcontrol/media/Makefile.am b/doc/kcontrol/media/Makefile.am
new file mode 100644
index 000000000..416915575
--- /dev/null
+++ b/doc/kcontrol/media/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/media/index.docbook b/doc/kcontrol/media/index.docbook
new file mode 100644
index 000000000..67082b508
--- /dev/null
+++ b/doc/kcontrol/media/index.docbook
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<!-- Note: When updating this empty handbook, remember that usually most handbooks -->
+<!-- use the book model rather than article. Feel free to use article if the new handbook -->
+<!-- remains really short. -->
+
+<article lang="&language;">
+<title>Storage Media</title>
+
+<articleinfo>
+
+<authorgroup>
+<corpauthor>&tde-team;</corpauthor>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<abstract>
+<para>
+This handbook describes the Storage Media module.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>storage</keyword>
+<keyword>media</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="apologies">
+<title>We Apologize</title>
+<para>No documentation has yet been written for this module.</para>
+
+<para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
+web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; mail lists</ulink>, or file a bug report at the <ulink url="http://bugs.trinitydesktop.org/">
+&tde; bug tracker</ulink>.</para>
+
+<para>If you are interested in helping, please consider writing the help file.
+Submitting a basic text file is acceptable as the &tde-team; will convert the text.</para>
+
+<para>Thank you for helping and thank you for your patience.</para>
+
+&underFDL;
+
+</sect1>
+
+</article>
diff --git a/doc/kcontrol/passwords/Makefile.am b/doc/kcontrol/passwords/Makefile.am
deleted file mode 100644
index 6c8d0b013..000000000
--- a/doc/kcontrol/passwords/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = kcontrol/passwords
diff --git a/doc/kcontrol/passwords/index.docbook b/doc/kcontrol/passwords/index.docbook
deleted file mode 100644
index b2be11f36..000000000
--- a/doc/kcontrol/passwords/index.docbook
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
-<!ENTITY % addindex "IGNORE">
-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
-]>
-
-<article lang="&language;">
-<articleinfo>
-
-<authorgroup>
-<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
-<date>2003-10-16</date>
-<releaseinfo>3.2</releaseinfo>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>KControl</keyword>
-<keyword>password</keyword>
-</keywordset>
-
-</articleinfo>
-<sect1 id="passwords">
-
-<title>Passwords</title>
-
-<sect2 id="passwords-intro">
-<title>Introduction</title>
-
-<para>This module of the &kcontrol; gives you options for configuring the way in
-which the &tdesu; program treats passwords. &tdesu; will ask you for a password
-when you try to carry out some privileged actions, such as changing the
-date/time stored in your system clock, or adding new users on your
-computer.</para>
-
-<para>Privileged actions such as those described above can only be
-carried out by <systemitem class="username">root</systemitem> or a
-user with administrator permissions on your system. You will need to
-enter the password for the root account when you want to carry out
-such actions.</para>
-
-<important><para>The options in this module do not affect the behavior of
-passwords in other programs such as &kmail;.</para>
-</important>
-
-</sect2>
-
-<sect2 id="passwords-use">
-<title>Use</title>
-
-<para>There are two configuration options for passwords. The first is
-to control the visual feedback that you receive when you type a
-password. The actual characters in the password are never shown on the
-screen. You can choose to have each character represented by a
-<token>*</token> character. If you want to make it harder for someone
-who might be watching your screen to figure out how many characters
-there are in the password, you can choose to have each character in
-the password be represented by three asterisks rather than just
-one. Still another option is not to have any visual feedback at all,
-so nothing appears on the screen when you type a password.</para>
-
-<para>If you work in a reasonably secure environment, you can check
-the option labeled <guilabel>Remember Passwords</guilabel>, and then
-choose a time period in minutes using the spinner labeled
-<guilabel>Timeout</guilabel>. (You can either type a number between 5
-and 1200 minutes, or use the arrows on the spinner.)</para>
-
-<para>If the <guilabel>Remember passwords</guilabel> option has been selected,
-<application>tdesu</application> will not ask you for a password for the length
-of time specified, after you have given the password once. Keep in mind,
-however, that this makes your workstation less secure.</para>
-
-<important><para>You should avoid selecting the <guilabel>Remember
-passwords</guilabel> option if you are working in an insecure area, such as a
-publicly accessible workstation. Also, note that choosing a shorter timeout may
-be better if you are in a less secure environment.</para></important>
-
-</sect2>
-
-</sect1>
-</article>
\ No newline at end of file
diff --git a/doc/kcontrol/privacy/CMakeLists.txt b/doc/kcontrol/privacy/CMakeLists.txt
new file mode 100644
index 000000000..69d26f8a7
--- /dev/null
+++ b/doc/kcontrol/privacy/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/privacy )
diff --git a/doc/kcontrol/privacy/Makefile.am b/doc/kcontrol/privacy/Makefile.am
new file mode 100644
index 000000000..416915575
--- /dev/null
+++ b/doc/kcontrol/privacy/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/privacy/index.docbook b/doc/kcontrol/privacy/index.docbook
new file mode 100644
index 000000000..fa3bcd5ce
--- /dev/null
+++ b/doc/kcontrol/privacy/index.docbook
@@ -0,0 +1,57 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<article lang="&language;">
+<title>Privacy</title>
+
+<articleinfo>
+
+<authorgroup>
+<corpauthor>&tde-team;</corpauthor>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<abstract>
+<para>
+This handbook describes the Privacy module.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>privacy</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="privacy-settings">
+<title>Privacy Settings</title>
+
+<para>This module provides a quick way to delete files in your &tde; profile directory to
+protect your privacy.</para>
+
+<para>Various file locations are listed that contain data related to your privacy. Each item
+can be selected individually. All items can be selected using the <guilabel>Select All</guilabel>
+button or none with the <guilabel>Select None</guilabel> button.</para>
+
+<para>After selecting the desired file locations, select the <guilabel>Clean Up</guilabel> button
+To clean or scrub the contents of the affected files.</para>
+
+<para>The selection preferences can be saved by selecting the <guilabel>Apply</guilabel> button.</para>
+
+&underFDL;
+
+</sect1>
+
+</article>
diff --git a/doc/kcontrol/useraccount/CMakeLists.txt b/doc/kcontrol/useraccount/CMakeLists.txt
new file mode 100644
index 000000000..c05285927
--- /dev/null
+++ b/doc/kcontrol/useraccount/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/useraccount )
diff --git a/doc/kcontrol/useraccount/Makefile.am b/doc/kcontrol/useraccount/Makefile.am
new file mode 100644
index 000000000..416915575
--- /dev/null
+++ b/doc/kcontrol/useraccount/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/kcontrol/useraccount/index.docbook b/doc/kcontrol/useraccount/index.docbook
new file mode 100644
index 000000000..4b8c66d0f
--- /dev/null
+++ b/doc/kcontrol/useraccount/index.docbook
@@ -0,0 +1,180 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<article lang="&language;">
+<title>Password &amp; User Account</title>
+
+<articleinfo>
+<authorgroup>
+<author>
+<firstname>Michael</firstname>
+<surname>Anderson</surname>
+</author>
+<author>
+<firstname>Anne-Marie</firstname>
+<surname>Mahfouf</surname>
+</author>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>2010</year>
+<holder>Michael Anderson</holder>
+<holder>Anne-Marie Mahfouf</holder>
+</copyright>
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<abstract>
+<para>
+This handbook describes the Password &amp; User Account module.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>System Settings</keyword>
+<keyword>kcontrol</keyword>
+<keyword>user</keyword>
+<keyword>account</keyword>
+<keyword>password</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="useraccount">
+<title>User Information</title>
+<sect2 id="intro">
+<title>Introduction</title>
+
+<para>
+<screenshot>
+<screeninfo>Screenshot of the User Account Manager</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="useraccount.png" format="PNG"/>
+    </imageobject>
+     <textobject>
+      <phrase>The User Account Manager</phrase>
+    </textobject>
+  </mediaobject>
+</screenshot>
+</para>
+
+<para>This is a module to enter user information and configure basic user settings such as
+the password and icon. This information and these settings will be used by various &tde;
+applications (mail programs and word processors for example) when they are completed. You can:</para>
+
+<itemizedlist>
+<listitem><para>change your user icon</para></listitem>
+<listitem><para>change your user login password</para></listitem>
+<listitem><para>add personal information</para></listitem>
+<listitem><para>configure the password prompt</para></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2 id="icons">
+<title>User Icon and Password</title>
+
+<variablelist>
+<varlistentry><term>User Icon</term>
+<listitem>
+<para>
+This icon is used when the user logs in using a login manager. When your administrator
+has configured the login manager to allow this option, selecting the button allows you
+to change the image, either by using a pre-installed icons or selecting one of your own images.
+Select the <guibutton>Apply</guibutton> to make the changes permanent.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2 id="user-info">
+<title>User Information</title>
+
+<variablelist>
+<varlistentry><term><guilabel>Name:</guilabel></term>
+<listitem>
+<para>
+Enter here the name of the user.
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry><term><guilabel>Organization</guilabel></term>
+<listitem>
+<para>
+Add a business or group name the user would like to be associated with.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry><term><guilabel>Email address:</guilabel></term>
+<listitem>
+<para>
+Enter here an email address that will be associated with this user. 
+</para>
+</listitem>
+</varlistentry>
+<varlistentry><term><guilabel>SMTP server:</guilabel></term>
+<listitem>
+<para>
+Indicate here a local smtp server for sending mail within a network.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry><term><guilabel>User ID</guilabel></term>
+<listitem>
+<para>
+This is an information only, providing you the User ID assigned to you. This number is
+defined in <filename>/etc/passwd</filename> and was defined when your user account was created.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2 id="password">
+<title>At Password Prompt</title>
+
+<para>
+This section allows you to choose how you want to input your password when prompted.
+The default is to have one bullet appear for each letter typed. That can be changed
+to three bullets for each letter, which making guessing the length of the password
+more difficult letters when somebody else is watching. Even more secure is to display
+nothing while typing the password.
+</para>
+
+</sect2>
+
+<sect2 id="change-password">
+<title>Change Password</title>
+
+<variablelist>
+<varlistentry><term><guibutton>Change password...</guibutton></term>
+<listitem>
+<para>
+Selecting this button displays a dialog to change your user password. Your user password
+is the one you log in your system. You will be asked for your current password then twice
+for your new password.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
+</article>
diff --git a/doc/kcontrol/useraccount/useraccount.png b/doc/kcontrol/useraccount/useraccount.png
new file mode 100644
index 000000000..812313f27
--- /dev/null
+++ b/doc/kcontrol/useraccount/useraccount.png
diff --git a/doc/kdcop/index.docbook b/doc/kdcop/index.docbook
index 31c237c0a..9926fe022 100644
--- a/doc/kdcop/index.docbook
+++ b/doc/kdcop/index.docbook
@@ -60,5 +60,4 @@ Submitting a basic text file is acceptable as the &tde-team; will convert the te
 
 </sect1>
 
-&documentation.index; 
 </article>
diff --git a/doc/tdedebugdialog/index.docbook b/doc/tdedebugdialog/index.docbook
index e23d599af..d0682bf23 100644
--- a/doc/tdedebugdialog/index.docbook
+++ b/doc/tdedebugdialog/index.docbook
@@ -120,15 +120,4 @@ ones are restored.</para>
 
 </chapter>
 
-&documentation.index; 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-general-insert-case: lower
-sgml-shorttag: t
-End:
--->
-
-
diff --git a/doc/tdeprintfax/index.docbook b/doc/tdeprintfax/index.docbook
index 438dd4beb..a9134d6fa 100644
--- a/doc/tdeprintfax/index.docbook
+++ b/doc/tdeprintfax/index.docbook
@@ -60,5 +60,4 @@ Submitting a basic text file is acceptable as the &tde-team; will convert the te
 
 </sect1>
 
-&documentation.index; 
 </article>