3 files changed, 9 insertions, 10 deletions
diff --git a/doc/userguide/credits-and-license.docbook b/doc/userguide/credits-and-license.docbook
index b4395aed1..14fe777bb 100644
--- a/doc/userguide/credits-and-license.docbook
+++ b/doc/userguide/credits-and-license.docbook
@@ -1,7 +1,7 @@
 <sect1 id="credits">
 <title>Credits</title>
 <para>
-The &tde; Team thanks and acknowledges the original &kde; contributors of this guide.
+&tde-team; thanks and acknowledges the original &kde; contributors of this guide.
 </para>
 
 <para>Individual credits:
diff --git a/doc/userguide/getting-help.docbook b/doc/userguide/getting-help.docbook
index 7eb5d004c..6c2ebfaf7 100644
--- a/doc/userguide/getting-help.docbook
+++ b/doc/userguide/getting-help.docbook
@@ -90,7 +90,7 @@ pop up displaying information.</para>
 <title>Mailing Lists</title>
 
 <indexterm><primary>Mailing Lists</primary></indexterm>
-<para>The &tde; Team provides some mailing lists to provide help
+<para>&tde-team; provides some mailing lists to provide help
 and guidance with using and configuring &tde;:</para>
 
 <variablelist>
diff --git a/doc/userguide/index.docbook b/doc/userguide/index.docbook
index a815735d5..2583798d6 100644
--- a/doc/userguide/index.docbook
+++ b/doc/userguide/index.docbook
@@ -55,30 +55,29 @@
 ]>
 
 <book lang="&language;">
+
 <bookinfo>
+
 <title>The &tde; (Trinity Desktop Environment) User Guide</title>
 
 <authorgroup>
-<corpauthor>
-The &tde; Documentation Team
-</corpauthor>
-
+<corpauthor>&tde-team;</corpauthor>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 
 <copyright>
 <year>2004-2005</year>
-<holder>The &kde; Documentation Team</holder>
+<holder>The &kde; Team</holder>
 </copyright>
 <copyright>
 <year>&tde-copyright-date;</year>
-<holder>The &tde; Documentation Team</holder>
+<holder>&tde-team;</holder>
 </copyright>
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>&tde-release-version;</date>
-<releaseinfo>&tde-release-date;</releaseinfo>
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
 
 <abstract>
 <para>A general user guide to the Trinity Desktop Environment.