merge

1 files changed, 7 insertions, 7 deletions

diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
index 9c5d49965..c591fc245 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
@@ -1,28 +1,28 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEINIT 1 "Jun 2006" "K Desktop Environment" "process launcher"
+.TH TDEINIT 1 "Jun 2006" "Trinity Desktop Environment" "process launcher"
 .SH NAME
 tdeinit
-\- KDE process launcher
+\- TDE process launcher
 .SH SYNOPSIS
 \fBtdeinit\fP [options]
 .SH DESCRIPTION
 \fBtdeinit\fP is a process launcher similar to \fBinit\fP used for booting UNIX.
 .sp 1
-\fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
+\fBtdeinit\fP is used to start all other TDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
 .sp 1
 When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBtdelauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
 .sp 1
-The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
+The \fBtdeinit\fP master process can be used to start additional TDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
 .sp 1
 KLMs are dynamic libraries that work like binary programs but can be started more efficiently.
-Starting KLMs via \fBtdeinit\fP is much faster and more memory efficient because \fBtdeinit\fP is linked against all libraries a standard KDE application needs. To start a KLM \fBtdeinit\fP forks and loads the dynamic library.
+Starting KLMs via \fBtdeinit\fP is much faster and more memory efficient because \fBtdeinit\fP is linked against all libraries a standard TDE application needs. To start a KLM \fBtdeinit\fP forks and loads the dynamic library.
 .SH OPTIONS
 .TP
 .B \-\-no\-kded
 Do not start kded
 .TP
 .B \-\-suicide
-Terminate when no KDE applications are left running
+Terminate when no TDE applications are left running
 .SS
 .SH FILES
 .TP
@@ -41,7 +41,7 @@ Lubos Lunak <l.lunak@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP