9 files changed, 38 insertions, 38 deletions
diff --git a/doc/userguide/base-kde-applications.docbook b/doc/userguide/base-tde-applications.docbook
index ca4da8fc3..85ed6283a 100644
--- a/doc/userguide/base-kde-applications.docbook
+++ b/doc/userguide/base-tde-applications.docbook
@@ -286,7 +286,7 @@
 
 <title>Office</title>
 
-<para>This includes all applications in the &koffice; suite. See <xref linkend="kde-office-components" /> for a summary of the components.</para>
+<para>This includes all applications in the &koffice; suite. See <xref linkend="tde-office-components" /> for a summary of the components.</para>
 
 </sect1>
 
diff --git a/doc/userguide/credits-and-license.docbook b/doc/userguide/credits-and-license.docbook
index cf1b81690..cc1872d2e 100644
--- a/doc/userguide/credits-and-license.docbook
+++ b/doc/userguide/credits-and-license.docbook
@@ -24,7 +24,7 @@ The &tde; Team thanks and acknowledges the original &kde; contributors of this g
 <listitem>
 
 <itemizedlist>
-<listitem><para>Wrote the notes which became <xref linkend="kde-for-administrators"/>.</para>
+<listitem><para>Wrote the notes which became <xref linkend="tde-for-administrators"/>.</para>
 </listitem>
 </itemizedlist>
 
@@ -91,7 +91,7 @@ The &tde; Team thanks and acknowledges the original &kde; contributors of this g
 	<listitem><para>Wrote <xref linkend="ktts" />.</para></listitem>
 	<listitem><para>Wrote <xref linkend="basic-applications" />.</para></listitem>
 	<listitem><para>Wrote <xref linkend="extragear-applications" />.</para></listitem>
-	<listitem><para>Re-wrote <xref linkend="kde-edutainment" />.</para></listitem>
+	<listitem><para>Re-wrote <xref linkend="tde-edutainment" />.</para></listitem>
 	<listitem><para>Wrote <xref linkend="migrator-applications" />.</para></listitem>
 </itemizedlist>
 
@@ -207,7 +207,7 @@ linkend="file-manager"/> and <xref linkend="accessibility"/>.</para>
 </listitem>
 <listitem><para>Wrote <xref linkend="menus"/>.</para>
 </listitem>
-<listitem><para>Marked up parts of <xref linkend="kde-for-administrators"/>.</para>
+<listitem><para>Marked up parts of <xref linkend="tde-for-administrators"/>.</para>
 </listitem>
 </itemizedlist>
 
@@ -271,7 +271,7 @@ linkend="file-manager"/> and <xref linkend="accessibility"/>.</para>
 <listitem><para>Wrote <xref linkend="getting-help"/>.</para>
 </listitem>
 <listitem><para>Marked up parts of <xref
-linkend="kde-for-administrators"/>.</para>
+linkend="tde-for-administrators"/>.</para>
 </listitem>
 </itemizedlist>
 
diff --git a/doc/userguide/index.docbook b/doc/userguide/index.docbook
index 61dfd2b5d..d09af55f1 100644
--- a/doc/userguide/index.docbook
+++ b/doc/userguide/index.docbook
@@ -13,14 +13,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -32,7 +32,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -41,8 +41,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -264,14 +264,14 @@ here, but there's a taster of both of them in this part of the User
 Guide. At the end of this part are suggestions for tweaking &tde;
 in <xref linkend="tinkering-under-the-hood"/>.</para>
 
-<para><xref linkend="kde-online"/> highlights &tde;'s suite of
+<para><xref linkend="tde-online"/> highlights &tde;'s suite of
 Internet applications. &tde; includes a powerful web browser,
 &konqueror;, a full-featured email client, &kmail;, a news reader,
 &knode;, and many more applications to use the Internet.
 This part of the User Guide contains
 information about configuring these applications.</para>
 
-<para><xref linkend="kde-for-administrators"/> is a reference guide to
+<para><xref linkend="tde-for-administrators"/> 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
 to &tde; users with single-user systems: where configuration files are
@@ -444,7 +444,7 @@ by entering <userinput>help:/tdm</userinput> in &konqueror;'s
 
 &control-center;
 
-&base-kde-applications;
+&base-tde-applications;
 
 &extragear-applications;
 
@@ -464,9 +464,9 @@ by entering <userinput>help:/tdm</userinput> in &konqueror;'s
 <chapter id="multiuser-kde">
 <title>&tde; the Multiuser Desktop</title>
 
-&your-kde-account;
+&your-tde-account;
 
-&kde-as-root;
+&tde-as-root;
 
 &switching-sessions;
 </chapter>
@@ -499,14 +499,14 @@ by entering <userinput>help:/tdm</userinput> in &konqueror;'s
 
 &konsole-intro;
 
-&kde-edutainment;
+&tde-edutainment;
 
 &accessibility;
 
 &under-the-hood;
 </part>
 
-<part id="kde-online">
+<part id="tde-online">
 <title>&tde; and the Internet</title>
 
 &net-connection-setup;
@@ -529,9 +529,9 @@ by entering <userinput>help:/tdm</userinput> in &konqueror;'s
 
 </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title>More Tools</title>
diff --git a/doc/userguide/kde-as-root.docbook b/doc/userguide/tde-as-root.docbook
index 510828c4e..510828c4e 100644
--- a/doc/userguide/kde-as-root.docbook
+++ b/doc/userguide/tde-as-root.docbook
diff --git a/doc/userguide/kde-edutainment.docbook b/doc/userguide/tde-edutainment.docbook
index e5e7f7a4c..ff865921e 100644
--- a/doc/userguide/kde-edutainment.docbook
+++ b/doc/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook
index 9d5b5726e..1ca81bec4 100644
--- a/doc/userguide/kde-for-admins.docbook
+++ b/doc/userguide/tde-for-admins.docbook
@@ -1,11 +1,11 @@
-<part id="kde-for-administrators">
+<part id="tde-for-administrators">
 
 <title>&tde; for Administrators</title>
 
 <chapter id="kde-internals">
 <title>&tde; Internals</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title>Overview</title>
 <para>to be written</para>
 </sect1>
diff --git a/doc/userguide/kde-office.docbook b/doc/userguide/tde-office.docbook
index a13144ca3..035cbf714 100644
--- a/doc/userguide/kde-office.docbook
+++ b/doc/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author>
@@ -34,10 +34,10 @@
 
 <title>Office</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title>Introduction to KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title>Overview</title>
 <para>
 The &tde; project has also created a fully featured office suite
@@ -84,7 +84,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title>Features</title>
 <para>
 This list gives a general outline of the &koffice; features.
@@ -103,7 +103,7 @@ The &koffice; office suite is too large to list every detail.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title>OASIS OpenDocument file format</title>
 <para>
 It is important for an office suite to use standards where possible,
@@ -126,21 +126,21 @@ actually use the OASIS OpenDocument file format.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title>Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title>KParts and &koffice;</title>
 <para>To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title>Example</title>
 <para>To be written</para>
 </sect1>
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title>&koffice; Components Overview</title>
 
 <para>Keep in mind that all these components can integrate very well into each other. So basically a spreadsheet can contain anything from charts to presentations, reports and even text documents. Likewise almost any component can contain almost any other.</para>
@@ -281,10 +281,10 @@ actually use the OASIS OpenDocument file format.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title>Further Information</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title>Application Manuals</title>
 <para>Each Koffice component comes with its own manual.
 These manuals offer all the latest information about the
@@ -293,7 +293,7 @@ read to learn more about &koffice;. The application manuals can be accessed by u
 also a good place to find out more; it is at <ulink url="http://www.koffice.org">http://www.koffice.org</ulink>.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title>Internet Resources</title>
 <para>The primary site on the internet is
 <ulink url="http://www.koffice.org">http://www.koffice.org</ulink></para>
@@ -304,7 +304,7 @@ found at <ulink url="http://www.kexi-project.org">http://www.kexi-project.org
 </ulink></para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title>Plugin development</title>
 <para>&koffice; can easily be extended with plugins. Plugin development is
 not very difficult and can be used to optimize your everyday workflow. Such
diff --git a/doc/userguide/under-the-hood.docbook b/doc/userguide/under-the-hood.docbook
index e42b06da9..050fae8a0 100644
--- a/doc/userguide/under-the-hood.docbook
+++ b/doc/userguide/under-the-hood.docbook
@@ -88,7 +88,7 @@ configuration file.</para>
 <title>Related Information</title>
 
 
-<listitem><para><xref linkend="kde-for-administrators"/> has more
+<listitem><para><xref linkend="tde-for-administrators"/> has more
 information about &tde;'s directory structure, to help you find the
 file you need to edit.</para>
 </listitem>
diff --git a/doc/userguide/your-kde-account.docbook b/doc/userguide/your-tde-account.docbook
index 536e01966..3b189f7bd 100644
--- a/doc/userguide/your-kde-account.docbook
+++ b/doc/userguide/your-tde-account.docbook
@@ -52,7 +52,7 @@ TDEDIR=/usr/local/kde,/home/phil/kde</userinput> if you use sh.
 <!-- Add links to "further reading" here -->
 <itemizedlist>
 <title>Related Information</title>
-<listitem><para><xref linkend="kde-for-administrators" /> contains
+<listitem><para><xref linkend="tde-for-administrators" /> contains
 more information about the directories that &tde; uses.</para>
 </listitem>
 </itemizedlist>