Fix tdelibs entities, text strings for future maintenance of handbook files.

This partially resolves bug report 694.

3 files changed, 43 insertions, 41 deletions

diff --git a/kdoctools/customization/entities/contributor.entities b/kdoctools/customization/entities/contributor.entities
index 53b24628a..6788cd04c 100644
--- a/kdoctools/customization/entities/contributor.entities
+++ b/kdoctools/customization/entities/contributor.entities
@@ -1,24 +1,24 @@
 <!--
-    KDE general entities for DocBook as used in the KDE documentation
-    
+    TDE general entities for DocBook as used in the TDE documentation
+
     Copyright (C) 2002 Frederik Fouvry
-     
+
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
-     
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
-     
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-    
-    Send suggestions, comments, etc. to the KDE docbook list 
-    <kde-docbook@kde.org>.
+
+    Send suggestions, comments, etc. to the TDE development team mailing list
+    <trinity-devel@lists.pearsoncomputing.net>.
 
     USAGE
 
@@ -34,12 +34,12 @@
 <!-- ============================================================= -->
 <!--		    Extensions to the DocBook DTD		   -->
 <!-- ============================================================= -->
-<!-- This is meant for entities that define person names and 
+<!-- This is meant for entities that define person names and
      their contact mail addresses.
      Note that these definitions will override language-specific ones
-     if there are any.  Translators should use the 
+     if there are any.  Translators should use the
      contributor.entities file for their language.
-     Please keep the list sorted on the family name                
+     Please keep the list sorted on the family name
                                                                    -->
 
 
diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities
index ba404b210..dca91644c 100644
--- a/kdoctools/customization/entities/general.entities
+++ b/kdoctools/customization/entities/general.entities
@@ -1,24 +1,24 @@
 <!--
-    KDE general entities for DocBook as used in the KDE documentation
-    
+    TDE general entities for DocBook as used in the TDE documentation
+
     Copyright (C) 2002 Frederik Fouvry
-     
+
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
-     
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
-     
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-    
-    Send suggestions, comments, etc. to the KDE docbook list 
-    <kde-docbook@kde.org>.
+
+    Send suggestions, comments, etc. to the TDE development team
+    <trinity-devel@lists.pearsoncomputing.net>.
 
 
     USAGE
@@ -35,7 +35,7 @@
 <!-- ============================================================= -->
 <!--		    Extensions to the DocBook DTD		   -->
 <!-- ============================================================= -->
-<!-- E.g. KDE specific entities (see also dbgenent.mod for this)   -->
+<!-- E.g. TDE specific entities (see also dbgenent.mod for this)   -->
 
 <!-- Legal texts we put in a specific place
      so that we don't need to cut'n'paste them to every doc
@@ -63,11 +63,11 @@
 <!-- add docbook versions of licenses -->
 
 <!ENTITY % kde.writer.entities	PUBLIC
-  "-//KDE//ENTITIES DocBook XML General Entity Declarations: Contributors V1.0//EN"    
+  "-//KDE//ENTITIES DocBook XML General Entity Declarations: Contributors V1.0//EN"
   "../entities/contributor.entities"                                 >
 %kde.writer.entities;
 
-<!-- KDE index generation
+<!-- TDE index generation
      Set addindex to IGNORE to stop index generation
      Indices are generated on the fly, so no intermediate file is needed
  -->
@@ -84,11 +84,11 @@
 <!ENTITY % FDLBCT "IGNORE">
 
 <!-- These are the language-independent entities.  They can be (more
-     or less) freely extended.  Keep this list sorted and sensible.  
+     or less) freely extended.  Keep this list sorted and sensible.
      Make sure you always add full markup to the text.
 
      Naming policy: name the entity like you would see the text
-     (inclusive case).  KDE entities are always lowercased.  Spaces
+     (inclusive case).  TDE entities are always lowercased.  Spaces
      are omitted.  Examples: Qt (for "Qt"), RedHat (for "Red Hat"),
      kfloppy (for "KFloppy") .  (Entity names cannot start with digits,
      in that case, use the written form for the first digit.)
@@ -98,8 +98,8 @@
      not happen.  Place the name you wish to remove in the list of
      obsolete entities (depending on the case, the expansion is
      redefined or kept as it was); the new name goes in the official list.
-     A later version of the DTD (with another version number!) will 
-     effectively remove these entities.  In that way, old documents 
+     A later version of the DTD (with another version number!) will
+     effectively remove these entities.  In that way, old documents
      remain valid, while new ones can only use the new declarations.
  -->
 
@@ -186,13 +186,13 @@
 <!ENTITY kdcop  "<application>kdcop</application>">
 <!ENTITY kde	"<acronym>KDE</acronym>">
 <!ENTITY kdebugdialog	"<application>KDebugDialog</application>">
-<!ENTITY kde-http	'<ulink url="http://www.kde.org/">http://www.kde.org/</ulink>'>
+<!ENTITY tde-http	'<ulink url="http://www.trinitydesktop.org/">http://www.trinitydesktop.org/</ulink>'>
 <!ENTITY kde-ftp	'<ulink url="ftp://ftp.kde.org/pub/kde/">ftp://ftp.kde.org/pub/kde/</ulink>'>
 <!ENTITY kdepasswd	"<application>kdepasswd</application>">
-<!ENTITY tdeprint       "<application>KDEPrint</application>">
+<!ENTITY tdeprint       "<application>TDEPrint</application>">
 <!ENTITY kdesktop	"<application>KDesktop</application>">
 <!ENTITY kdessh	"<application>kdessh</application>">
-<!ENTITY tdesu	"<application>KDE su</application>">
+<!ENTITY tdesu	"<application>TDE su</application>">
 <!ENTITY kdiskfree	"<application>KDiskFree</application>">
 <!ENTITY kdict	"<application>KDict</application>">
 <!ENTITY tdm	"<application>tdm</application>">
@@ -294,7 +294,7 @@
 <!ENTITY kreversi	"<application>KReversi</application>">
 <!ENTITY krfb	"<application>Desktop Sharing</application>">
 <!ENTITY krita	"<application>Krita</application>">
-<!ENTITY kruler	"<application>KDE Screen Ruler</application>">
+<!ENTITY kruler	"<application>TDE Screen Ruler</application>">
 <!ENTITY ksame	"<application>KSame</application>">
 <!ENTITY kscd	"<application>KsCD</application>">
 <!ENTITY kscreensaver	"<application>KScreensaver</application>">
@@ -338,7 +338,7 @@
 <!ENTITY kvoctrain	"<application>KVocTrain</application>">
 <!ENTITY kworldclock	"<application>KWorldClock</application>">
 <!ENTITY kword	"<application>KWord</application>">
-<!ENTITY twin	"<application>KWin</application>">
+<!ENTITY twin	"<application>TWin</application>">
 <!ENTITY k4wins	"<application>KWin4</application>">
 <!ENTITY kwordquiz "<application>KWordQuiz</application>">
 <!ENTITY kwrite	"<application>KWrite</application>">
@@ -384,7 +384,9 @@
 <!ENTITY Solaris	"<trademark>Solaris</trademark>">
 <!ENTITY superkaramba	"<application>SuperKaramba</application>">
 <!ENTITY SuSE	'<acronym><trademark class="registered">SuSE</trademark></acronym>'>
+<!ENTITY tde	"<acronym>TDE</acronym>">
 <!ENTITY ThreeCom	'<trademark class="registered">3Com</trademark>'>
+<!ENTITY TQt	"<trademark>TQt</trademark>">
 <!ENTITY TrueType	'<trademark class="registered">TrueType</trademark>'>
 <!ENTITY ubuntu	"<trademark>Ubuntu</trademark>">
 <!ENTITY UNIX	'<trademark class="registered">UNIX</trademark>'>
@@ -405,7 +407,7 @@
 <!-- Defaults, do NOT add anything to this without checking with the docbook
      team.  -->
 
-<!ENTITY package "This application isn't part of a KDE package">
+<!ENTITY package "This application isn't part of a TDE package">
 
 <!-- Deprecated, will be removed at a future time, do not use -->
 <!ENTITY brahms	"<application>Brahms</application>">
diff --git a/kdoctools/customization/entities/l10n.entities b/kdoctools/customization/entities/l10n.entities
index 85359c45c..8ab7d4d82 100644
--- a/kdoctools/customization/entities/l10n.entities
+++ b/kdoctools/customization/entities/l10n.entities
@@ -1,24 +1,24 @@
 <!--
-    Language-independent entities for the KDE documentation
-    
+    Language-independent entities for the TDE documentation
+
     Copyright (C) 2001,2002,2004 Frederik Fouvry
-     
+
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
-     
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
-     
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-    
-    Send suggestions, comments, etc. to the KDE Docbook mailing list
-    <kde-docbook@kde.org>.
+
+    Send suggestions, comments, etc. to the TDE development team mailing list
+    <trinity-devel@lists.pearsoncomputing.net>.
 
 
     This file sets up the mechanism to load the language-specific
@@ -30,7 +30,7 @@
 
     Every language for which there is documentation must be added
     here.  (English is the default.)  Please send requests for
-    additions to kde-docbook@kde.org.
+    additions to trinity-devel@lists.pearsoncomputing.net.
 
     Refer to this file as