Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

1 files changed, 9 insertions, 9 deletions

diff --git a/ubuntu/maverick/tdebase/debian/man/konqueror-trinity.1 b/ubuntu/maverick/tdebase/debian/man/konqueror-trinity.1
index d0525d008..0515c4f87 100644
--- a/ubuntu/maverick/tdebase/debian/man/konqueror-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/konqueror-trinity.1
@@ -1,17 +1,17 @@
 .\" This file was generated by kdemangen.pl
-.TH KONQUEROR 1 "Jan 2005" "K Desktop Environment" "Web browser, file manager, ..."
+.TH KONQUEROR 1 "Jan 2005" "Trinity Desktop Environment" "Web browser, file manager, ..."
 .SH NAME
 konqueror
 - Web browser, file manager, ...
 .SH SYNOPSIS
-konqueror [Qt-options] [KDE-options] [options] [URL] 
+konqueror [Qt-options] [TDE-options] [options] [URL] 
 .SH DESCRIPTION
-Konqueror is the file manager for the K Desktop Environment.
+Konqueror is the file manager for the Trinity Desktop Environment.
 It supports basic file management on local UNIX filesystems,
 from simple cut/copy and paste operations to advanced remote
 and local network file browsing.
 
-It is also the canvas for all the latest KDE technology,
+It is also the canvas for all the latest TDE technology,
 from KIO slaves (which provide mechanisms for file access) to
 component embedding via the KParts object interface, and it
 is one of the most customizable applications available.
@@ -24,7 +24,7 @@ It is a universal viewing application, capable of embedding
 read-only viewing components in itself to view
 documents without ever launching another application.
 
-This package is part of the official KDE base module.
+This package is part of the official TDE base module.
 
 
 .SH OPTIONS
@@ -61,8 +61,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
@@ -79,7 +79,7 @@ Show license information
 .B  --  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  --caption  <caption>
 Use 'caption' as name in the titlebar
@@ -176,7 +176,7 @@ mirrors the whole layout of widgets
 .SS 
 
 .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:/konqueror/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/konqueror/'"