merge

1 files changed, 7 insertions, 7 deletions

diff --git a/ubuntu/maverick/tdebase/debian/man/kxkb-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kxkb-trinity.1
index e06426a1b..9a6a6bcf6 100644
--- a/ubuntu/maverick/tdebase/debian/man/kxkb-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kxkb-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KXKB 1 "June 2006" "K Desktop Environment" "A utility to switch keyboard maps"
+.TH KXKB 1 "June 2006" "Trinity Desktop Environment" "A utility to switch keyboard maps"
 .SH NAME
 kxkb
 \- A utility to switch keyboard maps
 .SH SYNOPSIS
-\fBkxkb\fP [Qt\-options] [KDE\-options] 
+\fBkxkb\fP [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
 \fBKxkb\fP is a keyboard layout switching utility based on X11 xkb extension. It allows to use different keyboard layouts for inputing text. \fBKxkb\fP features keyboard layout indicator.
 .sp 1
@@ -22,8 +22,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -106,7 +106,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -139,7 +139,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 Don't run in the background.
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kxkb/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kxkb/"
@@ -156,7 +156,7 @@ Ilya Konstantinov <kde\-devel@future.galanet.net>
 
 .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 Debian 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