Update Admin Guide.

diff --git a/doc/adminguide/groupware-kontact.docbook b/doc/adminguide/groupware-kontact.docbook
index b183139..273ba4f 100644
--- a/doc/adminguide/groupware-kontact.docbook
+++ b/doc/adminguide/groupware-kontact.docbook
@@ -38,7 +38,7 @@
 or another groupware backend. It can work with just an
 <acronym>IMAP</acronym> server, that can be easily set up.</para>
 
-<para>My scenario is a server with Debian unstable and &tde; 3.4. I access
+<para>My scenario is a server with Debian unstable and &kde; 3.4. I access
 &kontact; and other fabulous GNU/Linux apps from windows using Cygwin/X,
 while waiting Wine project to be able to run the last Windows programs I
 need (and that are not available under GNU/Linux). I want to share contacts,
diff --git a/doc/adminguide/index.docbook b/doc/adminguide/index.docbook
index 720db0b..dd24a1c 100644
--- a/doc/adminguide/index.docbook
+++ b/doc/adminguide/index.docbook
@@ -41,8 +41,8 @@
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>TDE</keyword>
+<keyword>administration</keyword>
 <keyword>desktop</keyword>
 <keyword>handbook</keyword>
 <keyword>tutorial</keyword>
@@ -58,11 +58,11 @@
 
 <para>This handbook is a reference guide to
 some &tde; features that are useful to administrators configuring
-multi-user systems. This part also has information that might be useful
+multi-user systems. This guide also has information useful
 to &tde; users with single-user systems: where configuration files are
 stored, what environment variables affect &tde;, and so on. The KIOSK
-framework is the &tde; system which allows administrators to limit
-what users can do in &tde;. That framework is potentially useful in many
+framework is the &tde; system that allows administrators to limit
+what users can do in &tde;. That framework is useful in many
 situations, but especially for running single-function kiosks with,
 for example, only a web browser, hence the name.</para>
 
@@ -90,31 +90,30 @@
 additional trees can be used for <link
 linkend="user-profiles">profiles</link></para>
 
-<informalexample><para>&SuSE; &Linux; for example uses:</para>
+<informalexample><para>For example:</para>
 
 <itemizedlist>
 <listitem><para><filename
 class="directory">$<envar>HOME</envar>/.trinity</filename></para></listitem>
 <listitem><para><filename
-class="directory">/opt/trinity</filename>. (This is
-&SuSE;-specific; other distributions may use
+class="directory">/opt/trinity</filename>. (This location is a
+typical default. Some distributions might use
 <filename class="directory">/usr</filename> or <filename
 class="directory">/usr/trinity</filename>)</para></listitem>
 <listitem><para><filename
-class="directory">/etc/opt/trinity</filename>. (This was added by
-&SuSE;).</para></listitem>
+class="directory">/etc/trinity</filename>.</para></listitem>
 </itemizedlist>
 
-<para>If you have the KIOSK Admin tool v0.7 or later installed you can
+<para>If you have the KIOSK Admin tool installed you can
 check which directory trees are used with the following command:
 <userinput><command>kiosktool-tdedirs</command>
 <option>--check</option></userinput></para>
 </informalexample>
 
 <para>&tde; and &tde; applications look up files by scanning all the
-&tde; directory trees.  The directory trees are checked in order of
+&tde; directory trees. The directory trees are checked in order of
 precedence. When a file is present in multiple directory trees, the
-file from the last tree takes precedence.  Normally, the tree
+file from the last tree takes precedence. Normally, the tree
 located in the user's home directory has the highest precedence. This
 is also the directory tree to which changes are written.</para>
 
@@ -128,7 +127,7 @@
 <listitem><para><filename
 class="directory">/opt/trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
 <listitem><para><filename
-class="directory">/etc/opt/trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
+class="directory">/etc/trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
 </itemizedlist>
 
 <para>If a user makes a change, the change is written to <filename
@@ -154,7 +153,7 @@
 </varlistentry>
 
 <varlistentry>
-<term><filename>/etc/opt/trinity/share/config/foobar</filename></term>
+<term><filename>/etc/trinity/share/config/foobar</filename></term>
 <listitem><programlisting>
 Color=blue
 Position=10,10
@@ -203,7 +202,7 @@
 <seg><filename class="directory">/opt/trinity</filename>, <filename
 class="directory">/usr</filename>, <filename
 class="directory">/usr/trinity</filename></seg>
-<seg>Vendor dependent. Used by &tde; 2. If not set, falls back to
+<seg>Vendor dependent. If not set, falls back to
 compiled-in default.</seg>
 </seglistitem>
 
@@ -212,15 +211,13 @@
 <seg><filename class="directory">/opt/trinity</filename>, <filename
 class="directory">/usr</filename>, <filename
 class="directory">/usr/trinity</filename></seg>
-<seg>New in &tde;3. Can list multiple locations separated by a
+<seg>Can list multiple locations separated by a
 colon. If not set, falls back to $<envar>TDEDIR</envar></seg>
 </seglistitem>
 
 </segmentedlist>
 </para>
 <para>Don't <emphasis>need</emphasis> to be set, defaults work just fine.</para>
-<para>Running &tde;2 next to &tde;3? Point $<envar>TDEDIR</envar> to
-&tde; 2 and $<envar>TDEDIRS</envar> to &tde; 3.</para>
 
 <informalexample>
 <para>A staff member at a university could have the following
@@ -228,7 +225,7 @@
 <programlisting>
 TDEHOME='~/.trinity'
 TDEROOTHOME='/root/.trinity'
-TDEDIRS='/opt/kde_staff:/opt/trinity'
+TDEDIRS='/opt/tde_staff:/opt/trinity'
 </programlisting>
 
 </informalexample>
@@ -239,21 +236,19 @@
 <title>User Profiles</title>
 
 <para>In the previous example <filename
-class="directory">/opt/kde_staff</filename> contained additional settings
+class="directory">/opt/tde_staff</filename> contained additional settings
 and applications for staff members. <quote>User Profiles</quote> allow you
-to add this directory only for certain users and not for others.  Add the
+to add this directory only for certain users and not for others. Add the
 following to <filename>/etc/tderc</filename>:</para>
 
 <programlisting>
 [Directories-staff]
-prefixes=/opt/kde_staff
+prefixes=/opt/tde_staff
 </programlisting>
 
 <para>This creates a profile named <quote>staff</quote> that adds the
-<filename class="directory">/opt/kde_staff</filename> directory
-tree. (Note that &SuSE; &Linux; uses
-<filename>/etc/kde3rc</filename> instead of
-<filename>/etc/tderc</filename>. Now that we have a named profile it
+<filename class="directory">/opt/tde_staff</filename> directory
+tree. Now that we have a named profile it
 can be assigned to users.</para>
 
 <para>To map profiles to users a mapping file needs to be specified in
@@ -261,7 +256,7 @@
 
 <programlisting>
 [Directories]
-userProfileMapFile=/etc/kde-user-profile
+userProfileMapFile=/etc/tde-user-profile
 </programlisting>
 
 <para>It is now possible to assign a profile based on either the user name
@@ -269,7 +264,7 @@
 
 <para>To assign the staff profile to all users that are a member of the
 &UNIX; group staff_members add the following to
-<filename>/etc/kde-user-profile</filename>:</para>
+<filename>/etc/tde-user-profile</filename>:</para>
 
 <programlisting>
 [General]
@@ -319,8 +314,7 @@
 <varlistentry>
 <term><filename class="directory">lib/trinity</filename></term>
 <listitem><para>This directory contains components, plugins, and other
-runtime loadable objects for use by &tde; 3.<replaceable>x</replaceable>
-applications.</para></listitem>
+runtime loadable objects for use by &tde; applications.</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -336,7 +330,7 @@
 <varlistentry>
 <term><filename class="directory">share/applnk</filename></term>
 <listitem><para><literal role="extension">.desktop</literal> files for
-&tde;-menu (old)</para></listitem>
+&tde;-menu (legacy)</para></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -471,7 +465,7 @@
 <varlistentry>
 <term><filename>$<envar>TDEHOME</envar>/tmp-$<envar>HOSTNAME</envar></filename></term>
 <listitem><para>Usually	<filename
-class="directory">/tmp/kde-$<envar>USER</envar>/</filename>, this is used for temporary files.</para>
+class="directory">/tmp/tde-$<envar>USER</envar>/</filename>, this is used for temporary files.</para>
 </listitem>
 </varlistentry>
 
@@ -496,7 +490,7 @@
 <sect1 id="configuration-files">
 <title>Configuration Files</title> <para>&tde; uses a simple
 text-based file format for all its configuration files. It consists of
-key-value pairs that are placed in groups.  All &tde; configuration
+key-value pairs that are placed in groups. All &tde; configuration
 files use <acronym>UTF</acronym>-8 encoding for text outside the
 <acronym>ASCII</acronym> range.</para>
 
@@ -528,7 +522,7 @@
 
 <para>Entries in a group consist of a key and value separated by an equals
 sign. The key can contain spaces and may be followed by options placed in
-square brackets.  The part after the equals sign is the value of the
+square brackets. The part after the equals sign is the value of the
 entry. Any white space surrounding the equals sign is ignored, as is any
 trailing white space. Put more concisely, the format is:</para>
 
@@ -577,12 +571,12 @@
 <para>There can be multiple configuration files with the same name in the
 <filename class="directory">share/config</filename> sub-directory of the
 various &tde; directory trees. In this case the information of all these
-configuration files is combined on a key-by-key basis.  If the same key
+configuration files is combined on a key-by-key basis. If the same key
 within a certain group is defined in more than one place, the key value read
 from the directory tree with the highest precedence will be used.
 Configuration files under <filename
 class="directory">$<envar>TDEHOME</envar></filename> always have the highest
-precedence.  If a key in a certain group is defined multiple times in a
+precedence. If a key in a certain group is defined multiple times in a
 single file, the value of the last entry is used.</para>
 
 <informalexample>
@@ -593,7 +587,7 @@
 Color=red
 Shape=circle
 </programlisting>
-and <filename>/etc/opt/trinity/share/config/foobar</filename> contains
+and <filename>/etc/trinity/share/config/foobar</filename> contains
 <programlisting>
 [MyGroup]
 Color=blue
@@ -620,13 +614,13 @@
 ** Diff limit reached (max: 250 lines) **